commit e2df8f3ebb720481e34b6d30207562a6d9f3145a
parent 24bdc64fe9d6f1d826dfb06b1060db4afae779a5
Author: Jean-Yves Lefort <jylefort@brutele.be>
Date: Tue, 26 Jun 2007 21:45:47 +1000
mail-notification-4.1
* Core changes:
* The at-spi breakage which caused MN to hang at
startup has been worked around (#19189)
* The order and presence of the message popup actions
is now configurable via the
/apps/mail-notification/popups/actions GConf key
* A delete message action has been added (#19696,
based on a patch by David Woodhouse)
* Command line options are now parsed with the GOption
framework
* The tooltip mail summary is now truly transparent
(#19104)
* The src/automake.xml file is now distributed
* The documentation is now licensed under the terms of
the GNU Free Documentation License
* mbox, MH, Maildir, POP3, IMAP, Mozilla and Sylpheed changes:
* Messages marked as spam (by SpamAssassin or
bogofilter) are now ignored
* MH, Maildir and Sylpheed changes:
* Mailbox type change events are now properly handled
on all systems, regardless of the underlying file
monitor implementation
* POP3 and IMAP changes:
* If SSL/TLS support is not compiled in but a mailbox
is configured to use SSL/TLS, MN now refuses to
login (#20131)
* OpenSSL is now instructed to lookup CA certificates
from default locations (#19578)
* The SSL/TLS certificate verification code now checks
if the user-provided server name matches one of the
certificate-provided server names (RFC 3501 11.1)
* OpenSSL locking is now enabled, and the configure
script now ensures that OpenSSL supports
multi-threading (#19643)
* POP3 changes:
* An interoperability issue has been fixed (#19934)
* IMAP changes:
* Two interoperability issues have been fixed (#18865,
#20132)
* Uncompliant servers which do not send an untagged
SEARCH response are now tolerated (#18876)
* Evolution changes:
* The 2.11/2.12 branch is now supported, and the
mail-notification plugin has been renamed so that it
does not conflict with the new Evolution plugin of
the same name (#20124)
* Updated translations:
* French
* Czech (Pav Lucistnik)
* Dutch (Marcel J. Zwiebel)
* Swedish (Daniel Nylander)
* Serbian (Filip Miletic)
Diffstat:
117 files changed, 14040 insertions(+), 10976 deletions(-)
diff --git a/COPYING-DOCS b/COPYING-DOCS
@@ -0,0 +1,355 @@
+ GNU Free Documentation License
+ Version 1.1, March 2000
+
+ Copyright (C) 2000 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+written document "free" in the sense of freedom: to assure everyone
+the effective freedom to copy and redistribute it, with or without
+modifying it, either commercially or noncommercially. Secondarily,
+this License preserves for the author and publisher a way to get
+credit for their work, while not being considered responsible for
+modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense. It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does. But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book. We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work that contains a
+notice placed by the copyright holder saying it can be distributed
+under the terms of this License. The "Document", below, refers to any
+such manual or work. Any member of the public is a licensee, and is
+addressed as "you".
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject. (For example, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.) The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, whose contents can be viewed and edited directly and
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters. A copy made in an otherwise Transparent file
+format whose markup has been designed to thwart or discourage
+subsequent modification by readers is not Transparent. A copy that is
+not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML designed for human modification. Opaque formats include
+PostScript, PDF, proprietary formats that can be read and edited only
+by proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML produced by some word processors for output
+purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page. For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License. You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute. However, you may accept
+compensation in exchange for copies. If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies of the Document numbering more than 100,
+and the Document's license notice requires Cover Texts, you must enclose
+the copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover. Both covers must also clearly and legibly identify
+you as the publisher of these copies. The front cover must present
+the full title with all words of the title equally prominent and
+visible. You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a publicly-accessible computer-network location containing a complete
+Transparent copy of the Document, free of added material, which the
+general network-using public has access to download anonymously at no
+charge using public-standard network protocols. If you use the latter
+option, you must take reasonably prudent steps, when you begin
+distribution of Opaque copies in quantity, to ensure that this
+Transparent copy will remain thus accessible at the stated location
+until at least one year after the last time you distribute an Opaque
+copy (directly or through your agents or retailers) of that edition to
+the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it. In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+ from that of the Document, and from those of previous versions
+ (which should, if there were any, be listed in the History section
+ of the Document). You may use the same title as a previous version
+ if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+ responsible for authorship of the modifications in the Modified
+ Version, together with at least five of the principal authors of the
+ Document (all of its principal authors, if it has less than five).
+C. State on the Title page the name of the publisher of the
+ Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+ adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+ giving the public permission to use the Modified Version under the
+ terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+ and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section entitled "History", and its title, and add to
+ it an item stating at least the title, year, new authors, and
+ publisher of the Modified Version as given on the Title Page. If
+ there is no section entitled "History" in the Document, create one
+ stating the title, year, authors, and publisher of the Document as
+ given on its Title Page, then add an item describing the Modified
+ Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+ public access to a Transparent copy of the Document, and likewise
+ the network locations given in the Document for previous versions
+ it was based on. These may be placed in the "History" section.
+ You may omit a network location for a work that was published at
+ least four years before the Document itself, or if the original
+ publisher of the version it refers to gives permission.
+K. In any section entitled "Acknowledgements" or "Dedications",
+ preserve the section's title, and preserve in the section all the
+ substance and tone of each of the contributor acknowledgements
+ and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+ unaltered in their text and in their titles. Section numbers
+ or the equivalent are not considered part of the section titles.
+M. Delete any section entitled "Endorsements". Such a section
+ may not be included in the Modified Version.
+N. Do not retitle any existing section as "Endorsements"
+ or to conflict in title with any Invariant Section.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant. To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version. Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity. If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy. If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections entitled "History"
+in the various original documents, forming one section entitled
+"History"; likewise combine any sections entitled "Acknowledgements",
+and any sections entitled "Dedications". You must delete all sections
+entitled "Endorsements."
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, does not as a whole count as a Modified Version
+of the Document, provided no compilation copyright is claimed for the
+compilation. Such a compilation is called an "aggregate", and this
+License does not apply to the other self-contained works thus compiled
+with the Document, on account of their being thus compiled, if they
+are not themselves derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one quarter
+of the entire aggregate, the Document's Cover Texts may be placed on
+covers that surround only the Document within the aggregate.
+Otherwise they must appear on covers around the whole aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections. You may include a
+translation of this License provided that you also include the
+original English version of this License. In case of a disagreement
+between the translation and the original English version of this
+License, the original English version will prevail.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License. Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License. However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns. See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation. If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+ Copyright (c) YEAR YOUR NAME.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.1
+ or any later version published by the Free Software Foundation;
+ with the Invariant Sections being LIST THEIR TITLES, with the
+ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+
+If you have no Invariant Sections, write "with no Invariant Sections"
+instead of saying which ones are invariant. If you have no
+Front-Cover Texts, write "no Front-Cover Texts" instead of
+"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
diff --git a/INSTALL b/INSTALL
@@ -11,7 +11,7 @@ Index
0. About this document
- $Id: INSTALL,v 1.21 2007/01/17 14:58:46 jylefort Exp $
+ $Id: INSTALL,v 1.22 2007-06-26 10:16:21 jylefort Exp $
Copyright (C) 2003-2007 Jean-Yves Lefort.
@@ -22,11 +22,7 @@ Index
Mandatory:
- * GNOME
-
- required: version 2.8.0 or superior
- recommended: version 2.14.0 or superior
-
+ * GNOME (version 2.14.0 or superior)
http://www.gnome.org/
* libnotify (version 0.3.0 or superior)
@@ -42,7 +38,7 @@ Index
* for SSL/TLS support:
- OpenSSL (version 0.9.5b or superior)
+ OpenSSL (version 0.9.6 or superior)
http://www.openssl.org/
* for SASL authentication support:
@@ -111,7 +107,7 @@ Index
Enable SSL/TLS support.
- Requirements: OpenSSL version 0.9.5b or superior.
+ Requirements: OpenSSL version 0.9.6 or superior.
Applies to: POP3, IMAP.
--enable-sasl (default: yes)
diff --git a/Makefile.am b/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS += tests
endif
EXTRA_DIST = \
+ COPYING-DOCS \
Makefile.autogen \
TRANSLATING \
aml.make \
diff --git a/Makefile.autogen b/Makefile.autogen
@@ -2,7 +2,7 @@
# change this to the path to mkinstalldirs on your system
# po/Makefile.in.in requires mkinstalldirs, but intltoolize does not provide it
-MKINSTALLDIRS = /usr/local/gnu-autotools/share/automake-1.9/mkinstalldirs
+MKINSTALLDIRS = /usr/share/automake-1.10/mkinstalldirs
# aml: http://lefort.be.eu.org/aml-1.0.tar.gz
all:
diff --git a/Makefile.in b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -13,15 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -37,23 +33,23 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@WITH_REGRESSION_TESTS_TRUE@am__append_1 = tests
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING INSTALL NEWS TODO \
- compile config.guess config.sub depcomp install-sh ltmain.sh \
- missing mkinstalldirs
-subdir = .
+ config.guess config.sub depcomp install-sh ltmain.sh missing \
+ mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/evolution-plugin.m4 \
$(top_srcdir)/m4/gnome.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/openssl.m4 \
$(top_srcdir)/m4/reentrant-resolver.m4 \
$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
@@ -61,10 +57,13 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = art data help m4 po src ui tests
@@ -75,14 +74,12 @@ am__remove_distdir = \
{ test ! -d $(distdir) \
|| { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
AMTAR = @AMTAR@
AR = @AR@
@@ -118,8 +115,6 @@ EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -130,8 +125,10 @@ GMSGFMT = @GMSGFMT@
GNOME_CFLAGS = @GNOME_CFLAGS@
GNOME_LIBS = @GNOME_LIBS@
GOB2 = @GOB2@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -171,11 +168,11 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
OPENSSL_LIBS = @OPENSSL_LIBS@
@@ -201,55 +198,15 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
-WITH_EVOLUTION_FALSE = @WITH_EVOLUTION_FALSE@
-WITH_EVOLUTION_TRUE = @WITH_EVOLUTION_TRUE@
-WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
-WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
-WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
-WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
-WITH_MAILDIR_FALSE = @WITH_MAILDIR_FALSE@
-WITH_MAILDIR_TRUE = @WITH_MAILDIR_TRUE@
-WITH_MBOX_FALSE = @WITH_MBOX_FALSE@
-WITH_MBOX_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
-WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_TRUE@
-WITH_MBOX_TRUE = @WITH_MBOX_TRUE@
-WITH_MH_FALSE = @WITH_MH_FALSE@
-WITH_MH_TRUE = @WITH_MH_TRUE@
-WITH_MIME_FALSE = @WITH_MIME_FALSE@
-WITH_MIME_TRUE = @WITH_MIME_TRUE@
-WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
-WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@
-WITH_POP3_FALSE = @WITH_POP3_FALSE@
-WITH_POP3_OR_IMAP_FALSE = @WITH_POP3_OR_IMAP_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_FALSE = @WITH_POP3_OR_IMAP_OR_GMAIL_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_TRUE = @WITH_POP3_OR_IMAP_OR_GMAIL_TRUE@
-WITH_POP3_OR_IMAP_TRUE = @WITH_POP3_OR_IMAP_TRUE@
-WITH_POP3_TRUE = @WITH_POP3_TRUE@
-WITH_REGRESSION_TESTS_FALSE = @WITH_REGRESSION_TESTS_FALSE@
-WITH_REGRESSION_TESTS_TRUE = @WITH_REGRESSION_TESTS_TRUE@
-WITH_SASL_FALSE = @WITH_SASL_FALSE@
-WITH_SASL_TRUE = @WITH_SASL_TRUE@
-WITH_SSL_FALSE = @WITH_SSL_FALSE@
-WITH_SSL_TRUE = @WITH_SSL_TRUE@
-WITH_SYLPHEED_FALSE = @WITH_SYLPHEED_FALSE@
-WITH_SYLPHEED_TRUE = @WITH_SYLPHEED_TRUE@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -261,37 +218,48 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
evolution_plugindir = @evolution_plugindir@
exec_prefix = @exec_prefix@
-gnome_cappletdir = @gnome_cappletdir@
gnome_prefix = @gnome_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = art data help m4 po src ui $(am__append_1)
EXTRA_DIST = \
+ COPYING-DOCS \
Makefile.autogen \
TRANSLATING \
aml.make \
@@ -347,7 +315,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -369,7 +337,6 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
-uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -402,8 +369,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -505,24 +471,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- $(mkdir_p) $(distdir)/m4 $(distdir)/po
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; 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"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -536,7 +500,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -544,6 +508,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -551,12 +517,11 @@ distdir: $(DISTFILES)
-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 {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
-
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -576,6 +541,7 @@ dist-zip: distdir
dist dist-all: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
@@ -626,7 +592,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -697,12 +663,20 @@ info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -723,24 +697,26 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-libtool clean-recursive \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-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 \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-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/NEWS b/NEWS
@@ -1,3 +1,65 @@
+4.1 June 26, 2007
+
+ * Core changes:
+ * The at-spi breakage which caused MN to hang at
+ startup has been worked around (#19189)
+ * The order and presence of the message popup actions
+ is now configurable via the
+ /apps/mail-notification/popups/actions GConf key
+ * A delete message action has been added (#19696,
+ based on a patch by David Woodhouse)
+ * Command line options are now parsed with the GOption
+ framework
+ * The tooltip mail summary is now truly transparent
+ (#19104)
+ * The src/automake.xml file is now distributed
+ * The documentation is now licensed under the terms of
+ the GNU Free Documentation License
+
+ * mbox, MH, Maildir, POP3, IMAP, Mozilla and Sylpheed changes:
+ * Messages marked as spam (by SpamAssassin or
+ bogofilter) are now ignored
+
+ * MH, Maildir and Sylpheed changes:
+ * Mailbox type change events are now properly handled
+ on all systems, regardless of the underlying file
+ monitor implementation
+
+ * POP3 and IMAP changes:
+ * If SSL/TLS support is not compiled in but a mailbox
+ is configured to use SSL/TLS, MN now refuses to
+ login (#20131)
+ * OpenSSL is now instructed to lookup CA certificates
+ from default locations (#19578)
+ * The SSL/TLS certificate verification code now checks
+ if the user-provided server name matches one of the
+ certificate-provided server names (RFC 3501 11.1)
+ * OpenSSL locking is now enabled, and the configure
+ script now ensures that OpenSSL supports
+ multi-threading (#19643)
+
+ * POP3 changes:
+ * An interoperability issue has been fixed (#19934)
+
+ * IMAP changes:
+ * Two interoperability issues have been fixed (#18865,
+ #20132)
+ * Uncompliant servers which do not send an untagged
+ SEARCH response are now tolerated (#18876)
+
+ * Evolution changes:
+ * The 2.11/2.12 branch is now supported, and the
+ mail-notification plugin has been renamed so that it
+ does not conflict with the new Evolution plugin of
+ the same name (#20124)
+
+ * Updated translations:
+ * French
+ * Czech (Pav Lucistnik)
+ * Dutch (Marcel J. Zwiebel)
+ * Swedish (Daniel Nylander)
+ * Serbian (Filip Miletic)
+
4.0 January 17, 2007
No major changes.
@@ -84,6 +146,9 @@
* Czech (Pav Lucistnik)
* Dutch (Marcel J. Zwiebel)
+ * New translations:
+ * Swedish (Daniel Nylander)
+
3.0 Release Candidate 1 May 16, 2006
* Core changes:
diff --git a/README b/README
@@ -11,7 +11,7 @@ Index
0. About this document
- $Id: README,v 1.35 2007/01/17 14:58:46 jylefort Exp $
+ $Id: README,v 1.36 2007-06-26 11:34:17 jylefort Exp $
Copyright (C) 2003-2007 Jean-Yves Lefort.
@@ -60,6 +60,7 @@ Index
fixed:
- FreeBSD port x11-toolkits/libgnomeui >= 2.10.1_1
- libgnomeui CVS >= 20060208
+ - libgnomeui >= 2.15.90
* An infinite loop in GnomeVFS may affect mailboxes which use
HTTP authentication (for instance, Gmail mailboxes).
diff --git a/TODO b/TODO
@@ -1,6 +1,3 @@
-* Check the SSL certificate's hostname against the hostname we used
- (RFC 3501, section 11.1)
-
* List the available IMAP folders in the mailbox properties dialog
* Allow to set a different mail reader for each mailbox. Invoking the
@@ -8,3 +5,7 @@
message's mailbox, or fallback to the global mail reader.
* Limit the tooltip height to the screen height
+
+* The "delete" message action could also be implemented with little
+ effort for Maildir and Sylpheed mailboxes (other mailbox types would
+ require more work).
diff --git a/acinclude.m4 b/acinclude.m4
@@ -85,7 +85,8 @@ else
-Wpacked \
-Wredundant-decls \
-Wnested-externs \
--Winline"
+-Winline \
+-Wno-pointer-sign"
test $enable_compile_warnings = error && WARN_CFLAGS="$WARN_CFLAGS -Werror"
fi
diff --git a/aclocal.m4 b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 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.
@@ -11,6 +11,11 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
dnl AM_GCONF_SOURCE_2
dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
dnl (i.e. pass to gconftool-2
@@ -259,6 +264,20 @@ glib_DEFUN([GLIB_WITH_NLS],
glib_save_LIBS="$LIBS"
LIBS="$LIBS $INTLLIBS"
AC_CHECK_FUNCS(dcgettext)
+ MSGFMT_OPTS=
+ AC_MSG_CHECKING([if msgfmt accepts -c])
+ GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo@bar.xx>\n"
+"Language-Team: C <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+ AC_SUBST(MSGFMT_OPTS)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
@@ -454,6 +473,23 @@ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
])dnl
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+#
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat >conftest.foo <<_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+ m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
+
+
# Configure paths for GTK+
# Owen Taylor 1997-2001
@@ -651,9 +687,214 @@ main ()
rm -f conf.gtktest
])
+
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 35 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL],
+[AC_PREREQ([2.50])dnl
+
+case "$am__api_version" in
+ 1.[01234])
+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+ ;;
+ *)
+ ;;
+esac
+
+if test -n "$1"; then
+ AC_MSG_CHECKING(for intltool >= $1)
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+ ]
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
+fi
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+AC_SUBST(INTLTOOL_DESKTOP_RULE)
+AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+AC_SUBST(INTLTOOL_KEYS_RULE)
+AC_SUBST(INTLTOOL_PROP_RULE)
+AC_SUBST(INTLTOOL_OAF_RULE)
+AC_SUBST(INTLTOOL_PONG_RULE)
+AC_SUBST(INTLTOOL_SERVER_RULE)
+AC_SUBST(INTLTOOL_SHEET_RULE)
+AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
+AC_SUBST(INTLTOOL_UI_RULE)
+AC_SUBST(INTLTOOL_XAM_RULE)
+AC_SUBST(INTLTOOL_KBD_RULE)
+AC_SUBST(INTLTOOL_XML_RULE)
+AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+AC_SUBST(INTLTOOL_CAVES_RULE)
+AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+AC_SUBST(INTLTOOL_THEME_RULE)
+AC_SUBST(INTLTOOL_SERVICE_RULE)
+
+# Use the tools built into the package, not the ones that are installed.
+AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
+AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+ AC_MSG_ERROR([perl not found; required for intltool])
+fi
+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+ AC_MSG_ERROR([perl 5.x required for intltool])
+fi
+if test "x$2" != "xno-xml"; then
+ AC_MSG_CHECKING([for XML::Parser])
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+ AC_MSG_RESULT([ok])
+ else
+ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+ fi
+fi
+
+AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
+AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
+AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
+AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr],
+ [DATADIRNAME=share],
+ [case $host in
+ *-*-solaris*)
+ dnl On Solaris, if bind_textdomain_codeset is in libc,
+ dnl GNU format message catalog is always supported,
+ dnl since both are added to the libc all together.
+ dnl Hence, we'd like to go with DATADIRNAME=share
+ dnl in this case.
+ AC_CHECK_FUNC(bind_textdomain_codeset,
+ [DATADIRNAME=share], [DATADIRNAME=lib])
+ ;;
+ *)
+ [DATADIRNAME=lib]
+ ;;
+ esac])
+fi
+AC_SUBST(DATADIRNAME)
+
+IT_PO_SUBDIR([po])
+
+dnl The following is very similar to
+dnl
+dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
+dnl
+dnl with the following slight differences:
+dnl - the *.in files are in ac_aux_dir,
+dnl - if the file haven't changed upon reconfigure, it's not touched,
+dnl - the evaluation of the third parameter enables a hack which computes
+dnl the actual value of $libdir,
+dnl - the user sees "executing intltool commands", instead of
+dnl "creating intltool-extract" and such.
+dnl
+dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
+dnl a reason for it.
+
+AC_CONFIG_COMMANDS([intltool], [
+
+for file in intltool-extract intltool-merge intltool-update; do
+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+ -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
+ -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
+ -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
+ -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
+ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+ < ${ac_aux_dir}/${file}.in > ${file}.out
+ if cmp -s ${file} ${file}.out 2>/dev/null; then
+ rm -f ${file}.out
+ else
+ mv -f ${file}.out ${file}
+ fi
+ chmod ugo+x ${file}
+ chmod u+w ${file}
+done
+
+],
+[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
+INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
+INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
+
+])
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be exetuted at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+ >"$1/stamp-it.tmp"
+ [sed '/^#/d
+ s/^[[].*] *//
+ /^[ ]*$/d
+ '"s|^| $ac_top_srcdir/|" \
+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+ ]
+ if test ! -f "$1/Makefile"; then
+ AC_MSG_ERROR([$1/Makefile is not ready.])
+ fi
+ mv "$1/Makefile" "$1/Makefile.tmp"
+ [sed '/^POTFILES =/,/[^\\]$/ {
+ /^POTFILES =/!d
+ r $1/POTFILES
+ }
+ ' "$1/Makefile.tmp" >"$1/Makefile"]
+ rm -f "$1/Makefile.tmp"
+ mv "$1/stamp-it.tmp" "$1/stamp-it"
+ ])
+])dnl
+])
+
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
+
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 AC_PROG_LIBTOOL
+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -2037,18 +2278,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -2204,7 +2433,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2233,7 +2462,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
+netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2242,7 +2471,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+ dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
@@ -2950,7 +3179,7 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3004,11 +3233,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -3756,7 +3985,7 @@ case $host_os in
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3915,7 +4144,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -4017,7 +4246,7 @@ case $host_os in
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -5282,7 +5511,7 @@ hpux*) # Its linker distinguishes data from code symbols
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
-linux*)
+linux* | k*bsd*-gnu)
if test "$host_cpu" = ia64; then
symcode='[[ABCDGIRSTW]]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -5555,7 +5784,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -5598,7 +5827,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -5641,7 +5870,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -5852,7 +6081,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5993,6 +6222,9 @@ ifelse([$1],[CXX],[
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -6163,7 +6395,7 @@ EOF
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -6189,12 +6421,13 @@ EOF
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -6524,7 +6757,7 @@ _LT_EOF
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6626,7 +6859,7 @@ _LT_EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -7186,7 +7419,7 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7196,14 +7429,29 @@ fi[]dnl
# ----------------------------
# 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.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.10], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -7260,14 +7508,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
# 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.
-# serial 7
+# serial 8
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -7276,8 +7524,10 @@ AC_DEFUN([AM_CONDITIONAL],
[AC_PREREQ(2.52)dnl
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])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -7291,15 +7541,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
# 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.
-# serial 8
+# serial 9
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -7327,6 +7576,7 @@ 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], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@@ -7392,6 +7642,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -7444,7 +7695,8 @@ if test "x$enable_dependency_tracking" != xno; then
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -7469,8 +7721,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# 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
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -7529,8 +7782,8 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7553,16 +7806,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
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])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
fi
# test whether we have cygpath
@@ -7582,6 +7839,9 @@ m4_ifval([$2],
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@@ -7617,6 +7877,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
])
@@ -7652,7 +7916,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -7759,14 +8023,14 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
# 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.
-# serial 4
+# serial 5
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -7782,6 +8046,7 @@ AC_SUBST($1)])
# 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
+AC_REQUIRE_AUX_FILE([missing])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
@@ -7792,7 +8057,7 @@ else
fi
])
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7800,60 +8065,23 @@ fi
# AM_PROG_MKDIR_P
# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
# Helper functions for option handling. -*- Autoconf -*-
@@ -7965,9 +8193,21 @@ 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"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# Copyright (C) 2006 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.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
@@ -8067,7 +8307,6 @@ AC_SUBST([am__untar])
m4_include([m4/evolution-plugin.m4])
m4_include([m4/gnome.m4])
m4_include([m4/idl.m4])
-m4_include([m4/intltool.m4])
m4_include([m4/openssl.m4])
m4_include([m4/reentrant-resolver.m4])
m4_include([m4/sasl2.m4])
diff --git a/art/Makefile.in b/art/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -45,7 +41,7 @@ DIST_COMMON = $(am__dist_app_pixmaps_DATA_DIST) \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/evolution-plugin.m4 \
$(top_srcdir)/m4/gnome.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/openssl.m4 \
$(top_srcdir)/m4/reentrant-resolver.m4 \
$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
@@ -71,8 +67,6 @@ DATA = $(dist_app_pixmaps_DATA) $(nobase_dist_icons_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
AMTAR = @AMTAR@
AR = @AR@
@@ -108,8 +102,6 @@ EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -120,8 +112,10 @@ GMSGFMT = @GMSGFMT@
GNOME_CFLAGS = @GNOME_CFLAGS@
GNOME_LIBS = @GNOME_LIBS@
GOB2 = @GOB2@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -161,11 +155,11 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
OPENSSL_LIBS = @OPENSSL_LIBS@
@@ -191,55 +185,15 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
-WITH_EVOLUTION_FALSE = @WITH_EVOLUTION_FALSE@
-WITH_EVOLUTION_TRUE = @WITH_EVOLUTION_TRUE@
-WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
-WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
-WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
-WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
-WITH_MAILDIR_FALSE = @WITH_MAILDIR_FALSE@
-WITH_MAILDIR_TRUE = @WITH_MAILDIR_TRUE@
-WITH_MBOX_FALSE = @WITH_MBOX_FALSE@
-WITH_MBOX_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
-WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_TRUE@
-WITH_MBOX_TRUE = @WITH_MBOX_TRUE@
-WITH_MH_FALSE = @WITH_MH_FALSE@
-WITH_MH_TRUE = @WITH_MH_TRUE@
-WITH_MIME_FALSE = @WITH_MIME_FALSE@
-WITH_MIME_TRUE = @WITH_MIME_TRUE@
-WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
-WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@
-WITH_POP3_FALSE = @WITH_POP3_FALSE@
-WITH_POP3_OR_IMAP_FALSE = @WITH_POP3_OR_IMAP_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_FALSE = @WITH_POP3_OR_IMAP_OR_GMAIL_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_TRUE = @WITH_POP3_OR_IMAP_OR_GMAIL_TRUE@
-WITH_POP3_OR_IMAP_TRUE = @WITH_POP3_OR_IMAP_TRUE@
-WITH_POP3_TRUE = @WITH_POP3_TRUE@
-WITH_REGRESSION_TESTS_FALSE = @WITH_REGRESSION_TESTS_FALSE@
-WITH_REGRESSION_TESTS_TRUE = @WITH_REGRESSION_TESTS_TRUE@
-WITH_SASL_FALSE = @WITH_SASL_FALSE@
-WITH_SASL_TRUE = @WITH_SASL_TRUE@
-WITH_SSL_FALSE = @WITH_SSL_FALSE@
-WITH_SSL_TRUE = @WITH_SSL_TRUE@
-WITH_SYLPHEED_FALSE = @WITH_SYLPHEED_FALSE@
-WITH_SYLPHEED_TRUE = @WITH_SYLPHEED_TRUE@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -251,35 +205,45 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
evolution_plugindir = @evolution_plugindir@
exec_prefix = @exec_prefix@
-gnome_cappletdir = @gnome_cappletdir@
gnome_prefix = @gnome_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
iconsdir = $(datadir)/icons/hicolor
nobase_dist_icons_DATA = \
16x16/apps/mail-notification.png \
@@ -329,13 +293,9 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
install-dist_app_pixmapsDATA: $(dist_app_pixmaps_DATA)
@$(NORMAL_INSTALL)
- test -z "$(app_pixmapsdir)" || $(mkdir_p) "$(DESTDIR)$(app_pixmapsdir)"
+ test -z "$(app_pixmapsdir)" || $(MKDIR_P) "$(DESTDIR)$(app_pixmapsdir)"
@list='$(dist_app_pixmaps_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -352,7 +312,7 @@ uninstall-dist_app_pixmapsDATA:
done
install-nobase_dist_iconsDATA: $(nobase_dist_icons_DATA)
@$(NORMAL_INSTALL)
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
@$(am__vpath_adj_setup) \
list='$(nobase_dist_icons_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -377,23 +337,21 @@ CTAGS:
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/16x16/apps $(distdir)/22x22/apps $(distdir)/24x24/apps $(distdir)/32x32/apps $(distdir)/48x48/apps $(distdir)/scalable/apps
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; 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"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -409,7 +367,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(app_pixmapsdir)" "$(DESTDIR)$(iconsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -441,7 +399,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -458,12 +416,20 @@ install-data-am: install-dist_app_pixmapsDATA \
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -482,21 +448,24 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_app_pixmapsDATA uninstall-info-am \
+uninstall-am: uninstall-dist_app_pixmapsDATA \
uninstall-nobase_dist_iconsDATA
+.MAKE: install-am install-data-am install-strip
+
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-data-hook \
- install-dist_app_pixmapsDATA install-exec install-exec-am \
+ install-dist_app_pixmapsDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man \
- install-nobase_dist_iconsDATA install-strip installcheck \
+ install-nobase_dist_iconsDATA install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_app_pixmapsDATA uninstall-info-am \
- uninstall-nobase_dist_iconsDATA
+ uninstall-dist_app_pixmapsDATA uninstall-nobase_dist_iconsDATA
install-data-hook:
diff --git a/compile b/compile
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/config.guess b/config.guess
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2003-07-02'
+timestamp='2006-07-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,13 +18,15 @@ timestamp='2003-07-02'
#
# 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.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, 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 Per Bothner <per@bothner.com>.
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
@@ -53,7 +56,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -66,11 +69,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -104,7 +107,7 @@ set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -123,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -196,50 +199,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- macppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mipseb-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ case $UNAME_RELEASE in
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
# According to Compaq, /usr/sbin/psrinfo has been available on
# OSF/1 and Tru64 systems produced since 1995. I hope that
# covers most systems running today. This code pipes the CPU
@@ -277,42 +262,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
"EV7.9 (21364A)")
UNAME_MACHINE="alphaev79" ;;
esac
+ # A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
- Alpha*:OpenVMS:*:*)
- echo alpha-hp-vms
- exit 0 ;;
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit 0 ;;
+ exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
+ exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit 0 ;;
+ exit ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -320,32 +312,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
else
echo pyramid-pyramid-bsd
fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit 0 ;;
+ exit ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
- exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
+ exit ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
+ sparc) echo sparc-icl-nx7; exit ;;
esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -354,10 +346,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ exit ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -369,10 +361,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -383,37 +375,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ exit ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -437,32 +432,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
- exit 0 ;;
+ exit ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
- exit 0 ;;
+ exit ;;
m88k:CX/UX:7*:*)
echo m88k-harris-cxux7
- exit 0 ;;
+ exit ;;
m88k:*:4*:R4*)
echo m88k-motorola-sysv4
- exit 0 ;;
+ exit ;;
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -478,29 +474,29 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
- exit 0 ;;
+ exit ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
echo m88k-tektronix-sysv3
- exit 0 ;;
+ exit ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
- exit 0 ;;
+ exit ;;
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
+ exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
echo i386-ibm-aix
- exit 0 ;;
+ exit ;;
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
@@ -508,7 +504,7 @@ EOF
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -523,14 +519,18 @@ EOF
exit(0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo rs6000-ibm-aix3.2.5
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ then
+ echo "$SYSTEM_NAME"
+ else
+ echo rs6000-ibm-aix3.2.5
+ fi
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
else
echo rs6000-ibm-aix3.2
fi
- exit 0 ;;
+ exit ;;
*:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -544,28 +544,28 @@ EOF
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
- exit 0 ;;
+ exit ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
- exit 0 ;;
+ exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
+ exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
- exit 0 ;;
+ exit ;;
DPX/2?00:B.O.S.:*:*)
echo m68k-bull-sysv3
- exit 0 ;;
+ exit ;;
9000/[34]??:4.3bsd:1.*:*)
echo m68k-hp-bsd
- exit 0 ;;
+ exit ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
- exit 0 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -627,9 +627,19 @@ EOF
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
- # avoid double evaluation of $set_cc_for_build
- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ eval $set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
@@ -637,11 +647,11 @@ EOF
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
ia64:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -669,153 +679,179 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
- exit 0 ;;
+ exit ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
echo hppa1.1-hp-bsd
- exit 0 ;;
+ exit ;;
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
- exit 0 ;;
+ exit ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
- exit 0 ;;
+ exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
- exit 0 ;;
+ exit ;;
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
- exit 0 ;;
+ exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
echo ${UNAME_MACHINE}-unknown-osf1
fi
- exit 0 ;;
+ exit ;;
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
- exit 0 ;;
+ exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
*:UNICOS/mp:*:*)
- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
- # Determine whether the default compiler uses glibc.
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #if __GLIBC__ >= 2
- LIBC=gnu
- #else
- LIBC=
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- # GNU/FreeBSD systems have a "k" prefix to indicate we are using
- # FreeBSD's kernel, but not the complete OS.
- case ${LIBC} in gnu) kernel_only='k' ;; esac
- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
- exit 0 ;;
+ exit ;;
+ *:FreeBSD:*:*)
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
+ exit ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
- exit 0 ;;
+ exit ;;
+ x86:Interix*:[3456]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[3456]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
- exit 0 ;;
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
echo i586-pc-interix
- exit 0 ;;
+ exit ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
- exit 0 ;;
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
*:GNU:*:*)
+ # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
+ exit ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
- exit 0 ;;
+ exit ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -832,8 +868,12 @@ EOF
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
eval $set_cc_for_build
@@ -851,15 +891,22 @@ EOF
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -873,7 +920,7 @@ EOF
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -881,25 +928,28 @@ EOF
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
- exit 0 ;;
+ exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
+ exit ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -917,15 +967,15 @@ EOF
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
+ exit ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0 ;;
+ exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit 0 ;;
+ exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
@@ -942,23 +992,33 @@ EOF
LIBC=gnulibc1
# endif
#else
- #ifdef __INTEL_COMPILER
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
#endif
#endif
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^LIBC/{
+ s: ::g
+ p
+ }'`"
+ test x"${LIBC}" != x && {
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit
+ }
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
# sysname and nodename.
echo i386-sequent-sysv4
- exit 0 ;;
+ exit ;;
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
@@ -966,24 +1026,27 @@ EOF
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
+ exit ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
+ exit ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
- exit 0 ;;
+ exit ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -991,15 +1054,16 @@ EOF
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
- exit 0 ;;
- i*86:*:5:[78]*)
+ exit ;;
+ i*86:*:5:[678]*)
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1017,73 +1081,73 @@ EOF
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
- exit 0 ;;
+ exit ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
- exit 0 ;;
+ exit ;;
paragon:*:*:*)
echo i860-intel-osf1
- exit 0 ;;
+ exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
- exit 0 ;;
+ exit ;;
mini*:CTIX:SYS*5:*)
# "miniframe"
echo m68010-convergent-sysv
- exit 0 ;;
+ exit ;;
mc68k:UNIX:SYSTEM5:3.51m)
echo m68k-convergent-sysv
- exit 0 ;;
+ exit ;;
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
- exit 0 ;;
- M68*:*:R3V[567]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+ exit ;;
+ M68*:*:R3V[5678]*:*)
+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
+ && { echo i486-ncr-sysv4; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
- exit 0 ;;
+ exit ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1091,68 +1155,72 @@ EOF
else
echo ns32k-sni-sysv
fi
- exit 0 ;;
+ exit ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel@ccMail.Census.GOV>
echo i586-unisys-sysv4
- exit 0 ;;
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes@openmarket.com>.
# How about differentiating between stratus architectures? -djm
echo hppa1.1-stratus-sysv4
- exit 0 ;;
+ exit ;;
*:*:*:FTX*)
# From seanf@swdc.stratus.com.
echo i860-stratus-sysv4
- exit 0 ;;
+ exit ;;
+ i*86:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
- exit 0 ;;
+ exit ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
- exit 0 ;;
+ exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
- exit 0 ;;
+ exit ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
echo powerpc-apple-beos
- exit 0 ;;
+ exit ;;
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
- exit 0 ;;
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Darwin:*:*)
- case `uname -p` in
- *86) UNAME_PROCESSOR=i686 ;;
- powerpc) UNAME_PROCESSOR=powerpc ;;
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+ unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1160,22 +1228,25 @@ EOF
UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
- exit 0 ;;
- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+ exit ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
- exit 0 ;;
+ exit ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
- exit 0 ;;
+ exit ;;
DS/*:UNIX_System_V:*:*)
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
@@ -1186,28 +1257,47 @@ EOF
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
+ exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
- exit 0 ;;
+ exit ;;
*:TENEX:*:*)
echo pdp10-unknown-tenex
- exit 0 ;;
+ exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
- exit 0 ;;
+ exit ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
echo pdp10-xkl-tops20
- exit 0 ;;
+ exit ;;
*:TOPS-20:*:*)
echo pdp10-unknown-tops20
- exit 0 ;;
+ exit ;;
*:ITS:*:*)
echo pdp10-unknown-its
- exit 0 ;;
+ exit ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+ V*) echo vax-dec-vms ; exit ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+ exit ;;
+ i*86:skyos:*:*)
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ exit ;;
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1239,7 +1329,7 @@ main ()
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix"); exit (0);
+ printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
@@ -1328,11 +1418,12 @@ main ()
}
EOF
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
# Convex versions that predate uname can use getsysinfo(1)
@@ -1341,22 +1432,22 @@ then
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
c34*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
c38*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
c4*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
esac
fi
@@ -1367,7 +1458,9 @@ This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- ftp://ftp.gnu.org/pub/gnu/config/
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff --git a/config.sub b/config.sub
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2003-07-04'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +22,15 @@ timestamp='2003-07-04'
#
# 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.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, 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.
+
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
@@ -70,7 +72,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -83,11 +85,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -99,7 +101,7 @@ while test $# -gt 0 ; do
*local*)
# First pass through any local machine types.
echo $1
- exit 0;;
+ exit ;;
* )
break ;;
@@ -118,7 +120,9 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -144,7 +148,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
@@ -169,6 +173,10 @@ case $os in
-hiux*)
os=-hiuxwe2
;;
+ -sco6)
+ os=-sco5v6
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +193,10 @@ case $os in
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -228,14 +240,17 @@ case $basic_machine in
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
- | ip2k \
- | m32r | m68000 | m68k | m88k | mcore \
+ | ip2k | iq2000 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -244,27 +259,33 @@ case $basic_machine in
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | mt \
| msp430 \
+ | nios | nios2 \
| ns16k | ns32k \
- | openrisc | or32 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
- | strongarm \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -275,6 +296,9 @@ case $basic_machine in
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
+ ms1)
+ basic_machine=mt-unknown
+ ;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
@@ -292,22 +316,22 @@ case $basic_machine in
| a29k-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
- | bs2000-* \
+ | avr-* | avr32-* \
+ | bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | cydra-* \
+ | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* \
- | m32r-* \
+ | ip2k-* | iq2000-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -316,30 +340,36 @@ case $basic_machine in
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | mt-* \
| msp430-* \
- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ | nios-* | nios2-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- | xtensa-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
@@ -359,6 +389,9 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
@@ -376,6 +409,9 @@ case $basic_machine in
amd64)
basic_machine=x86_64-pc
;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -435,12 +471,27 @@ case $basic_machine in
basic_machine=j90-cray
os=-unicos
;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16c)
+ basic_machine=cr16c-unknown
+ os=-elf
+ ;;
crds | unos)
basic_machine=m68k-crds
;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
+ ;;
da30 | da30-*)
basic_machine=m68k-da30
;;
@@ -463,6 +514,10 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -641,10 +696,6 @@ case $basic_machine in
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
@@ -657,6 +708,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-msdos
;;
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
@@ -725,10 +779,6 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
- nv1)
- basic_machine=nv1-cray
- os=-unicosmp
- ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -736,9 +786,12 @@ case $basic_machine in
basic_machine=hppa1.1-oki
os=-proelf
;;
- or32 | or32-*)
+ openrisc | openrisc-*)
basic_machine=or32-unknown
- os=-coff
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
@@ -765,6 +818,12 @@ case $basic_machine in
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
+ pc98)
+ basic_machine=i386-pc
+ ;;
+ pc98-*)
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
@@ -821,6 +880,10 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
+ rdos)
+ basic_machine=i386-pc
+ os=-rdos
+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -847,6 +910,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -960,6 +1027,10 @@ case $basic_machine in
tower | tower-32)
basic_machine=m68k-ncr
;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -1003,6 +1074,10 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
+ ;;
xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -1033,6 +1108,9 @@ case $basic_machine in
romp)
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -1049,13 +1127,10 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparc | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1128,19 +1203,23 @@ case $os in
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -openbsd* | -solidbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1158,12 +1237,15 @@ case $os in
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -1176,6 +1258,9 @@ case $os in
-opened*)
os=-openedition
;;
+ -os400*)
+ os=-os400
+ ;;
-wince*)
os=-wince
;;
@@ -1197,6 +1282,9 @@ case $os in
-atheos*)
os=-atheos
;;
+ -syllable*)
+ os=-syllable
+ ;;
-386bsd)
os=-bsd
;;
@@ -1219,6 +1307,9 @@ case $os in
-sinix*)
os=-sysv4
;;
+ -tpf*)
+ os=-tpf
+ ;;
-triton*)
os=-sysv3
;;
@@ -1255,6 +1346,9 @@ case $os in
-kaos*)
os=-kaos
;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
-none)
;;
*)
@@ -1277,6 +1371,12 @@ else
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1286,9 +1386,9 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
@@ -1332,9 +1432,15 @@ case $basic_machine in
*-be)
os=-beos
;;
+ *-haiku)
+ os=-haiku
+ ;;
*-ibm)
os=-aix
;;
+ *-knuth)
+ os=-mmixware
+ ;;
*-wec)
os=-proelf
;;
@@ -1467,9 +1573,15 @@ case $basic_machine in
-mvs* | -opened*)
vendor=ibm
;;
+ -os400*)
+ vendor=ibm
+ ;;
-ptx*)
vendor=sequent
;;
+ -tpf*)
+ vendor=ibm
+ ;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
@@ -1494,7 +1606,7 @@ case $basic_machine in
esac
echo $basic_machine$os
-exit 0
+exit
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/configure b/configure
@@ -1,27 +1,56 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Mail Notification 4.0.
+# Generated by GNU Autoconf 2.61 for Mail Notification 4.1.
#
# Report bugs to <jylefort@brutele.be>.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# 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" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
-DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -31,8 +60,43 @@ else
fi
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+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
+IFS=$as_save_IFS
+
+ ;;
+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_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
+fi
+
# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
PS1='$ '
PS2='> '
PS4='+ '
@@ -46,18 +110,19 @@ do
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
- $as_unset $as_var
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
fi
done
# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
@@ -65,157 +130,388 @@ fi
# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+# CDPATH.
+$as_unset CDPATH
-# 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" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+ if (eval ":") 2>/dev/null; then
+ as_have_required=yes
+else
+ as_have_required=no
fi
+ if test $as_have_required = yes && (eval ":
+(as_func_return () {
+ (exit \$1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
- 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
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
- ;;
- 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
- '')
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+ as_lineno_1=\$LINENO
+ as_lineno_2=\$LINENO
+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+ :
+else
+ as_candidate_shells=
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
+ case $as_dir in
/*)
- if ("$as_dir/$as_base" -c '
+ for as_base in sh bash ksh sh5; do
+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ done;;
+ esac
+done
+IFS=$as_save_IFS
+
+
+ for as_shell in $as_candidate_shells $SHELL; do
+ # Try only shells that exist, to save several forks.
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+ CONFIG_SHELL=$as_shell
+ as_have_required=yes
+ if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+ (exit $1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
+
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
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
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+ break
+fi
+
+fi
+
+ done
+
+ if test "x$CONFIG_SHELL" != x; then
+ for as_var in BASH_ENV ENV
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+ if test $as_have_required = no; then
+ echo This script requires a shell more modern than all the
+ echo shells that I found on your system. Please install a
+ echo modern shell, or manually run the script under such a
+ echo shell if you do have one.
+ { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+ (exit \$1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
+
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+ echo No shell found that supports shell functions.
+ echo Please tell autoconf@gnu.org about your system,
+ echo including any error possibly output before this
+ echo message
+}
+
+
+
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
# 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.
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, 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 |
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
N
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
+ s/-\n.*//
' >$as_me.lineno &&
- chmod +x $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
+ # original and so on. Autoconf is especially sensitive 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= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ *) ECHO_C='\c';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir
+fi
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- else
- as_ln_s='ln -s'
- fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
@@ -224,7 +520,28 @@ else
as_mkdir_p=false
fi
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -233,15 +550,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
# Check that we are running under the correct shell.
@@ -397,76 +705,311 @@ tagnames=${tagnames+${tagnames},}CXX
tagnames=${tagnames+${tagnames},}F77
+exec 7<&0 </dev/null 6>&1
+
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-exec 6>&1
-
#
# Initializations.
#
ac_default_prefix=/usr/local
+ac_clean_files=
ac_config_libobj_dir=.
+LIBOBJS=
cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete. It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
# Identity of this package.
PACKAGE_NAME='Mail Notification'
PACKAGE_TARNAME='mail-notification'
-PACKAGE_VERSION='4.0'
-PACKAGE_STRING='Mail Notification 4.0'
+PACKAGE_VERSION='4.1'
+PACKAGE_STRING='Mail Notification 4.1'
PACKAGE_BUGREPORT='jylefort@brutele.be'
ac_unique_file="src/mn-main.c"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
#endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ac_prefix_program WARN_CFLAGS DEBUG_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS PKG_CONFIG GTK_CFLAGS GTK_LIBS ac_pt_PKG_CONFIG GNOME_CFLAGS GNOME_LIBS GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE gnome_prefix gnome_cappletdir GCONFTOOL ORBIT_IDL BONOBO_IDLFLAGS AML GOB2 GMIME_CFLAGS GMIME_LIBS OPENSSL_CFLAGS OPENSSL_LIBS SASL_CFLAGS SASL_LIBS EVOLUTION_PLUGIN_CFLAGS EVOLUTION_PLUGIN_LIBS evolution_plugindir WITH_MBOX_TRUE WITH_MBOX_FALSE WITH_MOZILLA_TRUE WITH_MOZILLA_FALSE WITH_MBOX_OR_MOZILLA_TRUE WITH_MBOX_OR_MOZILLA_FALSE WITH_MH_TRUE WITH_MH_FALSE WITH_MAILDIR_TRUE WITH_MAILDIR_FALSE WITH_POP3_TRUE WITH_POP3_FALSE WITH_IMAP_TRUE WITH_IMAP_FALSE WITH_POP3_OR_IMAP_TRUE WITH_POP3_OR_IMAP_FALSE WITH_POP3_OR_IMAP_OR_GMAIL_TRUE WITH_POP3_OR_IMAP_OR_GMAIL_FALSE WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE WITH_SSL_TRUE WITH_SSL_FALSE WITH_SASL_TRUE WITH_SASL_FALSE WITH_GMAIL_TRUE WITH_GMAIL_FALSE WITH_EVOLUTION_TRUE WITH_EVOLUTION_FALSE WITH_SYLPHEED_TRUE WITH_SYLPHEED_FALSE WITH_MIME_TRUE WITH_MIME_FALSE WITH_REGRESSION_TESTS_TRUE WITH_REGRESSION_TESTS_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+ac_prefix_program
+WARN_CFLAGS
+DEBUG_CFLAGS
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+target
+target_cpu
+target_vendor
+target_os
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+am__isrc
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+DEPDIR
+am__include
+am__quote
+AMDEP_TRUE
+AMDEP_FALSE
+AMDEPBACKSLASH
+CCDEPMODE
+am__fastdepCC_TRUE
+am__fastdepCC_FALSE
+GREP
+EGREP
+LN_S
+ECHO
+AR
+RANLIB
+CPP
+CXX
+CXXFLAGS
+ac_ct_CXX
+CXXDEPMODE
+am__fastdepCXX_TRUE
+am__fastdepCXX_FALSE
+CXXCPP
+F77
+FFLAGS
+ac_ct_F77
+LIBTOOL
+GETTEXT_PACKAGE
+USE_NLS
+MSGFMT
+MSGFMT_OPTS
+GMSGFMT
+XGETTEXT
+CATALOGS
+CATOBJEXT
+DATADIRNAME
+GMOFILES
+INSTOBJEXT
+INTLLIBS
+PO_IN_DATADIR_TRUE
+PO_IN_DATADIR_FALSE
+POFILES
+POSUB
+MKINSTALLDIRS
+INTLTOOL_DESKTOP_RULE
+INTLTOOL_DIRECTORY_RULE
+INTLTOOL_KEYS_RULE
+INTLTOOL_PROP_RULE
+INTLTOOL_OAF_RULE
+INTLTOOL_PONG_RULE
+INTLTOOL_SERVER_RULE
+INTLTOOL_SHEET_RULE
+INTLTOOL_SOUNDLIST_RULE
+INTLTOOL_UI_RULE
+INTLTOOL_XAM_RULE
+INTLTOOL_KBD_RULE
+INTLTOOL_XML_RULE
+INTLTOOL_XML_NOMERGE_RULE
+INTLTOOL_CAVES_RULE
+INTLTOOL_SCHEMAS_RULE
+INTLTOOL_THEME_RULE
+INTLTOOL_SERVICE_RULE
+INTLTOOL_EXTRACT
+INTLTOOL_MERGE
+INTLTOOL_UPDATE
+INTLTOOL_PERL
+INTLTOOL_ICONV
+INTLTOOL_MSGFMT
+INTLTOOL_MSGMERGE
+INTLTOOL_XGETTEXT
+ALL_LINGUAS
+PKG_CONFIG
+GTK_CFLAGS
+GTK_LIBS
+GNOME_CFLAGS
+GNOME_LIBS
+GCONF_SCHEMA_CONFIG_SOURCE
+GCONF_SCHEMA_FILE_DIR
+GCONF_SCHEMAS_INSTALL_TRUE
+GCONF_SCHEMAS_INSTALL_FALSE
+gnome_prefix
+GCONFTOOL
+ORBIT_IDL
+BONOBO_IDLFLAGS
+AML
+GOB2
+GMIME_CFLAGS
+GMIME_LIBS
+OPENSSL_CFLAGS
+OPENSSL_LIBS
+SASL_CFLAGS
+SASL_LIBS
+EVOLUTION_PLUGIN_CFLAGS
+EVOLUTION_PLUGIN_LIBS
+evolution_plugindir
+WITH_MBOX_TRUE
+WITH_MBOX_FALSE
+WITH_MOZILLA_TRUE
+WITH_MOZILLA_FALSE
+WITH_MBOX_OR_MOZILLA_TRUE
+WITH_MBOX_OR_MOZILLA_FALSE
+WITH_MH_TRUE
+WITH_MH_FALSE
+WITH_MAILDIR_TRUE
+WITH_MAILDIR_FALSE
+WITH_POP3_TRUE
+WITH_POP3_FALSE
+WITH_IMAP_TRUE
+WITH_IMAP_FALSE
+WITH_POP3_OR_IMAP_TRUE
+WITH_POP3_OR_IMAP_FALSE
+WITH_POP3_OR_IMAP_OR_GMAIL_TRUE
+WITH_POP3_OR_IMAP_OR_GMAIL_FALSE
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE
+WITH_SSL_TRUE
+WITH_SSL_FALSE
+WITH_SASL_TRUE
+WITH_SASL_FALSE
+WITH_GMAIL_TRUE
+WITH_GMAIL_FALSE
+WITH_EVOLUTION_TRUE
+WITH_EVOLUTION_FALSE
+WITH_SYLPHEED_TRUE
+WITH_SYLPHEED_FALSE
+WITH_MIME_TRUE
+WITH_MIME_FALSE
+WITH_REGRESSION_TESTS_TRUE
+WITH_REGRESSION_TESTS_FALSE
+LIBOBJS
+LTLIBOBJS'
ac_subst_files=''
+ ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+CXX
+CXXFLAGS
+CCC
+CXXCPP
+F77
+FFLAGS
+PKG_CONFIG
+GNOME_CFLAGS
+GNOME_LIBS
+GMIME_CFLAGS
+GMIME_LIBS
+EVOLUTION_PLUGIN_CFLAGS
+EVOLUTION_PLUGIN_LIBS'
+
# Initialize some variables set by options.
ac_init_help=
@@ -493,34 +1036,48 @@ x_libraries=NONE
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
ac_prev=
+ac_dashdash=
for ac_option
do
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
+ eval $ac_prev=\$ac_option
ac_prev=
continue
fi
- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+ case $ac_option in
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
+ esac
# Accept the important Cygnus configure options, so we can diagnose typos.
- case $ac_option in
+ case $ac_dashdash$ac_option in
+ --)
+ ac_dashdash=yes ;;
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
@@ -542,33 +1099,45 @@ do
--config-cache | -C)
cache_file=config.cache ;;
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ -datadir | --datadir | --datadi | --datad)
ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
- | --da=*)
+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
datadir=$ac_optarg ;;
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+ | --dataroo | --dataro | --datar)
+ ac_prev=datarootdir ;;
+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+ datarootdir=$ac_optarg ;;
+
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- eval "enable_$ac_feature=no" ;;
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+ docdir=$ac_optarg ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+ dvidir=$ac_optarg ;;
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
- eval "enable_$ac_feature='$ac_optarg'" ;;
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -595,6 +1164,12 @@ do
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+ ac_prev=htmldir ;;
+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+ | --ht=*)
+ htmldir=$ac_optarg ;;
+
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
@@ -619,13 +1194,16 @@ do
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
+ -localedir | --localedir | --localedi | --localed | --locale)
+ ac_prev=localedir ;;
+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+ localedir=$ac_optarg ;;
+
-localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst \
- | --locals | --local | --loca | --loc | --lo)
+ | --localstate | --localstat | --localsta | --localst | --locals)
ac_prev=localstatedir ;;
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -690,6 +1268,16 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+ ac_prev=pdfdir ;;
+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+ pdfdir=$ac_optarg ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+ psdir=$ac_optarg ;;
+
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@@ -742,24 +1330,20 @@ do
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
- eval "with_$ac_package='$ac_optarg'" ;;
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=\$ac_optarg ;;
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/-/_/g'`
- eval "with_$ac_package=no" ;;
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=no ;;
--x)
# Obsolete; use --with-x.
@@ -790,8 +1374,7 @@ Try \`$0 --help' for more information." >&2
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
- eval "$ac_envvar='$ac_optarg'"
+ eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
@@ -811,27 +1394,19 @@ if test -n "$ac_prev"; then
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
+# Be sure to have absolute directory names.
+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ libdir localedir mandir
do
- eval ac_val=$`echo $ac_var`
+ eval ac_val=\$$ac_var
case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
- esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
-do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; }
done
# There might be people who depend on the old broken behavior: `$host'
@@ -858,122 +1433,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
test "$silent" = yes && exec 6>/dev/null
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+ { echo "$as_me: error: Working directory cannot be determined" >&2
+ { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+ { echo "$as_me: error: pwd does not report name of working directory" >&2
+ { (exit 1); exit 1; }; }
+
+
# 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_confdir=`(dirname "$0") 2>/dev/null ||
+ # Try the directory containing this script, then the parent directory.
+ ac_confdir=`$as_dirname -- "$0" ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$0" : 'X\(//\)[^/]' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ 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'`
+ 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
+ if test ! -r "$srcdir/$ac_unique_file"; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
- { 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 ($ac_unique_file) in $srcdir" >&2
+if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
- fi
fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
{ (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_F77_set=${F77+set}
-ac_env_F77_value=$F77
-ac_cv_env_F77_set=${F77+set}
-ac_cv_env_F77_value=$F77
-ac_env_FFLAGS_set=${FFLAGS+set}
-ac_env_FFLAGS_value=$FFLAGS
-ac_cv_env_FFLAGS_set=${FFLAGS+set}
-ac_cv_env_FFLAGS_value=$FFLAGS
-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_env_GNOME_CFLAGS_set=${GNOME_CFLAGS+set}
-ac_env_GNOME_CFLAGS_value=$GNOME_CFLAGS
-ac_cv_env_GNOME_CFLAGS_set=${GNOME_CFLAGS+set}
-ac_cv_env_GNOME_CFLAGS_value=$GNOME_CFLAGS
-ac_env_GNOME_LIBS_set=${GNOME_LIBS+set}
-ac_env_GNOME_LIBS_value=$GNOME_LIBS
-ac_cv_env_GNOME_LIBS_set=${GNOME_LIBS+set}
-ac_cv_env_GNOME_LIBS_value=$GNOME_LIBS
-ac_env_GMIME_CFLAGS_set=${GMIME_CFLAGS+set}
-ac_env_GMIME_CFLAGS_value=$GMIME_CFLAGS
-ac_cv_env_GMIME_CFLAGS_set=${GMIME_CFLAGS+set}
-ac_cv_env_GMIME_CFLAGS_value=$GMIME_CFLAGS
-ac_env_GMIME_LIBS_set=${GMIME_LIBS+set}
-ac_env_GMIME_LIBS_value=$GMIME_LIBS
-ac_cv_env_GMIME_LIBS_set=${GMIME_LIBS+set}
-ac_cv_env_GMIME_LIBS_value=$GMIME_LIBS
-ac_env_EVOLUTION_PLUGIN_CFLAGS_set=${EVOLUTION_PLUGIN_CFLAGS+set}
-ac_env_EVOLUTION_PLUGIN_CFLAGS_value=$EVOLUTION_PLUGIN_CFLAGS
-ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_set=${EVOLUTION_PLUGIN_CFLAGS+set}
-ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_value=$EVOLUTION_PLUGIN_CFLAGS
-ac_env_EVOLUTION_PLUGIN_LIBS_set=${EVOLUTION_PLUGIN_LIBS+set}
-ac_env_EVOLUTION_PLUGIN_LIBS_value=$EVOLUTION_PLUGIN_LIBS
-ac_cv_env_EVOLUTION_PLUGIN_LIBS_set=${EVOLUTION_PLUGIN_LIBS+set}
-ac_cv_env_EVOLUTION_PLUGIN_LIBS_value=$EVOLUTION_PLUGIN_LIBS
+ pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+ srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_env_${ac_var}_value=\$${ac_var}
+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
#
# Report the --help message.
@@ -982,7 +1511,7 @@ 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 <<_ACEOF
-\`configure' configures Mail Notification 4.0 to adapt to many kinds of systems.
+\`configure' configures Mail Notification 4.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1002,9 +1531,6 @@ Configuration:
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
-_ACEOF
-
- cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
@@ -1022,15 +1548,22 @@ Fine tuning of the installation directories:
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data [PREFIX/share]
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
- --infodir=DIR info documentation [PREFIX/info]
- --mandir=DIR man documentation [PREFIX/man]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/mail-notification]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -1049,7 +1582,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Mail Notification 4.0:";;
+ short | recursive ) echo "Configuration of Mail Notification 4.1:";;
esac
cat <<\_ACEOF
@@ -1077,10 +1610,8 @@ Optional Features:
build and run regression tests
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
- --enable-shared[=PKGS]
- build shared libraries [default=yes]
- --enable-static[=PKGS]
- build static libraries [default=yes]
+ --enable-shared[=PKGS] build shared libraries [default=yes]
+ --enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-dependency-tracking speeds up one-time build
@@ -1096,8 +1627,7 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-pic try to use only PIC/non-PIC objects [default=use
both]
- --with-tags[=TAGS]
- include additional configurations [automatic]
+ --with-tags[=TAGS] include additional configurations [automatic]
--with-reentrant-resolver
specify that the system resolver is reentrant
[autodetect]
@@ -1109,8 +1639,9 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
- headers in a nonstandard directory <include dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
CPP C preprocessor
CXX C++ compiler command
CXXFLAGS C++ compiler flags
@@ -1134,120 +1665,86 @@ it to find libraries and programs with nonstandard names/locations.
Report bugs to <jylefort@brutele.be>.
_ACEOF
+ac_status=$?
fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
- ac_popdir=`pwd`
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d $ac_dir || continue
+ test -d "$ac_dir" || continue
ac_builddir=.
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
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
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
case $srcdir in
- .) # No --srcdir option. We are building in place.
+ .) # 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_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
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
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
-
- cd $ac_dir
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f $ac_srcdir/configure.gnu; then
- echo
- $SHELL $ac_srcdir/configure.gnu --help=recursive
- elif test -f $ac_srcdir/configure; then
- echo
- $SHELL $ac_srcdir/configure --help=recursive
- elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
- echo
- $ac_configure --help
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+ cd "$ac_dir" || { ac_status=$?; continue; }
+ # Check for guested configure.
+ if test -f "$ac_srcdir/configure.gnu"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+ elif test -f "$ac_srcdir/configure"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
- cd $ac_popdir
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
done
fi
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Mail Notification configure 4.0
-generated by GNU Autoconf 2.59
+Mail Notification configure 4.1
+generated by GNU Autoconf 2.61
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
- exit 0
+ exit
fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Mail Notification $as_me 4.0, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+It was created by Mail Notification $as_me 4.1, which was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
_ACEOF
+exec 5>>config.log
{
cat <<_ASUNAME
## --------- ##
@@ -1266,7 +1763,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown`
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
/bin/machine = `(/bin/machine) 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`
@@ -1280,6 +1777,7 @@ do
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
+IFS=$as_save_IFS
} >&5
@@ -1301,7 +1799,6 @@ _ACEOF
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
-ac_sep=
ac_must_keep_next=false
for ac_pass in 1 2
do
@@ -1312,7 +1809,7 @@ do
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+ *\'*)
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1334,9 +1831,7 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
- # Get rid of the leading space.
- ac_sep=" "
+ ac_configure_args="$ac_configure_args '$ac_arg'"
;;
esac
done
@@ -1347,8 +1842,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_
# 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.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
@@ -1361,20 +1856,34 @@ trap 'exit_status=$?
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
-{
+(
+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
(set) 2>&1 |
- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
- ;;
+ "s/'\''/'\''\\\\'\'''\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+ ;; #(
*)
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
-}
+ esac |
+ sort
+)
echo
cat <<\_ASBOX
@@ -1385,22 +1894,28 @@ _ASBOX
echo
for ac_var in $ac_subst_vars
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
if test -n "$ac_subst_files"; then
cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
_ASBOX
echo
for ac_var in $ac_subst_files
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1412,26 +1927,24 @@ _ASBOX
## ----------- ##
_ASBOX
echo
- sed "/^$/d" confdefs.h | sort
+ cat 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 &&
- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
- ' 0
+' 0
for ac_signal in 1 2 13 15; do
trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
# Predefined preprocessor variables.
@@ -1462,14 +1975,17 @@ _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
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
- else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
- fi
+if test -n "$CONFIG_SITE"; then
+ set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+ set x "$ac_default_prefix/share/config.site" \
+ "$ac_default_prefix/etc/config.site"
fi
-for ac_site_file in $CONFIG_SITE; do
+shift
+for ac_site_file
+do
if test -r "$ac_site_file"; then
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1485,8 +2001,8 @@ if test -r "$cache_file"; then
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
- [\\/]* | ?:[\\/]* ) . $cache_file;;
- *) . ./$cache_file;;
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
+ *) . "./$cache_file";;
esac
fi
else
@@ -1498,12 +2014,11 @@ fi
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
- eval ac_new_val="\$ac_env_${ac_var}_value"
+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
+ eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -1528,8 +2043,7 @@ echo "$as_me: current value: $ac_new_val" >&2;}
# 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_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -1546,12 +2060,6 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov
{ (exit 1); exit 1; }; }
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
-
@@ -1576,6 +2084,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+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
@@ -1587,8 +2100,8 @@ if test "x$prefix" = xNONE; then
echo $ECHO_N "checking for prefix by $ECHO_C" >&6
# Extract the first word of "gnome-open", so it can be a program name with args.
set dummy gnome-open; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_ac_prefix_program+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -1603,62 +2116,84 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_prefix_program="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
ac_prefix_program=$ac_cv_path_ac_prefix_program
-
if test -n "$ac_prefix_program"; then
- echo "$as_me:$LINENO: result: $ac_prefix_program" >&5
-echo "${ECHO_T}$ac_prefix_program" >&6
+ { echo "$as_me:$LINENO: result: $ac_prefix_program" >&5
+echo "${ECHO_T}$ac_prefix_program" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -n "$ac_prefix_program"; then
- prefix=`(dirname "$ac_prefix_program") 2>/dev/null ||
+ prefix=`$as_dirname -- "$ac_prefix_program" ||
$as_expr X"$ac_prefix_program" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_prefix_program" : 'X\(//\)[^/]' \| \
X"$ac_prefix_program" : 'X\(//\)$' \| \
- X"$ac_prefix_program" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_prefix_program" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$ac_prefix_program" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- prefix=`(dirname "$prefix") 2>/dev/null ||
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ prefix=`$as_dirname -- "$prefix" ||
$as_expr X"$prefix" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$prefix" : 'X\(//\)[^/]' \| \
X"$prefix" : 'X\(//\)$' \| \
- X"$prefix" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$prefix" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$prefix" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
fi
fi
### command line arguments
-# Check whether --enable-mbox or --disable-mbox was given.
+# Check whether --enable-mbox was given.
if test "${enable_mbox+set}" = set; then
- enableval="$enable_mbox"
- case "$enableval" in
+ enableval=$enable_mbox; case "$enableval" in
yes|no) enable_mbox=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-mbox" >&5
echo "$as_me: error: bad value $enableval for --enable-mbox" >&2;}
@@ -1666,11 +2201,11 @@ echo "$as_me: error: bad value $enableval for --enable-mbox" >&2;}
esac
else
enable_mbox=yes
-fi;
-# Check whether --enable-mh or --disable-mh was given.
+fi
+
+# Check whether --enable-mh was given.
if test "${enable_mh+set}" = set; then
- enableval="$enable_mh"
- case "$enableval" in
+ enableval=$enable_mh; case "$enableval" in
yes|no) enable_mh=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-mh" >&5
echo "$as_me: error: bad value $enableval for --enable-mh" >&2;}
@@ -1678,11 +2213,11 @@ echo "$as_me: error: bad value $enableval for --enable-mh" >&2;}
esac
else
enable_mh=yes
-fi;
-# Check whether --enable-maildir or --disable-maildir was given.
+fi
+
+# Check whether --enable-maildir was given.
if test "${enable_maildir+set}" = set; then
- enableval="$enable_maildir"
- case "$enableval" in
+ enableval=$enable_maildir; case "$enableval" in
yes|no) enable_maildir=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-maildir" >&5
echo "$as_me: error: bad value $enableval for --enable-maildir" >&2;}
@@ -1690,11 +2225,11 @@ echo "$as_me: error: bad value $enableval for --enable-maildir" >&2;}
esac
else
enable_maildir=yes
-fi;
-# Check whether --enable-pop3 or --disable-pop3 was given.
+fi
+
+# Check whether --enable-pop3 was given.
if test "${enable_pop3+set}" = set; then
- enableval="$enable_pop3"
- case "$enableval" in
+ enableval=$enable_pop3; case "$enableval" in
yes|no) enable_pop3=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-pop3" >&5
echo "$as_me: error: bad value $enableval for --enable-pop3" >&2;}
@@ -1702,11 +2237,11 @@ echo "$as_me: error: bad value $enableval for --enable-pop3" >&2;}
esac
else
enable_pop3=yes
-fi;
-# Check whether --enable-imap or --disable-imap was given.
+fi
+
+# Check whether --enable-imap was given.
if test "${enable_imap+set}" = set; then
- enableval="$enable_imap"
- case "$enableval" in
+ enableval=$enable_imap; case "$enableval" in
yes|no) enable_imap=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-imap" >&5
echo "$as_me: error: bad value $enableval for --enable-imap" >&2;}
@@ -1714,11 +2249,11 @@ echo "$as_me: error: bad value $enableval for --enable-imap" >&2;}
esac
else
enable_imap=yes
-fi;
-# Check whether --enable-ssl or --disable-ssl was given.
+fi
+
+# Check whether --enable-ssl was given.
if test "${enable_ssl+set}" = set; then
- enableval="$enable_ssl"
- case "$enableval" in
+ enableval=$enable_ssl; case "$enableval" in
yes|no) enable_ssl=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-ssl" >&5
echo "$as_me: error: bad value $enableval for --enable-ssl" >&2;}
@@ -1726,11 +2261,11 @@ echo "$as_me: error: bad value $enableval for --enable-ssl" >&2;}
esac
else
enable_ssl=yes
-fi;
-# Check whether --enable-sasl or --disable-sasl was given.
+fi
+
+# Check whether --enable-sasl was given.
if test "${enable_sasl+set}" = set; then
- enableval="$enable_sasl"
- case "$enableval" in
+ enableval=$enable_sasl; case "$enableval" in
yes|no) enable_sasl=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-sasl" >&5
echo "$as_me: error: bad value $enableval for --enable-sasl" >&2;}
@@ -1738,11 +2273,11 @@ echo "$as_me: error: bad value $enableval for --enable-sasl" >&2;}
esac
else
enable_sasl=yes
-fi;
-# Check whether --enable-ipv6 or --disable-ipv6 was given.
+fi
+
+# Check whether --enable-ipv6 was given.
if test "${enable_ipv6+set}" = set; then
- enableval="$enable_ipv6"
- case "$enableval" in
+ enableval=$enable_ipv6; case "$enableval" in
yes|no) enable_ipv6=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-ipv6" >&5
echo "$as_me: error: bad value $enableval for --enable-ipv6" >&2;}
@@ -1750,11 +2285,11 @@ echo "$as_me: error: bad value $enableval for --enable-ipv6" >&2;}
esac
else
enable_ipv6=yes
-fi;
-# Check whether --enable-gmail or --disable-gmail was given.
+fi
+
+# Check whether --enable-gmail was given.
if test "${enable_gmail+set}" = set; then
- enableval="$enable_gmail"
- case "$enableval" in
+ enableval=$enable_gmail; case "$enableval" in
yes|no) enable_gmail=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-gmail" >&5
echo "$as_me: error: bad value $enableval for --enable-gmail" >&2;}
@@ -1762,11 +2297,11 @@ echo "$as_me: error: bad value $enableval for --enable-gmail" >&2;}
esac
else
enable_gmail=yes
-fi;
-# Check whether --enable-evolution or --disable-evolution was given.
+fi
+
+# Check whether --enable-evolution was given.
if test "${enable_evolution+set}" = set; then
- enableval="$enable_evolution"
- case "$enableval" in
+ enableval=$enable_evolution; case "$enableval" in
yes|no) enable_evolution=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-evolution" >&5
echo "$as_me: error: bad value $enableval for --enable-evolution" >&2;}
@@ -1774,11 +2309,11 @@ echo "$as_me: error: bad value $enableval for --enable-evolution" >&2;}
esac
else
enable_evolution=yes
-fi;
-# Check whether --enable-mozilla or --disable-mozilla was given.
+fi
+
+# Check whether --enable-mozilla was given.
if test "${enable_mozilla+set}" = set; then
- enableval="$enable_mozilla"
- case "$enableval" in
+ enableval=$enable_mozilla; case "$enableval" in
yes|no) enable_mozilla=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-mozilla" >&5
echo "$as_me: error: bad value $enableval for --enable-mozilla" >&2;}
@@ -1786,11 +2321,11 @@ echo "$as_me: error: bad value $enableval for --enable-mozilla" >&2;}
esac
else
enable_mozilla=yes
-fi;
-# Check whether --enable-sylpheed or --disable-sylpheed was given.
+fi
+
+# Check whether --enable-sylpheed was given.
if test "${enable_sylpheed+set}" = set; then
- enableval="$enable_sylpheed"
- case "$enableval" in
+ enableval=$enable_sylpheed; case "$enableval" in
yes|no) enable_sylpheed=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-sylpheed" >&5
echo "$as_me: error: bad value $enableval for --enable-sylpheed" >&2;}
@@ -1798,11 +2333,11 @@ echo "$as_me: error: bad value $enableval for --enable-sylpheed" >&2;}
esac
else
enable_sylpheed=yes
-fi;
-# Check whether --enable-sylpheed-locking or --disable-sylpheed-locking was given.
+fi
+
+# Check whether --enable-sylpheed-locking was given.
if test "${enable_sylpheed_locking+set}" = set; then
- enableval="$enable_sylpheed_locking"
- case "$enableval" in
+ enableval=$enable_sylpheed_locking; case "$enableval" in
yes|no) enable_sylpheed_locking=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-sylpheed-locking" >&5
echo "$as_me: error: bad value $enableval for --enable-sylpheed-locking" >&2;}
@@ -1810,12 +2345,12 @@ echo "$as_me: error: bad value $enableval for --enable-sylpheed-locking" >&2;}
esac
else
enable_sylpheed_locking=no
-fi;
+fi
-# Check whether --enable-compile-warnings or --disable-compile-warnings was given.
+
+# Check whether --enable-compile-warnings was given.
if test "${enable_compile_warnings+set}" = set; then
- enableval="$enable_compile_warnings"
- case "$enableval" in
+ enableval=$enable_compile_warnings; case "$enableval" in
yes|no|error) enable_compile_warnings=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-compile-warnings" >&5
echo "$as_me: error: bad value $enableval for --enable-compile-warnings" >&2;}
@@ -1823,7 +2358,8 @@ echo "$as_me: error: bad value $enableval for --enable-compile-warnings" >&2;}
esac
else
enable_compile_warnings=no
-fi;
+fi
+
if test $enable_compile_warnings = no; then
WARN_CFLAGS=
@@ -1844,15 +2380,15 @@ else
-Wpacked \
-Wredundant-decls \
-Wnested-externs \
--Winline"
+-Winline \
+-Wno-pointer-sign"
test $enable_compile_warnings = error && WARN_CFLAGS="$WARN_CFLAGS -Werror"
fi
-# Check whether --enable-debug or --disable-debug was given.
+# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then
- enableval="$enable_debug"
- case "$enableval" in
+ enableval=$enable_debug; case "$enableval" in
yes|no) enable_debug=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-debug" >&5
echo "$as_me: error: bad value $enableval for --enable-debug" >&2;}
@@ -1860,7 +2396,8 @@ echo "$as_me: error: bad value $enableval for --enable-debug" >&2;}
esac
else
enable_debug=no
-fi;
+fi
+
if test $enable_debug = no; then
DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
@@ -1869,10 +2406,9 @@ else
fi
-# Check whether --enable-regression-tests or --disable-regression-tests was given.
+# Check whether --enable-regression-tests was given.
if test "${enable_regression_tests+set}" = set; then
- enableval="$enable_regression_tests"
- case "$enableval" in
+ enableval=$enable_regression_tests; case "$enableval" in
yes|no) enable_regression_tests=$enableval ;;
*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-regression-tests" >&5
echo "$as_me: error: bad value $enableval for --enable-regression-tests" >&2;}
@@ -1880,110 +2416,161 @@ echo "$as_me: error: bad value $enableval for --enable-regression-tests" >&2;}
esac
else
enable_regression_tests=no
-fi;
+fi
+
### initialization
# needed by AC_REENTRANT_RESOLVER
ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
break
- elif test -f $ac_dir/install.sh; then
+ elif test -f "$ac_dir/install.sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install.sh -c"
break
- elif test -f $ac_dir/shtool; then
+ elif test -f "$ac_dir/shtool"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/shtool install -c"
break
fi
done
if test -z "$ac_aux_dir"; then
- { { 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;}
+ { { 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
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
if test "${ac_cv_build+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
- ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
if test "${ac_cv_host+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
- ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
+fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
if test "${ac_cv_target+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
- ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+ if test "x$target_alias" = x; then
+ ac_cv_target=$ac_cv_host
+else
+ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
{ (exit 1); exit 1; }; }
+fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+echo "$as_me: error: invalid value of canonical target" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
# The aliases save the names the user supplied, while $host etc.
@@ -1993,7 +2580,8 @@ test -n "$target_alias" &&
NONENONEs,x,x, &&
program_prefix=${target_alias}-
-am__api_version="1.9"
+am__api_version='1.10'
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -2007,8 +2595,8 @@ am__api_version="1.9"
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: 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
@@ -2030,7 +2618,7 @@ case $as_dir/ in
# 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 -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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.
@@ -2049,21 +2637,22 @@ case $as_dir/ in
;;
esac
done
+IFS=$as_save_IFS
fi
if test "${ac_cv_path_install+set}" = set; then
INSTALL=$ac_cv_path_install
else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
- # removed, or if the path is relative.
+ # removed, or if the value is a relative name.
INSTALL=$ac_install_sh
fi
fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -2073,8 +2662,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+{ 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 > conftest.file
@@ -2116,20 +2705,20 @@ echo "$as_me: error: newly created file is older than distributed files!
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ 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"
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
# Double any \ or $. echo might interpret backslashes.
# By default was `s,x,x', remove it if useless.
cat <<\_ACEOF >conftest.sed
s/[\\$]/&&/g;s/;s,x,x,$//
_ACEOF
program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
+rm -f conftest.sed
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -2144,45 +2733,60 @@ else
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
else
- mkdir_p='$(install_sh) -d'
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
fi
fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
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
+{ 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
@@ -2195,54 +2799,57 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+ { 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
+ { 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 "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
all:
- @echo 'ac_maketemp="$(MAKE)"'
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
_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
- eval ac_cv_prog_make_${ac_make}_set=yes
-else
- eval ac_cv_prog_make_${ac_make}_set=no
-fi
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
rm -f conftest.make
fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SET_MAKE=
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2255,12 +2862,16 @@ else
fi
rmdir .tst 2>/dev/null
-# 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
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if 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
fi
# test whether we have cygpath
@@ -2275,7 +2886,7 @@ fi
# Define the identity of the package.
PACKAGE='mail-notification'
- VERSION='4.0'
+ VERSION='4.1'
cat >>confdefs.h <<_ACEOF
@@ -2303,7 +2914,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $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
@@ -2313,8 +2924,8 @@ 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
+{ 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
@@ -2327,32 +2938,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+ { 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
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
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
+{ 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
@@ -2365,33 +2978,47 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
- 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
+ { 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
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- STRIP=$ac_ct_STRIP
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
else
STRIP="$ac_cv_prog_STRIP"
fi
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -2405,20 +3032,18 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+ # Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
- enableval="$enable_maintainer_mode"
- USE_MAINTAINER_MODE=$enableval
+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
else
USE_MAINTAINER_MODE=no
-fi;
- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-
+fi
-if test $USE_MAINTAINER_MODE = yes; then
+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+ if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
@@ -2429,12 +3054,11 @@ fi
MAINT=$MAINTAINER_MODE_TRUE
- ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers config.h"
-# Check whether --enable-shared or --disable-shared was given.
+# Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then
- enableval="$enable_shared"
- p=${PACKAGE-default}
+ enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
@@ -2453,12 +3077,12 @@ if test "${enable_shared+set}" = set; then
esac
else
enable_shared=yes
-fi;
+fi
+
-# Check whether --enable-static or --disable-static was given.
+# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then
- enableval="$enable_static"
- p=${PACKAGE-default}
+ enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
@@ -2477,12 +3101,12 @@ if test "${enable_static+set}" = set; then
esac
else
enable_static=yes
-fi;
+fi
+
-# Check whether --enable-fast-install or --disable-fast-install was given.
+# Check whether --enable-fast-install was given.
if test "${enable_fast_install+set}" = set; then
- enableval="$enable_fast_install"
- p=${PACKAGE-default}
+ enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
@@ -2501,11 +3125,12 @@ if test "${enable_fast_install+set}" = set; then
esac
else
enable_fast_install=yes
-fi;
+fi
+
DEPDIR="${am__leading_dot}deps"
- ac_config_commands="$ac_config_commands depfiles"
+ac_config_commands="$ac_config_commands depfiles"
am_make=${MAKE-make}
@@ -2515,8 +3140,8 @@ am__doit:
.PHONY: am__doit
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
+{ 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
@@ -2543,22 +3168,20 @@ if test "$am__include" = "#"; then
fi
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
+{ 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.
+# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then
- enableval="$enable_dependency_tracking"
+ enableval=$enable_dependency_tracking;
+fi
-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
+ if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -2567,7 +3190,6 @@ else
fi
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2576,8 +3198,8 @@ 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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -2590,32 +3212,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -2628,36 +3252,51 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
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.
+ 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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -2670,74 +3309,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-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:$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
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_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:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
+ fi
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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -2751,7 +3350,7 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -2762,6 +3361,7 @@ do
fi
done
done
+IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
@@ -2779,22 +3379,23 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
+ for ac_prog in cl.exe
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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -2807,36 +3408,38 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$CC" && break
done
fi
if test -z "$CC"; then
ac_ct_CC=$CC
- for ac_prog in cl
+ for ac_prog in cl.exe
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
+{ 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
else
@@ -2849,29 +3452,45 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_CC" && break
done
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
fi
fi
@@ -2884,21 +3503,35 @@ See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
@@ -2923,47 +3556,77 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out"
# 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:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
- (eval $ac_link_default) 2>&5
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort. b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions. Remove them first so a
+# subsequent execution test works.
+ac_rmfiles=
+for ac_file in $ac_files
+do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link_default") 2>&5
ac_status=$?
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.
-
-# 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=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
- ;;
- conftest.$ac_ext )
- # This is the source file.
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
# certainly right.
break;;
*.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
+ # argument, so we may need to know it at that point already.
+ # Even if this section looks crufty: it has the advantage of
+ # actually working.
break;;
* )
break;;
esac
done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
else
+ ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2975,19 +3638,21 @@ See \`config.log' for more details." >&2;}
fi
ac_exeext=$ac_cv_exeext
-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
+# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+{ 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:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -3006,22 +3671,27 @@ See \`config.log' for more details." >&2;}
fi
fi
fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
rm -f a.out a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-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:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-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
+{ 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:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -3032,9 +3702,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
break;;
* ) break;;
esac
@@ -3048,14 +3717,14 @@ See \`config.log' for more details." >&2;}
fi
rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+{ 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:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $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
@@ -3075,14 +3744,20 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>&5
ac_status=$?
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
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
@@ -3100,12 +3775,12 @@ fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ 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:$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
+{ 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
@@ -3128,50 +3803,49 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ 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:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ 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
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3187,38 +3861,118 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
+ CFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+{ 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
elif test $ac_cv_prog_cc_g = yes; then
@@ -3234,12 +3988,12 @@ else
CFLAGS=
fi
fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_prog_cc_stdc=no
+ ac_cv_prog_cc_c89=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3273,12 +4027,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
+ as 'x'. The following induces an error, until -std is added to get
proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
+ that's true only with -std. */
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -3293,205 +4052,57 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
return 0;
}
_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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_cv_prog_cc_stdc=$ac_arg
-break
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
CC=$ac_save_CC
fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+ xno)
+ { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
*)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
+ CC="$CC $ac_cv_prog_cc_c89"
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
esac
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
- choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
- for ac_declaration in \
- '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
- break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-fi
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3500,8 +4111,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
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
+{ 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
@@ -3565,6 +4176,7 @@ else
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3590,13 +4202,11 @@ else
fi
fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+{ 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
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -3607,8 +4217,8 @@ else
fi
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3661,37 +4271,184 @@ done
fi
SED=$lt_cv_path_SED
-echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6
+{ echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6; }
+
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_GREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_GREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+else
+ ac_cv_path_GREP=$GREP
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
+
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
- then ac_cv_prog_egrep='grep -E'
- else ac_cv_prog_egrep='egrep'
+ ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+ $ac_path_EGREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+
+ fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then
- withval="$with_gnu_ld"
- test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-fi;
+fi
+
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -3720,11 +4477,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
;;
esac
elif test "$with_gnu_ld" = yes; then
- echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
else
- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3757,17 +4514,17 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+ { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3781,20 +4538,20 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
if test "${lt_cv_ld_reload_flag+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
lt_cv_ld_reload_flag='-r'
fi
-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
"" | " "*) ;;
@@ -3811,8 +4568,8 @@ case $host_os in
;;
esac
-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3860,23 +4617,23 @@ else
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
NM="$lt_cv_path_NM"
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
fi
-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3926,7 +4683,7 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3980,11 +4737,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -4051,8 +4808,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
esac
fi
-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -4070,11 +4827,11 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
compiler=$CC
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then
- enableval="$enable_libtool_lock"
+ enableval=$enable_libtool_lock;
+fi
-fi;
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
@@ -4101,7 +4858,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4104 "configure"' > conftest.$ac_ext
+ echo '#line 4861 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4186,8 +4943,8 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -4213,35 +4970,32 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-lt_cv_cc_needs_belf=no
+ lt_cv_cc_needs_belf=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -4250,8 +5004,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS"
@@ -4288,8 +5042,8 @@ 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:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ 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
CPP=
@@ -4323,24 +5077,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&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
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -4349,9 +5101,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4361,24 +5114,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&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
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -4389,6 +5140,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -4406,8 +5158,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -4430,24 +5182,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&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
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -4456,9 +5206,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4468,24 +5219,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&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
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -4496,6 +5245,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -4518,8 +5268,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ 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
@@ -4543,35 +5293,31 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -4627,6 +5373,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
+#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -4646,18 +5393,27 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -4670,12 +5426,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ 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 <<\_ACEOF
@@ -4698,9 +5456,9 @@ 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 "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -4714,38 +5472,35 @@ $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>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err 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
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -4760,18 +5515,19 @@ done
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4782,41 +5538,37 @@ $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>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err 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
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4825,24 +5577,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&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
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -4850,9 +5600,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
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
+{ 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:$ac_c_preproc_warn_flag in
@@ -4876,25 +5627,24 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
+ ( cat <<\_ASBOX
## ---------------------------------- ##
## Report this to jylefort@brutele.be ##
## ---------------------------------- ##
_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ ) | sed "s/^/$as_me: WARNING: /" >&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 "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -4906,18 +5656,22 @@ fi
done
-ac_ext=cc
+ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
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
-if test -n "$ac_tool_prefix"; then
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -4930,36 +5684,38 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+ { echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$CXX" && break
done
fi
if test -z "$CXX"; then
ac_ct_CXX=$CXX
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
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
+{ 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
else
@@ -4972,55 +5728,85 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_CXX" && break
done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- CXX=$ac_ct_CXX
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CXX=$ac_ct_CXX
+ fi
fi
-
+ fi
+fi
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C++ compiler version" >&5
+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-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
+{ 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
@@ -5043,50 +5829,49 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+{ 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:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+{ 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
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5102,160 +5887,134 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-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
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
-else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
-fi
-for ac_declaration in \
- '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
+ CXXFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
+
int
main ()
{
-exit (42);
+
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
:
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
+
int
main ()
{
-exit (42);
+
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
- break
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_ext=cc
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ 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
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-g"
+ fi
+else
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
+fi
+ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
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'
@@ -5263,8 +6022,8 @@ ac_compiler_gnu=$ac_cv_cxx_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
+{ 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
@@ -5328,6 +6087,7 @@ else
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -5353,13 +6113,11 @@ else
fi
fi
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
+{ 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
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
@@ -5375,13 +6133,13 @@ fi
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
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:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+{ 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; }
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5411,24 +6169,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -5437,9 +6193,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5449,24 +6206,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -5477,6 +6232,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -5494,8 +6250,8 @@ fi
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
@@ -5518,24 +6274,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -5544,9 +6298,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5556,24 +6311,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -5584,6 +6337,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
@@ -5599,7 +6353,7 @@ See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
-ac_ext=cc
+ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
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'
@@ -5613,12 +6367,12 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5631,36 +6385,38 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
F77=$ac_cv_prog_F77
if test -n "$F77"; then
- echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6
+ { echo "$as_me:$LINENO: result: $F77" >&5
+echo "${ECHO_T}$F77" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$F77" && break
done
fi
if test -z "$F77"; then
ac_ct_F77=$F77
- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
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
+{ 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_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5673,48 +6429,78 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
ac_ct_F77=$ac_cv_prog_ac_ct_F77
if test -n "$ac_ct_F77"; then
- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+echo "${ECHO_T}$ac_ct_F77" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_F77" && break
done
- F77=$ac_ct_F77
+ if test "x$ac_ct_F77" = x; then
+ F77=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ F77=$ac_ct_F77
+ fi
fi
# Provide some information about the compiler.
-echo "$as_me:5703:" \
- "checking for Fortran 77 compiler version" >&5
+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
@@ -5724,8 +6510,8 @@ rm -f a.out
# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext
ac_ext=F
-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
if test "${ac_cv_f77_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5738,46 +6524,42 @@ else
end
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_f77_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
ac_ext=$ac_save_ext
ac_test_FFLAGS=${FFLAGS+set}
ac_save_FFLAGS=$FFLAGS
FFLAGS=
-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
if test "${ac_cv_prog_f77_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5788,39 +6570,35 @@ cat >conftest.$ac_ext <<_ACEOF
end
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_f77_g=no
+ ac_cv_prog_f77_g=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
@@ -5849,8 +6627,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
if test "${lt_cv_sys_max_cmd_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5958,19 +6736,19 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
else
- echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+ { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
fi
# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6005,7 +6783,7 @@ hpux*) # Its linker distinguishes data from code symbols
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
-linux*)
+linux* | k*bsd*-gnu)
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -6174,15 +6952,15 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
+ { echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6; }
else
- echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+ { echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6; }
fi
-echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6196,8 +6974,8 @@ else
fi
rmdir .libs 2>/dev/null
fi
-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+echo "${ECHO_T}$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
@@ -6248,8 +7026,8 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -6262,32 +7040,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
+ { echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6300,27 +7080,41 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- AR=$ac_ct_AR
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
else
AR="$ac_cv_prog_AR"
fi
@@ -6328,8 +7122,8 @@ fi
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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -6342,32 +7136,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -6380,27 +7176,41 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- RANLIB=$ac_ct_RANLIB
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
+ fi
else
RANLIB="$ac_cv_prog_RANLIB"
fi
@@ -6408,8 +7218,8 @@ fi
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
+{ 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
@@ -6422,32 +7232,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+ { 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
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
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
+{ 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
@@ -6460,27 +7272,41 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
- 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
+ { 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
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- STRIP=$ac_ct_STRIP
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
else
STRIP="$ac_cv_prog_STRIP"
fi
@@ -6539,8 +7365,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6592,17 +7418,17 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
- echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for file" >&5
+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6654,11 +7480,11 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
else
@@ -6673,21 +7499,21 @@ esac
enable_dlopen=no
enable_win32_dll=no
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then
- enableval="$enable_libtool_lock"
+ enableval=$enable_libtool_lock;
+fi
-fi;
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-# Check whether --with-pic or --without-pic was given.
+# Check whether --with-pic was given.
if test "${with_pic+set}" = set; then
- withval="$with_pic"
- pic_mode="$withval"
+ withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-fi;
+fi
+
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
@@ -6745,8 +7571,8 @@ if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6763,11 +7589,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6766: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7592: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6770: \$? = $ac_status" >&5
+ echo "$as_me:7596: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6780,8 +7606,8 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -6795,8 +7621,8 @@ lt_prog_compiler_wl=
lt_prog_compiler_pic=
lt_prog_compiler_static=
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
@@ -6925,7 +7751,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_static='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
@@ -7005,16 +7831,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
esac
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7031,11 +7857,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7034: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7860: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7038: \$? = $ac_status" >&5
+ echo "$as_me:7864: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7048,8 +7874,8 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
@@ -7076,8 +7902,8 @@ esac
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_static_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7104,8 +7930,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
if test x"$lt_prog_compiler_static_works" = xyes; then
:
@@ -7114,8 +7940,8 @@ else
fi
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7135,11 +7961,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7138: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7964: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7142: \$? = $ac_status" >&5
+ echo "$as_me:7968: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7161,23 +7987,23 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+ { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -7187,8 +8013,8 @@ else
need_locks=no
fi
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
runpath_var=
allow_undefined_flag=
@@ -7364,7 +8190,7 @@ EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -7390,12 +8216,13 @@ EOF
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs=no
else
ld_shlibs=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -7603,27 +8430,23 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -7634,8 +8457,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7664,27 +8489,23 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -7695,8 +8516,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7827,7 +8650,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -7929,7 +8752,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
link_all_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -8145,8 +8968,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
esac
fi
-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
#
@@ -8166,8 +8989,8 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8204,16 +9027,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
cat conftest.err 1>&5
fi
$rm conftest*
- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6
+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
;;
esac
fi
;;
esac
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8419,18 +9242,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -8586,7 +9397,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -8615,7 +9426,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
+netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -8624,7 +9435,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+ dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
@@ -8800,8 +9611,8 @@ uts4*)
dynamic_linker=no
;;
esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -8809,8 +9620,8 @@ if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var" || \
@@ -8834,8 +9645,8 @@ else
# directories.
hardcode_action=unsupported
fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6; }
if test "$hardcode_action" = relink; then
# Fast installation is not supported
@@ -8848,29 +9659,29 @@ fi
striplib=
old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
;;
*)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
;;
esac
fi
@@ -8902,8 +9713,8 @@ else
darwin*)
# if libdl is installed we need to link against it
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8916,56 +9727,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 dlopen ();
int
main ()
{
-dlopen ();
+return dlopen ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
@@ -8979,8 +9787,8 @@ fi
;;
*)
- echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9007,73 +9815,64 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef shl_load
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 shl_load ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
+#if defined __stub_shl_load || defined __stub___shl_load
choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != shl_load;
+return shl_load ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_shl_load=no
+ ac_cv_func_shl_load=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
if test $ac_cv_func_shl_load = yes; then
lt_cv_dlopen="shl_load"
else
- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9086,61 +9885,58 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 shl_load ();
int
main ()
{
-shl_load ();
+return shl_load ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_shl_load=no
+ ac_cv_lib_dld_shl_load=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
else
- echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9167,73 +9963,64 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef dlopen
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 dlopen ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
+#if defined __stub_dlopen || defined __stub___dlopen
choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != dlopen;
+return dlopen ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_dlopen=no
+ ac_cv_func_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
if test $ac_cv_func_dlopen = yes; then
lt_cv_dlopen="dlopen"
else
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9246,61 +10033,58 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 dlopen ();
int
main ()
{
-dlopen ();
+return dlopen ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9313,61 +10097,58 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 dlopen ();
int
main ()
{
-dlopen ();
+return dlopen ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_svld_dlopen=no
+ ac_cv_lib_svld_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
if test $ac_cv_lib_svld_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9380,56 +10161,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 dld_link ();
int
main ()
{
-dld_link ();
+return dld_link ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dld_dld_link=no
+ ac_cv_lib_dld_dld_link=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
@@ -9469,8 +10247,8 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9480,7 +10258,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9483 "configure"
+#line 10261 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9564,13 +10342,13 @@ rm -fr conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
if test "x$lt_cv_dlopen_self" = xyes; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9580,7 +10358,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9583 "configure"
+#line 10361 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9664,8 +10442,8 @@ rm -fr conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
fi
CPPFLAGS="$save_CPPFLAGS"
@@ -9687,13 +10465,13 @@ fi
# Report which library types will actually be built
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
@@ -9713,15 +10491,15 @@ aix4* | aix5*)
fi
;;
esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
+{ echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -10213,11 +10991,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC="$lt_save_CC"
-# Check whether --with-tags or --without-tags was given.
+# Check whether --with-tags was given.
if test "${with_tags+set}" = set; then
- withval="$with_tags"
- tagnames="$withval"
-fi;
+ withval=$with_tags; tagnames="$withval"
+fi
+
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
@@ -10271,7 +11049,7 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
- ac_ext=cc
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
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'
@@ -10390,18 +11168,18 @@ if test "$GXX" = yes; then
# Set up default GNU C++ configuration
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then
- withval="$with_gnu_ld"
- test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-fi;
+fi
+
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -10430,11 +11208,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
;;
esac
elif test "$with_gnu_ld" = yes; then
- echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
else
- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10467,17 +11245,17 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+ { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -10491,8 +11269,8 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -10542,8 +11320,8 @@ else
fi
# PORTME: fill in a description of your system's C++ link characteristics
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
ld_shlibs_CXX=yes
case $host_os in
aix3*)
@@ -10655,27 +11433,23 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -10686,8 +11460,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -10717,27 +11493,23 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -10748,8 +11520,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -10897,7 +11671,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
@@ -11056,7 +11830,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -11158,7 +11932,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -11480,8 +12254,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
ld_shlibs_CXX=no
;;
esac
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
@@ -11620,8 +12394,8 @@ lt_prog_compiler_wl_CXX=
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@ -11725,7 +12499,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
;;
esac
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -11768,7 +12542,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
;;
esac
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -11811,7 +12585,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -11894,16 +12668,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
esac
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11920,11 +12694,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11923: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12697: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11927: \$? = $ac_status" >&5
+ echo "$as_me:12701: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11937,8 +12711,8 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
@@ -11965,8 +12739,8 @@ esac
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11993,8 +12767,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
:
@@ -12003,8 +12777,8 @@ else
fi
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -12024,11 +12798,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12027: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12801: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12031: \$? = $ac_status" >&5
+ echo "$as_me:12805: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12050,23 +12824,23 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+ { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -12076,8 +12850,8 @@ else
need_locks=no
fi
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -12096,13 +12870,16 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
+ link_all_deplibs_CXX=no
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
#
@@ -12122,8 +12899,8 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -12160,16 +12937,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
cat conftest.err 1>&5
fi
$rm conftest*
- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
;;
esac
fi
;;
esac
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -12375,18 +13152,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -12542,7 +13307,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -12571,7 +13336,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
+netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -12580,7 +13345,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+ dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
@@ -12756,8 +13521,8 @@ uts4*)
dynamic_linker=no
;;
esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12765,8 +13530,8 @@ if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
test -n "$runpath_var_CXX" || \
@@ -12790,8 +13555,8 @@ else
# directories.
hardcode_action_CXX=unsupported
fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+echo "${ECHO_T}$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
@@ -13316,13 +14081,13 @@ done
cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
@@ -13341,15 +14106,15 @@ aix4* | aix5*)
fi
;;
esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
+{ echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
GCC_F77="$G77"
LD_F77="$LD"
@@ -13358,8 +14123,8 @@ lt_prog_compiler_wl_F77=
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
@@ -13488,7 +14253,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_static_F77='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
@@ -13568,16 +14333,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
esac
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_F77"; then
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13594,11 +14359,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13597: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14362: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13601: \$? = $ac_status" >&5
+ echo "$as_me:14366: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13611,8 +14376,8 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
@@ -13639,8 +14404,8 @@ esac
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_static_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13667,8 +14432,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
if test x"$lt_prog_compiler_static_works_F77" = xyes; then
:
@@ -13677,8 +14442,8 @@ else
fi
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13698,11 +14463,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13701: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14466: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13705: \$? = $ac_status" >&5
+ echo "$as_me:14470: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13724,23 +14489,23 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+ { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -13750,8 +14515,8 @@ else
need_locks=no
fi
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
runpath_var=
allow_undefined_flag_F77=
@@ -13927,7 +14692,7 @@ EOF
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -13953,12 +14718,13 @@ EOF
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_F77=no
else
ld_shlibs_F77=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -14156,27 +14922,23 @@ _LT_EOF
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -14187,8 +14949,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -14207,27 +14971,23 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -14238,8 +14998,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -14370,7 +15132,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
@@ -14472,7 +15234,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
link_all_deplibs_F77=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -14688,8 +15450,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
esac
fi
-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+echo "${ECHO_T}$ld_shlibs_F77" >&6; }
test "$ld_shlibs_F77" = no && can_build_shared=no
#
@@ -14709,8 +15471,8 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14747,16 +15509,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
cat conftest.err 1>&5
fi
$rm conftest*
- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
;;
esac
fi
;;
esac
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -14962,18 +15724,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -15129,7 +15879,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -15158,7 +15908,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
+netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -15167,7 +15917,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+ dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
@@ -15343,8 +16093,8 @@ uts4*)
dynamic_linker=no
;;
esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -15352,8 +16102,8 @@ if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
test -n "$runpath_var_F77" || \
@@ -15377,8 +16127,8 @@ else
# directories.
hardcode_action_F77=unsupported
fi
-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+echo "${ECHO_T}$hardcode_action_F77" >&6; }
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
@@ -15815,7 +16565,6 @@ CC="$lt_save_CC"
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-
# Source file extension for Java test sources.
ac_ext=java
@@ -15883,8 +16632,8 @@ if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -15901,11 +16650,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15904: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16653: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15908: \$? = $ac_status" >&5
+ echo "$as_me:16657: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15918,8 +16667,8 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
@@ -15933,8 +16682,8 @@ lt_prog_compiler_wl_GCJ=
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
@@ -16063,7 +16812,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_static_GCJ='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
@@ -16143,16 +16892,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
esac
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_GCJ"; then
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16169,11 +16918,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16172: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16921: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16176: \$? = $ac_status" >&5
+ echo "$as_me:16925: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16186,8 +16935,8 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
@@ -16214,8 +16963,8 @@ esac
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16242,8 +16991,8 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
:
@@ -16252,8 +17001,8 @@ else
fi
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16273,11 +17022,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16276: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17025: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16280: \$? = $ac_status" >&5
+ echo "$as_me:17029: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16299,23 +17048,23 @@ else
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+ { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -16325,8 +17074,8 @@ else
need_locks=no
fi
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
runpath_var=
allow_undefined_flag_GCJ=
@@ -16502,7 +17251,7 @@ EOF
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -16528,12 +17277,13 @@ EOF
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_GCJ=no
else
ld_shlibs_GCJ=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -16741,27 +17491,23 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -16772,8 +17518,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -16802,27 +17550,23 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -16833,8 +17577,10 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -16965,7 +17711,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
@@ -17067,7 +17813,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
link_all_deplibs_GCJ=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -17283,8 +18029,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
esac
fi
-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
test "$ld_shlibs_GCJ" = no && can_build_shared=no
#
@@ -17304,8 +18050,8 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -17342,16 +18088,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
cat conftest.err 1>&5
fi
$rm conftest*
- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
;;
esac
fi
;;
esac
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -17557,18 +18303,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -17724,7 +18458,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -17753,7 +18487,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
+netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -17762,7 +18496,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+ dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
@@ -17938,8 +18672,8 @@ uts4*)
dynamic_linker=no
;;
esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -17947,8 +18681,8 @@ if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
test -n "$runpath_var_GCJ" || \
@@ -17972,8 +18706,8 @@ else
# directories.
hardcode_action_GCJ=unsupported
fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
if test "$hardcode_action_GCJ" = relink; then
# Fast installation is not supported
@@ -18409,7 +19143,6 @@ CC="$lt_save_CC"
RC)
-
# Source file extension for RC test sources.
ac_ext=rc
@@ -18957,18 +19690,19 @@ ALL_LINGUAS="bg ca cs de fr ja nl pl pt pt_BR ru sr sr@Latn sv"
for ac_header in locale.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+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
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -18979,41 +19713,37 @@ $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>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err 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
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19022,24 +19752,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&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
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -19047,9 +19775,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
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
+{ 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:$ac_c_preproc_warn_flag in
@@ -19073,25 +19802,24 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
+ ( cat <<\_ASBOX
## ---------------------------------- ##
## Report this to jylefort@brutele.be ##
## ---------------------------------- ##
_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ ) | sed "s/^/$as_me: WARNING: /" >&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 "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -19104,8 +19832,8 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
- echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
if test "${am_cv_val_LC_MESSAGES+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19125,39 +19853,36 @@ return LC_MESSAGES
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-am_cv_val_LC_MESSAGES=no
+ am_cv_val_LC_MESSAGES=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -19176,17 +19901,17 @@ _ACEOF
INTLLIBS=
if test "${ac_cv_header_libintl_h+set}" = set; then
- echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for libintl.h" >&5
+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
if test "${ac_cv_header_libintl_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking libintl.h usability" >&5
-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19197,41 +19922,37 @@ $ac_includes_default
#include <libintl.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err 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 libintl.h presence" >&5
-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19240,24 +19961,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <libintl.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&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
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -19265,9 +19984,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
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
+{ 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:$ac_c_preproc_warn_flag in
@@ -19291,25 +20011,23 @@ echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"
echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
+ ( cat <<\_ASBOX
## ---------------------------------- ##
## Report this to jylefort@brutele.be ##
## ---------------------------------- ##
_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for libintl.h" >&5
+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
if test "${ac_cv_header_libintl_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_libintl_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
fi
if test $ac_cv_header_libintl_h = yes; then
@@ -19319,8 +20037,8 @@ if test $ac_cv_header_libintl_h = yes; then
#
# First check in libc
#
- echo "$as_me:$LINENO: checking for ngettext in libc" >&5
-echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
if test "${gt_cv_func_ngettext_libc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19342,44 +20060,41 @@ return !ngettext ("","", 1)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-gt_cv_func_ngettext_libc=no
+ gt_cv_func_ngettext_libc=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
-echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6
+{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- echo "$as_me:$LINENO: checking for dgettext in libc" >&5
-echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
if test "${gt_cv_func_dgettext_libc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19401,40 +20116,37 @@ return !dgettext ("","")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-gt_cv_func_dgettext_libc=no
+ gt_cv_func_dgettext_libc=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6
+{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
fi
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
@@ -19442,9 +20154,9 @@ echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6
for ac_func in bind_textdomain_codeset
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-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 "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -19470,68 +20182,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -19549,8 +20253,8 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
- echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19563,59 +20267,56 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 bindtextdomain ();
int
main ()
{
-bindtextdomain ();
+return bindtextdomain ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_intl_bindtextdomain=no
+ ac_cv_lib_intl_bindtextdomain=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
if test $ac_cv_lib_intl_bindtextdomain = yes; then
- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
if test "${ac_cv_lib_intl_ngettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19628,59 +20329,56 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 ngettext ();
int
main ()
{
-ngettext ();
+return ngettext ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_intl_ngettext=no
+ ac_cv_lib_intl_ngettext=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
if test $ac_cv_lib_intl_ngettext = yes; then
- echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
if test "${ac_cv_lib_intl_dgettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19693,56 +20391,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 dgettext ();
int
main ()
{
-dgettext ();
+return dgettext ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_intl_dgettext=no
+ ac_cv_lib_intl_dgettext=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
if test $ac_cv_lib_intl_dgettext = yes; then
gt_cv_func_dgettext_libintl=yes
fi
@@ -19753,12 +20448,12 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6
- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: " >&5
+echo "${ECHO_T}" >&6; }
+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
if test "${ac_cv_lib_intl_ngettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19771,59 +20466,56 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 ngettext ();
int
main ()
{
-ngettext ();
+return ngettext ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_intl_ngettext=no
+ ac_cv_lib_intl_ngettext=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
if test $ac_cv_lib_intl_ngettext = yes; then
- echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -19836,56 +20528,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 dcgettext ();
int
main ()
{
-dcgettext ();
+return dcgettext ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_intl_dcgettext=no
+ ac_cv_lib_intl_dcgettext=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
if test $ac_cv_lib_intl_dcgettext = yes; then
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
@@ -19912,9 +20601,9 @@ fi
for ac_func in bind_textdomain_codeset
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-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 "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -19940,68 +20629,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -20040,8 +20721,8 @@ _ACEOF
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20067,11 +20748,11 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
- echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
@@ -20080,9 +20761,9 @@ fi
for ac_func in dcgettext
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-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 "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -20108,68 +20789,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -20178,10 +20851,39 @@ _ACEOF
fi
done
+ MSGFMT_OPTS=
+ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
+ cat >conftest.foo <<_ACEOF
+
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo@bar.xx>\n"
+"Language-Team: C <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+_ACEOF
+if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
+ (msgfmt -c -o /dev/null conftest.foo) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+echo "$as_me: failed input was:" >&5
+sed 's/^/| /' conftest.foo >&5
+fi
+
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20196,32 +20898,33 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
;;
esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
-
if test -n "$GMSGFMT"; then
- echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20247,11 +20950,11 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
cat >conftest.$ac_ext <<_ACEOF
@@ -20271,37 +20974,33 @@ extern int _nl_msg_cat_cntr;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
CATOBJEXT=.gmo
DATADIRNAME=share
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-case $host in
+ case $host in
*-*-solaris*)
- echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20328,68 +21027,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef bind_textdomain_codeset
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 bind_textdomain_codeset ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset)
+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
choke me
-#else
-char (*f) () = bind_textdomain_codeset;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != bind_textdomain_codeset;
+return bind_textdomain_codeset ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_bind_textdomain_codeset=no
+ ac_cv_func_bind_textdomain_codeset=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
if test $ac_cv_func_bind_textdomain_codeset = yes; then
CATOBJEXT=.gmo
DATADIRNAME=share
@@ -20405,7 +21095,8 @@ fi
;;
esac
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
@@ -20430,8 +21121,8 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
- echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
+ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
fi
@@ -20439,7 +21130,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
# We need to process the po/ directory.
POSUB=po
- ac_config_commands="$ac_config_commands default-1"
+ ac_config_commands="$ac_config_commands default-1"
for lang in $ALL_LINGUAS; do
@@ -20463,8 +21154,8 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
- echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
useit=no
@@ -20488,8 +21179,8 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
fi
done
LINGUAS=$NEW_LINGUAS
- echo "$as_me:$LINENO: result: $LINGUAS" >&5
-echo "${ECHO_T}$LINGUAS" >&6
+ { echo "$as_me:$LINENO: result: $LINGUAS" >&5
+echo "${ECHO_T}$LINGUAS" >&6; }
fi
if test -n "$LINGUAS"; then
@@ -20533,15 +21224,15 @@ echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
esac
if test -n ""; then
- echo "$as_me:$LINENO: checking for intltool >= " >&5
-echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for intltool >= " >&5
+echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6; }
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
- echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6
+ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
{ { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool or later." >&5
echo "$as_me: error: Your intltool is too old. You need intltool or later." >&2;}
@@ -20596,8 +21287,8 @@ INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20612,27 +21303,28 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-
if test -n "$INTLTOOL_PERL"; then
- echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-echo "${ECHO_T}$INTLTOOL_PERL" >&6
+ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$INTLTOOL_PERL"; then
{ { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
echo "$as_me: error: perl not found; required for intltool" >&2;}
@@ -20644,11 +21336,11 @@ echo "$as_me: error: perl 5.x required for intltool" >&2;}
{ (exit 1); exit 1; }; }
fi
if test "x" != "xno-xml"; then
- echo "$as_me:$LINENO: checking for XML::Parser" >&5
-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for XML::Parser" >&5
+echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+ { echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6; }
else
{ { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
@@ -20658,8 +21350,8 @@ fi
# Extract the first word of "iconv", so it can be a program name with args.
set dummy iconv; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20674,32 +21366,33 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
;;
esac
fi
INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
-
if test -n "$INTLTOOL_ICONV"; then
- echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
-echo "${ECHO_T}$INTLTOOL_ICONV" >&6
+ { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
+echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20714,32 +21407,33 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
;;
esac
fi
INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
-
if test -n "$INTLTOOL_MSGFMT"; then
- echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6
+ { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
+echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Extract the first word of "msgmerge", so it can be a program name with args.
set dummy msgmerge; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20754,32 +21448,33 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
;;
esac
fi
INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
-
if test -n "$INTLTOOL_MSGMERGE"; then
- echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
-echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6
+ { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
+echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -20794,36 +21489,180 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
;;
esac
fi
INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
-
if test -n "$INTLTOOL_XGETTEXT"; then
- echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6
+ { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
+echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Substitute ALL_LINGUAS so we can use it in po/Makefile
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ DATADIRNAME=share
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ case $host in
+ *-*-solaris*)
+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char bind_textdomain_codeset (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef bind_textdomain_codeset
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bind_textdomain_codeset ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+choke me
+#endif
+
+int
+main ()
+{
+return bind_textdomain_codeset ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_bind_textdomain_codeset=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_bind_textdomain_codeset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
+if test $ac_cv_func_bind_textdomain_codeset = yes; then
+ DATADIRNAME=share
+else
+ DATADIRNAME=lib
+fi
+
+ ;;
+ *)
+ DATADIRNAME=lib
+ ;;
+ esac
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+
- ac_config_commands="$ac_config_commands intltool"
+ac_config_commands="$ac_config_commands intltool"
@@ -20838,8 +21677,8 @@ 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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -20852,32 +21691,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -20890,36 +21731,51 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
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.
+ 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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -20932,74 +21788,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-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:$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
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_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:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
+ fi
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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -21013,7 +21829,7 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
@@ -21024,6 +21840,7 @@ do
fi
done
done
+IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
@@ -21041,22 +21858,23 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
+ for ac_prog in cl.exe
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:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ 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
else
@@ -21069,36 +21887,38 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$CC" && break
done
fi
if test -z "$CC"; then
ac_ct_CC=$CC
- for ac_prog in cl
+ for ac_prog in cl.exe
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
+{ 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
else
@@ -21111,29 +21931,45 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
test -n "$ac_ct_CC" && break
done
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
fi
fi
@@ -21146,27 +21982,41 @@ See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-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
+{ 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
@@ -21189,50 +22039,49 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ 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:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ 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
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -21248,311 +22097,248 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-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
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
+ CFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
int
main ()
{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+
;
return 0;
}
_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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_cv_prog_cc_stdc=$ac_arg
-break
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
- *)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
- choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
- for ac_declaration in \
- '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
+
int
main ()
{
-exit (42);
+
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
- :
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-continue
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ 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
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
int
main ()
{
-exit (42);
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
- break
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+ xno)
+ { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+esac
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21561,8 +22347,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
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
+{ 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
@@ -21626,6 +22412,7 @@ else
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -21651,13 +22438,11 @@ else
fi
fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+{ 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
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -21668,15 +22453,15 @@ else
fi
-# Check whether --enable-largefile or --disable-largefile was given.
+# Check whether --enable-largefile was given.
if test "${enable_largefile+set}" = set; then
- enableval="$enable_largefile"
+ enableval=$enable_largefile;
+fi
-fi;
if test "$enable_largefile" != no; then
- echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
if test "${ac_cv_sys_largefile_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21684,8 +22469,8 @@ else
if test "$GCC" != yes; then
ac_save_CC=$CC
while :; do
- # IRIX 6.2 and later do not support large files by default,
- # so use the C compiler's -n32 option if that helps.
+ # IRIX 6.2 and later do not support large files by default,
+ # so use the C compiler's -n32 option if that helps.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21709,84 +22494,77 @@ main ()
return 0;
}
_ACEOF
- rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext
- CC="$CC -n32"
- rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+
+rm -f core conftest.err conftest.$ac_objext
+ CC="$CC -n32"
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_sys_largefile_CC=' -n32'; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
break
done
CC=$ac_save_CC
rm -f conftest.$ac_ext
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
if test "$ac_cv_sys_largefile_CC" != no; then
CC=$CC$ac_cv_sys_largefile_CC
fi
- echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
if test "${ac_cv_sys_file_offset_bits+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
while :; do
- ac_cv_sys_file_offset_bits=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21811,34 +22589,31 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
- break
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_sys_file_offset_bits=no; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21864,54 +22639,53 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_sys_file_offset_bits=64; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_file_offset_bits=unknown
break
done
fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
-if test "$ac_cv_sys_file_offset_bits" != no; then
-
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+ no | unknown) ;;
+ *)
cat >>confdefs.h <<_ACEOF
#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
_ACEOF
-
-fi
+;;
+esac
rm -f conftest*
- echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
+ if test $ac_cv_sys_file_offset_bits = unknown; then
+ { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
if test "${ac_cv_sys_large_files+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
while :; do
- ac_cv_sys_large_files=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21936,34 +22710,31 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
- break
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_sys_large_files=no; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21989,53 +22760,53 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_sys_large_files=1; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_large_files=unknown
break
done
fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-echo "${ECHO_T}$ac_cv_sys_large_files" >&6
-if test "$ac_cv_sys_large_files" != no; then
-
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+ no | unknown) ;;
+ *)
cat >>confdefs.h <<_ACEOF
#define _LARGE_FILES $ac_cv_sys_large_files
_ACEOF
-
-fi
+;;
+esac
rm -f conftest*
+ fi
fi
# check for ANSI C headers
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ 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
@@ -22059,35 +22830,31 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -22143,6 +22910,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
+#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -22162,18 +22930,27 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -22186,12 +22963,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ 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 <<\_ACEOF
@@ -22207,10 +22986,9 @@ echo "$as_me: error: ANSI C headers not present" >&2;}
fi
-# Check whether --with-reentrant-resolver or --without-reentrant-resolver was given.
+# Check whether --with-reentrant-resolver was given.
if test "${with_reentrant_resolver+set}" = set; then
- withval="$with_reentrant_resolver"
- case "$withval" in
+ withval=$with_reentrant_resolver; case "$withval" in
yes|no|autodetect) reentrant_resolver=$withval ;;
*) { { echo "$as_me:$LINENO: error: bad value $withval for --with-reentrant-resolver" >&5
echo "$as_me: error: bad value $withval for --with-reentrant-resolver" >&2;}
@@ -22218,11 +22996,12 @@ echo "$as_me: error: bad value $withval for --with-reentrant-resolver" >&2;}
esac
else
reentrant_resolver=autodetect
-fi;
+fi
+
if test $reentrant_resolver = autodetect; then
- echo "$as_me:$LINENO: checking if the system resolver is reentrant" >&5
-echo $ECHO_N "checking if the system resolver is reentrant... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking if the system resolver is reentrant" >&5
+echo $ECHO_N "checking if the system resolver is reentrant... $ECHO_C" >&6; }
case "$target_os" in
# FreeBSD >= 5.3
@@ -22243,11 +23022,11 @@ echo $ECHO_N "checking if the system resolver is reentrant... $ECHO_C" >&6
if test $reentrant_resolver = unknown; then
reentrant_resolver=no
- echo "$as_me:$LINENO: result: unknown, assuming it is not (use --with-reentrant-resolver to override)" >&5
-echo "${ECHO_T}unknown, assuming it is not (use --with-reentrant-resolver to override)" >&6
+ { echo "$as_me:$LINENO: result: unknown, assuming it is not (use --with-reentrant-resolver to override)" >&5
+echo "${ECHO_T}unknown, assuming it is not (use --with-reentrant-resolver to override)" >&6; }
else
- echo "$as_me:$LINENO: result: $reentrant_resolver" >&5
-echo "${ECHO_T}$reentrant_resolver" >&6
+ { echo "$as_me:$LINENO: result: $reentrant_resolver" >&5
+echo "${ECHO_T}$reentrant_resolver" >&6; }
fi
fi
@@ -22264,9 +23043,9 @@ fi
for ac_func in timegm
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-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 "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -22292,68 +23071,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
#endif
int
main ()
{
-return f != $ac_func;
+return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -22364,8 +23135,8 @@ done
# see if "struct tm" is defined in sys/time.h
-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
if test "${ac_cv_struct_tm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22381,44 +23152,42 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-struct tm *tp; tp->tm_sec;
+struct tm tm;
+ int *p = &tm.tm_sec;
+ return !p;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_struct_tm=time.h
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_struct_tm=sys/time.h
+ ac_cv_struct_tm=sys/time.h
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
if test $ac_cv_struct_tm = sys/time.h; then
cat >>confdefs.h <<\_ACEOF
@@ -22430,13 +23199,13 @@ fi
### mandatory libraries and programs
-# Check whether --enable-gtktest or --disable-gtktest was given.
+# Check whether --enable-gtktest was given.
if test "${enable_gtktest+set}" = set; then
- enableval="$enable_gtktest"
-
+ enableval=$enable_gtktest;
else
enable_gtktest=yes
-fi;
+fi
+
pkg_config_args=gtk+-2.0
for module in .
@@ -22452,8 +23221,8 @@ fi;
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22468,29 +23237,30 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test x$PKG_CONFIG != xno ; then
if pkg-config --atleast-pkgconfig-version 0.7 ; then
:
@@ -22504,8 +23274,8 @@ fi
fi
min_gtk_version=2.6.0
- echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
+echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; }
if test x$PKG_CONFIG != xno ; then
## don't try to run the test against uninstalled libtool libs
@@ -22619,13 +23389,22 @@ main ()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -22638,19 +23417,21 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
no_gtk=yes
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+
+
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_gtk" = x ; then
- echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
-echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6
+ { echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
+echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
:
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
if test "$PKG_CONFIG" = "no" ; then
echo "*** A new enough version of pkg-config was not found."
echo "*** See http://pkgconfig.sourceforge.net"
@@ -22682,27 +23463,23 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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); }; } &&
- { 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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
@@ -22716,10 +23493,11 @@ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
@@ -22742,8 +23520,8 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22758,34 +23536,35 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
fi
if test -z "$ac_cv_path_PKG_CONFIG"; then
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -22800,28 +23579,42 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-
if test -n "$ac_pt_PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- PKG_CONFIG=$ac_pt_PKG_CONFIG
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
else
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
fi
@@ -22829,34 +23622,34 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
- echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
PKG_CONFIG=""
fi
fi
pkg_failed=no
-echo "$as_me:$LINENO: checking for GNOME" >&5
-echo $ECHO_N "checking for GNOME... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for GNOME" >&5
+echo $ECHO_N "checking for GNOME... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$GNOME_CFLAGS"; then
pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify\"") >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify" 2>/dev/null`
+ pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22869,12 +23662,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_GNOME_LIBS="$GNOME_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify\"") >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify" 2>/dev/null`
+ pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22893,15 +23686,15 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify"`
+ GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify"`
else
- GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify"`
+ GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify"`
fi
# Put the nasty error message in config.log where it belongs
echo "$GNOME_PKG_ERRORS" >&5
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
{ { echo "$as_me:$LINENO: error: unable to find the GNOME libraries" >&5
echo "$as_me: error: unable to find the GNOME libraries" >&2;}
{ (exit 1); exit 1; }; }
@@ -22912,8 +23705,8 @@ echo "$as_me: error: unable to find the GNOME libraries" >&2;}
else
GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
GNOME_LIBS=$pkg_cv_GNOME_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
:
fi
@@ -22924,44 +23717,42 @@ fi
fi
-# Check whether --with-gconf-source or --without-gconf-source was given.
+# Check whether --with-gconf-source was given.
if test "${with_gconf_source+set}" = set; then
- withval="$with_gconf_source"
- GCONF_SCHEMA_CONFIG_SOURCE="$withval"
-fi;
+ withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
+fi
+
- echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6
+ { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
+echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
fi
-# Check whether --with-gconf-schema-file-dir or --without-gconf-schema-file-dir was given.
+# Check whether --with-gconf-schema-file-dir was given.
if test "${with_gconf_schema_file_dir+set}" = set; then
- withval="$with_gconf_schema_file_dir"
- GCONF_SCHEMA_FILE_DIR="$withval"
-fi;
+ withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
+fi
+
- echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6
+ { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
+echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
- # Check whether --enable-schemas-install or --disable-schemas-install was given.
+ # Check whether --enable-schemas-install was given.
if test "${enable_schemas_install+set}" = set; then
- enableval="$enable_schemas_install"
- case ${enableval} in
+ enableval=$enable_schemas_install; case ${enableval} in
yes|no) ;;
*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
{ (exit 1); exit 1; }; } ;;
esac
-fi;
-
+fi
-if test "$enable_schemas_install" != no; then
+ if test "$enable_schemas_install" != no; then
GCONF_SCHEMAS_INSTALL_TRUE=
GCONF_SCHEMAS_INSTALL_FALSE='#'
else
@@ -22973,8 +23764,8 @@ fi
-echo "$as_me:$LINENO: checking for the GNOME installation prefix" >&5
-echo $ECHO_N "checking for the GNOME installation prefix... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for the GNOME installation prefix" >&5
+echo $ECHO_N "checking for the GNOME installation prefix... $ECHO_C" >&6; }
gnome_prefix=""
if test -n "$PKG_CONFIG"; then
@@ -22982,38 +23773,21 @@ if test -n "$PKG_CONFIG"; then
fi
if test -n "$gnome_prefix"; then
- echo "$as_me:$LINENO: result: $gnome_prefix" >&5
-echo "${ECHO_T}$gnome_prefix" >&6
+ { echo "$as_me:$LINENO: result: $gnome_prefix" >&5
+echo "${ECHO_T}$gnome_prefix" >&6; }
:
else
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
:
fi
-
-echo "$as_me:$LINENO: checking for the GNOME capplet directory" >&5
-echo $ECHO_N "checking for the GNOME capplet directory... $ECHO_C" >&6
-
-# GNOME < 2.10
-gnome_cappletdir='${datadir}/control-center-2.0/capplets'
-
-if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists 'libgnome-2.0 >= 2.10.0' >/dev/null 2>&1; then
- # GNOME >= 2.10
- gnome_cappletdir='${datadir}/applications'
-fi
-
-echo "$as_me:$LINENO: result: $gnome_cappletdir" >&5
-echo "${ECHO_T}$gnome_cappletdir" >&6
-
-
-
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_GCONFTOOL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -23028,27 +23802,28 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
-
if test -n "$GCONFTOOL"; then
- echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
-echo "${ECHO_T}$GCONFTOOL" >&6
+ { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
+echo "${ECHO_T}$GCONFTOOL" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
if test -z "$GCONFTOOL"; then
{ { echo "$as_me:$LINENO: error: unable to find the gconftool-2 program" >&5
echo "$as_me: error: unable to find the gconftool-2 program" >&2;}
@@ -23057,8 +23832,8 @@ fi
-echo "$as_me:$LINENO: checking for orbit-idl-2" >&5
-echo $ECHO_N "checking for orbit-idl-2... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for orbit-idl-2" >&5
+echo $ECHO_N "checking for orbit-idl-2... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0 2>/dev/null`"
@@ -23067,12 +23842,12 @@ else
fi
if test -n "$ORBIT_IDL"; then
- echo "$as_me:$LINENO: result: $ORBIT_IDL" >&5
-echo "${ECHO_T}$ORBIT_IDL" >&6
+ { echo "$as_me:$LINENO: result: $ORBIT_IDL" >&5
+echo "${ECHO_T}$ORBIT_IDL" >&6; }
:
else
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
{ { echo "$as_me:$LINENO: error: unable to find the orbit-idl-2 program" >&5
echo "$as_me: error: unable to find the orbit-idl-2 program" >&2;}
{ (exit 1); exit 1; }; }
@@ -23082,8 +23857,8 @@ fi
-echo "$as_me:$LINENO: checking for BONOBO IDL" >&5
-echo $ECHO_N "checking for BONOBO IDL... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for BONOBO IDL" >&5
+echo $ECHO_N "checking for BONOBO IDL... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbonobo-2.0 bonobo-activation-2.0\"") >&5
($PKG_CONFIG --exists --print-errors "libbonobo-2.0 bonobo-activation-2.0") 2>&5
@@ -23094,8 +23869,8 @@ if test -n "$PKG_CONFIG" && \
else
found=no
fi
-echo "$as_me:$LINENO: result: $found" >&5
-echo "${ECHO_T}$found" >&6
+{ echo "$as_me:$LINENO: result: $found" >&5
+echo "${ECHO_T}$found" >&6; }
BONOBO_IDLFLAGS=""
if test $found = yes; then
@@ -23119,8 +23894,8 @@ fi
# not needed by end-users, as generated files are distributed
# Extract the first word of "aml", so it can be a program name with args.
set dummy aml; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_AML+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -23135,31 +23910,32 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_AML="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
AML=$ac_cv_path_AML
-
if test -n "$AML"; then
- echo "$as_me:$LINENO: result: $AML" >&5
-echo "${ECHO_T}$AML" >&6
+ { echo "$as_me:$LINENO: result: $AML" >&5
+echo "${ECHO_T}$AML" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
# Extract the first word of "gob2", so it can be a program name with args.
set dummy gob2; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_GOB2+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -23174,28 +23950,29 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GOB2="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+IFS=$as_save_IFS
;;
esac
fi
GOB2=$ac_cv_path_GOB2
-
if test -n "$GOB2"; then
- echo "$as_me:$LINENO: result: $GOB2" >&5
-echo "${ECHO_T}$GOB2" >&6
+ { echo "$as_me:$LINENO: result: $GOB2" >&5
+echo "${ECHO_T}$GOB2" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
enable_mime=no
if test $enable_mbox = yes ||
test $enable_mh = yes ||
@@ -23206,8 +23983,8 @@ if test $enable_mbox = yes ||
test $enable_sylpheed = yes; then
pkg_failed=no
-echo "$as_me:$LINENO: checking for GMIME" >&5
-echo $ECHO_N "checking for GMIME... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for GMIME" >&5
+echo $ECHO_N "checking for GMIME... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$GMIME_CFLAGS"; then
@@ -23263,16 +24040,16 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GMIME_PKG_ERRORS" >&5
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
:
elif test $pkg_failed = untried; then
:
else
GMIME_CFLAGS=$pkg_cv_GMIME_CFLAGS
GMIME_LIBS=$pkg_cv_GMIME_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
enable_mime=yes
fi
if test $enable_mime = no; then
@@ -23359,10 +24136,10 @@ CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
LIBS="$LIBS $OPENSSL_LIBS"
# the OPENSSL_VERSION_NUMBER format we use appeared in 0.9.5b
-openssl_min_version=0.9.5b
+openssl_min_version=0.9.6
-echo "$as_me:$LINENO: checking for OpenSSL - version >= $openssl_min_version" >&5
-echo $ECHO_N "checking for OpenSSL - version >= $openssl_min_version... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for OpenSSL - version >= $openssl_min_version" >&5
+echo $ECHO_N "checking for OpenSSL - version >= $openssl_min_version... $ECHO_C" >&6; }
if test "$cross_compiling" = yes; then
found=yes
else
@@ -23391,13 +24168,22 @@ int main() {
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -23410,10 +24196,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
found=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $found" >&5
-echo "${ECHO_T}$found" >&6
+
+
+{ echo "$as_me:$LINENO: result: $found" >&5
+echo "${ECHO_T}$found" >&6; }
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
@@ -23431,6 +24219,82 @@ fi
+ if test $enable_ssl = yes; then
+ ac_save_CFLAGS="$CFLAGS"
+ac_save_LIBS="$LIBS"
+CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+LIBS="$LIBS $OPENSSL_LIBS"
+
+{ echo "$as_me:$LINENO: checking whether OpenSSL supports multi-threading" >&5
+echo $ECHO_N "checking whether OpenSSL supports multi-threading... $ECHO_C" >&6; }
+if test "$cross_compiling" = yes; then
+ openssl_mt=yes
+else
+ cat >conftest.$ac_ext <<_ACEOF
+
+#define OPENSSL_THREAD_DEFINES
+#include <openssl/opensslconf.h>
+
+int main() {
+#ifdef OPENSSL_THREADS
+ exit(0); /* ok */
+#else
+ exit(1); /* no thread support */
+#endif
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ openssl_mt=yes
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+openssl_mt=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+{ echo "$as_me:$LINENO: result: $openssl_mt" >&5
+echo "${ECHO_T}$openssl_mt" >&6; }
+
+CFLAGS="$ac_save_CFLAGS"
+LIBS="$ac_save_LIBS"
+
+if test $openssl_mt = yes; then
+ :
+else
+ { echo "$as_me:$LINENO: OpenSSL does not support multi-threading: forcing --disable-ssl" >&5
+echo "$as_me: OpenSSL does not support multi-threading: forcing --disable-ssl" >&6;}
+enable_ssl=no
+disable_ssl_reason="(OpenSSL does not support multi-threading)"
+fi
+
+
+
+ fi
fi
if test $enable_sasl = yes; then
SASL_CFLAGS=""
@@ -23443,8 +24307,8 @@ LIBS="$LIBS $SASL_LIBS"
sasl2_min_version=2.0
-echo "$as_me:$LINENO: checking for Cyrus SASL - version >= $sasl2_min_version" >&5
-echo $ECHO_N "checking for Cyrus SASL - version >= $sasl2_min_version... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for Cyrus SASL - version >= $sasl2_min_version" >&5
+echo $ECHO_N "checking for Cyrus SASL - version >= $sasl2_min_version... $ECHO_C" >&6; }
if test "$cross_compiling" = yes; then
found=yes
else
@@ -23469,13 +24333,22 @@ int main() {
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -23488,10 +24361,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
found=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $found" >&5
-echo "${ECHO_T}$found" >&6
+
+
+{ echo "$as_me:$LINENO: result: $found" >&5
+echo "${ECHO_T}$found" >&6; }
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
@@ -23515,13 +24390,113 @@ if test $enable_evolution = yes; then
evolution=no
+evolution_branch=2.12
+evolution_plugin_min_version=
+
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for EVOLUTION_PLUGIN" >&5
+echo $ECHO_N "checking for EVOLUTION_PLUGIN... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$EVOLUTION_PLUGIN_CFLAGS"; then
+ pkg_cv_EVOLUTION_PLUGIN_CFLAGS="$EVOLUTION_PLUGIN_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin-\$evolution_branch \$evolution_plugin_min_version\"") >&5
+ ($PKG_CONFIG --exists --print-errors "evolution-plugin-$evolution_branch $evolution_plugin_min_version") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-$evolution_branch $evolution_plugin_min_version" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$EVOLUTION_PLUGIN_LIBS"; then
+ pkg_cv_EVOLUTION_PLUGIN_LIBS="$EVOLUTION_PLUGIN_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin-\$evolution_branch \$evolution_plugin_min_version\"") >&5
+ ($PKG_CONFIG --exists --print-errors "evolution-plugin-$evolution_branch $evolution_plugin_min_version") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-$evolution_branch $evolution_plugin_min_version" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-plugin-$evolution_branch $evolution_plugin_min_version"`
+ else
+ EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-$evolution_branch $evolution_plugin_min_version"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ found=no
+elif test $pkg_failed = untried; then
+ found=no
+else
+ EVOLUTION_PLUGIN_CFLAGS=$pkg_cv_EVOLUTION_PLUGIN_CFLAGS
+ EVOLUTION_PLUGIN_LIBS=$pkg_cv_EVOLUTION_PLUGIN_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ found=yes
+fi
+
+if test $found = yes; then
+ { echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
+echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6; }
+ evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$evolution_branch 2>/dev/null`
+ if test -n "$evolution_plugindir"; then
+ { echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
+echo "${ECHO_T}$evolution_plugindir" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+ found=no
+ fi
+fi
+
+if test $found = yes; then
+ evolution=yes
+else
+ evolution_plugindir=""
+ :
+fi
+
+
+ if test $evolution = no; then
+
+
evolution_branch=2.10
evolution_plugin_min_version=
pkg_failed=no
-echo "$as_me:$LINENO: checking for EVOLUTION_PLUGIN" >&5
-echo $ECHO_N "checking for EVOLUTION_PLUGIN... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for EVOLUTION_PLUGIN" >&5
+echo $ECHO_N "checking for EVOLUTION_PLUGIN... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$EVOLUTION_PLUGIN_CFLAGS"; then
@@ -23577,29 +24552,29 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
found=no
elif test $pkg_failed = untried; then
found=no
else
EVOLUTION_PLUGIN_CFLAGS=$pkg_cv_EVOLUTION_PLUGIN_CFLAGS
EVOLUTION_PLUGIN_LIBS=$pkg_cv_EVOLUTION_PLUGIN_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
found=yes
fi
if test $found = yes; then
- echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
-echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
+echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6; }
evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$evolution_branch 2>/dev/null`
if test -n "$evolution_plugindir"; then
- echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
-echo "${ECHO_T}$evolution_plugindir" >&6
+ { echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
+echo "${ECHO_T}$evolution_plugindir" >&6; }
else
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
found=no
fi
fi
@@ -23612,6 +24587,7 @@ else
fi
+ fi
if test $evolution = no; then
@@ -23620,8 +24596,8 @@ evolution_plugin_min_version=
pkg_failed=no
-echo "$as_me:$LINENO: checking for EVOLUTION_PLUGIN" >&5
-echo $ECHO_N "checking for EVOLUTION_PLUGIN... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for EVOLUTION_PLUGIN" >&5
+echo $ECHO_N "checking for EVOLUTION_PLUGIN... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$EVOLUTION_PLUGIN_CFLAGS"; then
@@ -23677,29 +24653,29 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
found=no
elif test $pkg_failed = untried; then
found=no
else
EVOLUTION_PLUGIN_CFLAGS=$pkg_cv_EVOLUTION_PLUGIN_CFLAGS
EVOLUTION_PLUGIN_LIBS=$pkg_cv_EVOLUTION_PLUGIN_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
found=yes
fi
if test $found = yes; then
- echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
-echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
+echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6; }
evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$evolution_branch 2>/dev/null`
if test -n "$evolution_plugindir"; then
- echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
-echo "${ECHO_T}$evolution_plugindir" >&6
+ { echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
+echo "${ECHO_T}$evolution_plugindir" >&6; }
else
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
found=no
fi
fi
@@ -23721,8 +24697,8 @@ evolution_plugin_min_version=
pkg_failed=no
-echo "$as_me:$LINENO: checking for EVOLUTION_PLUGIN" >&5
-echo $ECHO_N "checking for EVOLUTION_PLUGIN... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for EVOLUTION_PLUGIN" >&5
+echo $ECHO_N "checking for EVOLUTION_PLUGIN... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$EVOLUTION_PLUGIN_CFLAGS"; then
@@ -23778,29 +24754,29 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
found=no
elif test $pkg_failed = untried; then
found=no
else
EVOLUTION_PLUGIN_CFLAGS=$pkg_cv_EVOLUTION_PLUGIN_CFLAGS
EVOLUTION_PLUGIN_LIBS=$pkg_cv_EVOLUTION_PLUGIN_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
found=yes
fi
if test $found = yes; then
- echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
-echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
+echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6; }
evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$evolution_branch 2>/dev/null`
if test -n "$evolution_plugindir"; then
- echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
-echo "${ECHO_T}$evolution_plugindir" >&6
+ { echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
+echo "${ECHO_T}$evolution_plugindir" >&6; }
else
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
found=no
fi
fi
@@ -23822,8 +24798,8 @@ evolution_plugin_min_version=
pkg_failed=no
-echo "$as_me:$LINENO: checking for EVOLUTION_PLUGIN" >&5
-echo $ECHO_N "checking for EVOLUTION_PLUGIN... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for EVOLUTION_PLUGIN" >&5
+echo $ECHO_N "checking for EVOLUTION_PLUGIN... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$EVOLUTION_PLUGIN_CFLAGS"; then
@@ -23879,29 +24855,29 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
found=no
elif test $pkg_failed = untried; then
found=no
else
EVOLUTION_PLUGIN_CFLAGS=$pkg_cv_EVOLUTION_PLUGIN_CFLAGS
EVOLUTION_PLUGIN_LIBS=$pkg_cv_EVOLUTION_PLUGIN_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
found=yes
fi
if test $found = yes; then
- echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
-echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
+echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6; }
evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$evolution_branch 2>/dev/null`
if test -n "$evolution_plugindir"; then
- echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
-echo "${ECHO_T}$evolution_plugindir" >&6
+ { echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
+echo "${ECHO_T}$evolution_plugindir" >&6; }
else
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
found=no
fi
fi
@@ -23925,9 +24901,7 @@ fi
### Automake conditionals
-
-
-if test $enable_mbox = yes; then
+ if test $enable_mbox = yes; then
WITH_MBOX_TRUE=
WITH_MBOX_FALSE='#'
else
@@ -23935,9 +24909,7 @@ else
WITH_MBOX_FALSE=
fi
-
-
-if test $enable_mozilla = yes; then
+ if test $enable_mozilla = yes; then
WITH_MOZILLA_TRUE=
WITH_MOZILLA_FALSE='#'
else
@@ -23945,9 +24917,7 @@ else
WITH_MOZILLA_FALSE=
fi
-
-
-if test $enable_mbox = yes || test $enable_mozilla = yes; then
+ if test $enable_mbox = yes || test $enable_mozilla = yes; then
WITH_MBOX_OR_MOZILLA_TRUE=
WITH_MBOX_OR_MOZILLA_FALSE='#'
else
@@ -23955,9 +24925,7 @@ else
WITH_MBOX_OR_MOZILLA_FALSE=
fi
-
-
-if test $enable_mh = yes; then
+ if test $enable_mh = yes; then
WITH_MH_TRUE=
WITH_MH_FALSE='#'
else
@@ -23965,9 +24933,7 @@ else
WITH_MH_FALSE=
fi
-
-
-if test $enable_maildir = yes; then
+ if test $enable_maildir = yes; then
WITH_MAILDIR_TRUE=
WITH_MAILDIR_FALSE='#'
else
@@ -23975,9 +24941,7 @@ else
WITH_MAILDIR_FALSE=
fi
-
-
-if test $enable_pop3 = yes; then
+ if test $enable_pop3 = yes; then
WITH_POP3_TRUE=
WITH_POP3_FALSE='#'
else
@@ -23985,9 +24949,7 @@ else
WITH_POP3_FALSE=
fi
-
-
-if test $enable_imap = yes; then
+ if test $enable_imap = yes; then
WITH_IMAP_TRUE=
WITH_IMAP_FALSE='#'
else
@@ -23995,9 +24957,7 @@ else
WITH_IMAP_FALSE=
fi
-
-
-if test $enable_pop3 = yes || test $enable_imap = yes; then
+ if test $enable_pop3 = yes || test $enable_imap = yes; then
WITH_POP3_OR_IMAP_TRUE=
WITH_POP3_OR_IMAP_FALSE='#'
else
@@ -24005,9 +24965,7 @@ else
WITH_POP3_OR_IMAP_FALSE=
fi
-
-
-if test $enable_pop3 = yes || test $enable_imap = yes || test $enable_gmail = yes; then
+ if test $enable_pop3 = yes || test $enable_imap = yes || test $enable_gmail = yes; then
WITH_POP3_OR_IMAP_OR_GMAIL_TRUE=
WITH_POP3_OR_IMAP_OR_GMAIL_FALSE='#'
else
@@ -24015,9 +24973,7 @@ else
WITH_POP3_OR_IMAP_OR_GMAIL_FALSE=
fi
-
-
-if test $enable_mbox = yes || test $enable_mozilla = yes || test $enable_mh = yes || test $enable_maildir = yes || test $enable_sylpheed = yes; then
+ if test $enable_mbox = yes || test $enable_mozilla = yes || test $enable_mh = yes || test $enable_maildir = yes || test $enable_sylpheed = yes; then
WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE=
WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE='#'
else
@@ -24025,9 +24981,7 @@ else
WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE=
fi
-
-
-if test $enable_mbox = yes || test $enable_mozilla = yes || test $enable_mh = yes || test $enable_maildir = yes || test $enable_sylpheed = yes || test $enable_evolution = yes; then
+ if test $enable_mbox = yes || test $enable_mozilla = yes || test $enable_mh = yes || test $enable_maildir = yes || test $enable_sylpheed = yes || test $enable_evolution = yes; then
WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE=
WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE='#'
else
@@ -24035,9 +24989,7 @@ else
WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE=
fi
-
-
-if test $enable_ssl = yes; then
+ if test $enable_ssl = yes; then
WITH_SSL_TRUE=
WITH_SSL_FALSE='#'
else
@@ -24045,9 +24997,7 @@ else
WITH_SSL_FALSE=
fi
-
-
-if test $enable_sasl = yes; then
+ if test $enable_sasl = yes; then
WITH_SASL_TRUE=
WITH_SASL_FALSE='#'
else
@@ -24055,9 +25005,7 @@ else
WITH_SASL_FALSE=
fi
-
-
-if test $enable_gmail = yes; then
+ if test $enable_gmail = yes; then
WITH_GMAIL_TRUE=
WITH_GMAIL_FALSE='#'
else
@@ -24065,9 +25013,7 @@ else
WITH_GMAIL_FALSE=
fi
-
-
-if test $enable_evolution = yes; then
+ if test $enable_evolution = yes; then
WITH_EVOLUTION_TRUE=
WITH_EVOLUTION_FALSE='#'
else
@@ -24075,9 +25021,7 @@ else
WITH_EVOLUTION_FALSE=
fi
-
-
-if test $enable_sylpheed = yes; then
+ if test $enable_sylpheed = yes; then
WITH_SYLPHEED_TRUE=
WITH_SYLPHEED_FALSE='#'
else
@@ -24085,9 +25029,7 @@ else
WITH_SYLPHEED_FALSE=
fi
-
-
-if test $enable_mime = yes; then
+ if test $enable_mime = yes; then
WITH_MIME_TRUE=
WITH_MIME_FALSE='#'
else
@@ -24095,9 +25037,7 @@ else
WITH_MIME_FALSE=
fi
-
-
-if test $enable_regression_tests = yes; then
+ if test $enable_regression_tests = yes; then
WITH_REGRESSION_TESTS_TRUE=
WITH_REGRESSION_TESTS_FALSE='#'
else
@@ -24196,7 +25136,7 @@ _ACEOF
### output
- ac_config_files="$ac_config_files Makefile art/Makefile data/Makefile help/Makefile help/C/Makefile m4/Makefile po/Makefile.in src/Makefile tests/Makefile ui/Makefile"
+ac_config_files="$ac_config_files Makefile art/Makefile data/Makefile help/Makefile help/C/Makefile m4/Makefile po/Makefile.in src/Makefile tests/Makefile ui/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -24216,39 +25156,58 @@ _ACEOF
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
-{
- (set) 2>&1 |
- case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
+(
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
+
+ (set) 2>&1 |
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
# `set' does not quote correctly, so add quotes (double-quote
# substitution turns \\\\ into \\, and sed turns \\ into \).
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;;
+ ;; #(
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
-} |
+ esac |
+ sort
+) |
sed '
+ /^ac_cv_env_/b end
t clear
- : clear
+ :clear
s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
t end
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
- if test -w $cache_file; then
- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ test "x$cache_file" != "x/dev/null" &&
+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- echo "not updating unwritable cache $cache_file"
+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -24257,32 +25216,18 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[ ]*$//;
-}'
-fi
-
DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
- ac_i=`echo "$ac_i" |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Add them.
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+ ac_i=`echo "$ac_i" | sed "$ac_script"`
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -24318,7 +25263,7 @@ Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
- ac_config_commands="$ac_config_commands po/stamp-it"
+ ac_config_commands="$ac_config_commands po/stamp-it"
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
@@ -24485,17 +25430,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
## M4sh Initialization. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# 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" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
-DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -24505,8 +25478,43 @@ else
fi
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+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
+IFS=$as_save_IFS
+
+ ;;
+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_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
+fi
+
# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
PS1='$ '
PS2='> '
PS4='+ '
@@ -24520,18 +25528,19 @@ do
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
- $as_unset $as_var
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
fi
done
# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
@@ -24539,159 +25548,120 @@ fi
# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+# CDPATH.
+$as_unset CDPATH
-# 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" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.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
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
# 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.
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, 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 |
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
N
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
+ s/-\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;}
+ 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
+ # original and so on. Autoconf is especially sensitive 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= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ *) ECHO_C='\c';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir
+fi
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- else
- as_ln_s='ln -s'
- fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
@@ -24700,7 +25670,28 @@ else
as_mkdir_p=false
fi
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -24709,31 +25700,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
exec 6>&1
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# Save the log message, 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 Mail Notification $as_me 4.0, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+# values after options handling.
+ac_log="
+This file was extended by Mail Notification $as_me 4.1, which was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -24741,30 +25715,20 @@ generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
# Files that config.status was made for.
-if test -n "$ac_config_files"; then
- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
-if test -n "$ac_config_links"; then
- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
@@ -24772,7 +25736,7 @@ current configuration.
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
- -V, --version print version number, then exit
+ -V, --version print version number and configuration settings, then exit
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
@@ -24791,19 +25755,22 @@ Configuration commands:
$config_commands
Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
+_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Mail Notification config.status 4.0
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+Mail Notification config.status 4.1
+configured by $0, generated by GNU Autoconf 2.61,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -24814,39 +25781,24 @@ while test $# != 0
do
case $1 in
--*=*)
- ac_option=`expr "x$1" : 'x\([^=]*\)='`
- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- -*)
+ *)
ac_option=$1
ac_optarg=$2
ac_shift=shift
;;
- *) # This is not an option, so the user has probably given explicit
- # arguments.
- ac_option=$1
- ac_need_defaults=false;;
esac
case $ac_option in
# Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
- --he | --h)
- # Conflict between --help and --header
- { { 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;}
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
- echo "$ac_cs_usage"; exit 0 ;;
- --debug | --d* | -d )
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ echo "$ac_cs_version"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
@@ -24856,18 +25808,24 @@ Try \`$0 --help' for more information." >&2;}
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+ { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; };;
+ --help | --hel | -h )
+ echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { { 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;}
+ -*) { echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
- *) ac_config_targets="$ac_config_targets $1" ;;
+ *) ac_config_targets="$ac_config_targets $1"
+ ac_need_defaults=false ;;
esac
shift
@@ -24883,17 +25841,28 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+ CONFIG_SHELL=$SHELL
+ export CONFIG_SHELL
+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
fi
_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+exec 5>>config.log
+{
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+ echo "$ac_log"
+} >&5
+_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
#
-# INIT-COMMANDS section.
+# INIT-COMMANDS
#
-
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
@@ -24904,34 +25873,35 @@ INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
_ACEOF
-
-
cat >>$CONFIG_STATUS <<\_ACEOF
+
+# Handling of arguments.
for ac_config_target in $ac_config_targets
do
- case "$ac_config_target" in
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "art/Makefile" ) CONFIG_FILES="$CONFIG_FILES art/Makefile" ;;
- "data/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
- "help/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
- "help/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/C/Makefile" ;;
- "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
- "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
- "ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES ui/Makefile" ;;
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
- "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
- "po/stamp-it" ) CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "art/Makefile") CONFIG_FILES="$CONFIG_FILES art/Makefile" ;;
+ "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
+ "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
+ "help/C/Makefile") CONFIG_FILES="$CONFIG_FILES help/C/Makefile" ;;
+ "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "ui/Makefile") CONFIG_FILES="$CONFIG_FILES ui/Makefile" ;;
+ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+
*) { { 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
done
+
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
@@ -24943,715 +25913,750 @@ if $ac_need_defaults; then
fi
# Have a temporary directory for convenience. Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+ tmp=
+ trap 'exit_status=$?
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
trap '{ (exit 1); exit 1; }' 1 2 13 15
}
-
# Create a (secure) tmp directory for tmp files.
{
- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
} ||
{
- tmp=./confstat$$-$RANDOM
- (umask 077 && mkdir $tmp)
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
} ||
{
echo "$me: cannot create a temporary directory in ." >&2
{ (exit 1); exit 1; }
}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
#
-# CONFIG_FILES section.
+# Set up the sed scripts for CONFIG_FILES section.
#
# No need to generate the scripts if there are no CONFIG_FILES.
# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
- # Protect against being on the right side of a sed subst in config.status.
- 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
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;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,@LIBS@,$LIBS,;t t
-s,@ac_prefix_program@,$ac_prefix_program,;t t
-s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
-s,@DEBUG_CFLAGS@,$DEBUG_CFLAGS,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;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,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@am__tar@,$am__tar,;t t
-s,@am__untar@,$am__untar,;t t
-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-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,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@EGREP@,$EGREP,;t t
-s,@LN_S@,$LN_S,;t t
-s,@ECHO@,$ECHO,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@CPP@,$CPP,;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,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@F77@,$F77,;t t
-s,@FFLAGS@,$FFLAGS,;t t
-s,@ac_ct_F77@,$ac_ct_F77,;t t
-s,@LIBTOOL@,$LIBTOOL,;t t
-s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
-s,@USE_NLS@,$USE_NLS,;t t
-s,@MSGFMT@,$MSGFMT,;t t
-s,@GMSGFMT@,$GMSGFMT,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@CATALOGS@,$CATALOGS,;t t
-s,@CATOBJEXT@,$CATOBJEXT,;t t
-s,@DATADIRNAME@,$DATADIRNAME,;t t
-s,@GMOFILES@,$GMOFILES,;t t
-s,@INSTOBJEXT@,$INSTOBJEXT,;t t
-s,@INTLLIBS@,$INTLLIBS,;t t
-s,@PO_IN_DATADIR_TRUE@,$PO_IN_DATADIR_TRUE,;t t
-s,@PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t
-s,@POFILES@,$POFILES,;t t
-s,@POSUB@,$POSUB,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t
-s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t
-s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t
-s,@INTLTOOL_PROP_RULE@,$INTLTOOL_PROP_RULE,;t t
-s,@INTLTOOL_OAF_RULE@,$INTLTOOL_OAF_RULE,;t t
-s,@INTLTOOL_PONG_RULE@,$INTLTOOL_PONG_RULE,;t t
-s,@INTLTOOL_SERVER_RULE@,$INTLTOOL_SERVER_RULE,;t t
-s,@INTLTOOL_SHEET_RULE@,$INTLTOOL_SHEET_RULE,;t t
-s,@INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t
-s,@INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t
-s,@INTLTOOL_XAM_RULE@,$INTLTOOL_XAM_RULE,;t t
-s,@INTLTOOL_KBD_RULE@,$INTLTOOL_KBD_RULE,;t t
-s,@INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t
-s,@INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_XML_NOMERGE_RULE,;t t
-s,@INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t
-s,@INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t
-s,@INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t
-s,@INTLTOOL_SERVICE_RULE@,$INTLTOOL_SERVICE_RULE,;t t
-s,@INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t
-s,@INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t
-s,@INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t
-s,@INTLTOOL_PERL@,$INTLTOOL_PERL,;t t
-s,@INTLTOOL_ICONV@,$INTLTOOL_ICONV,;t t
-s,@INTLTOOL_MSGFMT@,$INTLTOOL_MSGFMT,;t t
-s,@INTLTOOL_MSGMERGE@,$INTLTOOL_MSGMERGE,;t t
-s,@INTLTOOL_XGETTEXT@,$INTLTOOL_XGETTEXT,;t t
-s,@ALL_LINGUAS@,$ALL_LINGUAS,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
-s,@GTK_LIBS@,$GTK_LIBS,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
-s,@GNOME_CFLAGS@,$GNOME_CFLAGS,;t t
-s,@GNOME_LIBS@,$GNOME_LIBS,;t t
-s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
-s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
-s,@GCONF_SCHEMAS_INSTALL_TRUE@,$GCONF_SCHEMAS_INSTALL_TRUE,;t t
-s,@GCONF_SCHEMAS_INSTALL_FALSE@,$GCONF_SCHEMAS_INSTALL_FALSE,;t t
-s,@gnome_prefix@,$gnome_prefix,;t t
-s,@gnome_cappletdir@,$gnome_cappletdir,;t t
-s,@GCONFTOOL@,$GCONFTOOL,;t t
-s,@ORBIT_IDL@,$ORBIT_IDL,;t t
-s,@BONOBO_IDLFLAGS@,$BONOBO_IDLFLAGS,;t t
-s,@AML@,$AML,;t t
-s,@GOB2@,$GOB2,;t t
-s,@GMIME_CFLAGS@,$GMIME_CFLAGS,;t t
-s,@GMIME_LIBS@,$GMIME_LIBS,;t t
-s,@OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
-s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
-s,@SASL_CFLAGS@,$SASL_CFLAGS,;t t
-s,@SASL_LIBS@,$SASL_LIBS,;t t
-s,@EVOLUTION_PLUGIN_CFLAGS@,$EVOLUTION_PLUGIN_CFLAGS,;t t
-s,@EVOLUTION_PLUGIN_LIBS@,$EVOLUTION_PLUGIN_LIBS,;t t
-s,@evolution_plugindir@,$evolution_plugindir,;t t
-s,@WITH_MBOX_TRUE@,$WITH_MBOX_TRUE,;t t
-s,@WITH_MBOX_FALSE@,$WITH_MBOX_FALSE,;t t
-s,@WITH_MOZILLA_TRUE@,$WITH_MOZILLA_TRUE,;t t
-s,@WITH_MOZILLA_FALSE@,$WITH_MOZILLA_FALSE,;t t
-s,@WITH_MBOX_OR_MOZILLA_TRUE@,$WITH_MBOX_OR_MOZILLA_TRUE,;t t
-s,@WITH_MBOX_OR_MOZILLA_FALSE@,$WITH_MBOX_OR_MOZILLA_FALSE,;t t
-s,@WITH_MH_TRUE@,$WITH_MH_TRUE,;t t
-s,@WITH_MH_FALSE@,$WITH_MH_FALSE,;t t
-s,@WITH_MAILDIR_TRUE@,$WITH_MAILDIR_TRUE,;t t
-s,@WITH_MAILDIR_FALSE@,$WITH_MAILDIR_FALSE,;t t
-s,@WITH_POP3_TRUE@,$WITH_POP3_TRUE,;t t
-s,@WITH_POP3_FALSE@,$WITH_POP3_FALSE,;t t
-s,@WITH_IMAP_TRUE@,$WITH_IMAP_TRUE,;t t
-s,@WITH_IMAP_FALSE@,$WITH_IMAP_FALSE,;t t
-s,@WITH_POP3_OR_IMAP_TRUE@,$WITH_POP3_OR_IMAP_TRUE,;t t
-s,@WITH_POP3_OR_IMAP_FALSE@,$WITH_POP3_OR_IMAP_FALSE,;t t
-s,@WITH_POP3_OR_IMAP_OR_GMAIL_TRUE@,$WITH_POP3_OR_IMAP_OR_GMAIL_TRUE,;t t
-s,@WITH_POP3_OR_IMAP_OR_GMAIL_FALSE@,$WITH_POP3_OR_IMAP_OR_GMAIL_FALSE,;t t
-s,@WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@,$WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE,;t t
-s,@WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@,$WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE,;t t
-s,@WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@,$WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE,;t t
-s,@WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@,$WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE,;t t
-s,@WITH_SSL_TRUE@,$WITH_SSL_TRUE,;t t
-s,@WITH_SSL_FALSE@,$WITH_SSL_FALSE,;t t
-s,@WITH_SASL_TRUE@,$WITH_SASL_TRUE,;t t
-s,@WITH_SASL_FALSE@,$WITH_SASL_FALSE,;t t
-s,@WITH_GMAIL_TRUE@,$WITH_GMAIL_TRUE,;t t
-s,@WITH_GMAIL_FALSE@,$WITH_GMAIL_FALSE,;t t
-s,@WITH_EVOLUTION_TRUE@,$WITH_EVOLUTION_TRUE,;t t
-s,@WITH_EVOLUTION_FALSE@,$WITH_EVOLUTION_FALSE,;t t
-s,@WITH_SYLPHEED_TRUE@,$WITH_SYLPHEED_TRUE,;t t
-s,@WITH_SYLPHEED_FALSE@,$WITH_SYLPHEED_FALSE,;t t
-s,@WITH_MIME_TRUE@,$WITH_MIME_TRUE,;t t
-s,@WITH_MIME_FALSE@,$WITH_MIME_FALSE,;t t
-s,@WITH_REGRESSION_TESTS_TRUE@,$WITH_REGRESSION_TESTS_TRUE,;t t
-s,@WITH_REGRESSION_TESTS_FALSE@,$WITH_REGRESSION_TESTS_FALSE,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
+if test -n "$CONFIG_FILES"; then
_ACEOF
- 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
- ac_sed_frag=1 # Number of current file.
- ac_beg=1 # First line for current file.
- ac_end=$ac_max_sed_lines # Line after last line for current file.
- ac_more_lines=:
- ac_sed_cmds=
- while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- else
- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- fi
- if test ! -s $tmp/subs.frag; then
- ac_more_lines=false
- else
- # The purpose of the label and of the branching condition is to
- # speed up the sed processing (if there are no `@' at all, there
- # is no need to browse any of the substitutions).
- # These are the two extra sed commands mentioned above.
- (echo ':t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
- else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
- fi
- ac_sed_frag=`expr $ac_sed_frag + 1`
- ac_beg=$ac_end
- ac_end=`expr $ac_end + $ac_max_sed_lines`
- fi
- done
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=cat
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+ac_prefix_program!$ac_prefix_program$ac_delim
+WARN_CFLAGS!$WARN_CFLAGS$ac_delim
+DEBUG_CFLAGS!$DEBUG_CFLAGS$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+target!$target$ac_delim
+target_cpu!$target_cpu$ac_delim
+target_vendor!$target_vendor$ac_delim
+target_os!$target_os$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+LN_S!$LN_S$ac_delim
+ECHO!$ECHO$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-fi # test -n "$CONFIG_FILES"
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+AR!$AR$ac_delim
+RANLIB!$RANLIB$ac_delim
+CPP!$CPP$ac_delim
+CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+CXXDEPMODE!$CXXDEPMODE$ac_delim
+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+F77!$F77$ac_delim
+FFLAGS!$FFLAGS$ac_delim
+ac_ct_F77!$ac_ct_F77$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
+USE_NLS!$USE_NLS$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+CATALOGS!$CATALOGS$ac_delim
+CATOBJEXT!$CATOBJEXT$ac_delim
+DATADIRNAME!$DATADIRNAME$ac_delim
+GMOFILES!$GMOFILES$ac_delim
+INSTOBJEXT!$INSTOBJEXT$ac_delim
+INTLLIBS!$INTLLIBS$ac_delim
+PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
+PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
+POFILES!$POFILES$ac_delim
+POSUB!$POSUB$ac_delim
+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
+INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
+INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
+INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
+INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
+INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
+INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
+INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
+INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
+INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
+INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
+INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
+INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
+INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
+INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
+INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
+INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
+INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
+INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
+INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
+INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
+INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
+ALL_LINGUAS!$ALL_LINGUAS$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+GTK_CFLAGS!$GTK_CFLAGS$ac_delim
+GTK_LIBS!$GTK_LIBS$ac_delim
+GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim
+GNOME_LIBS!$GNOME_LIBS$ac_delim
+GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim
+GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim
+GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim
+GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim
+gnome_prefix!$gnome_prefix$ac_delim
+GCONFTOOL!$GCONFTOOL$ac_delim
+ORBIT_IDL!$ORBIT_IDL$ac_delim
+BONOBO_IDLFLAGS!$BONOBO_IDLFLAGS$ac_delim
+AML!$AML$ac_delim
+GOB2!$GOB2$ac_delim
+GMIME_CFLAGS!$GMIME_CFLAGS$ac_delim
+GMIME_LIBS!$GMIME_LIBS$ac_delim
+OPENSSL_CFLAGS!$OPENSSL_CFLAGS$ac_delim
+OPENSSL_LIBS!$OPENSSL_LIBS$ac_delim
+SASL_CFLAGS!$SASL_CFLAGS$ac_delim
+SASL_LIBS!$SASL_LIBS$ac_delim
+EVOLUTION_PLUGIN_CFLAGS!$EVOLUTION_PLUGIN_CFLAGS$ac_delim
+EVOLUTION_PLUGIN_LIBS!$EVOLUTION_PLUGIN_LIBS$ac_delim
+evolution_plugindir!$evolution_plugindir$ac_delim
+WITH_MBOX_TRUE!$WITH_MBOX_TRUE$ac_delim
+WITH_MBOX_FALSE!$WITH_MBOX_FALSE$ac_delim
+WITH_MOZILLA_TRUE!$WITH_MOZILLA_TRUE$ac_delim
+WITH_MOZILLA_FALSE!$WITH_MOZILLA_FALSE$ac_delim
+WITH_MBOX_OR_MOZILLA_TRUE!$WITH_MBOX_OR_MOZILLA_TRUE$ac_delim
+WITH_MBOX_OR_MOZILLA_FALSE!$WITH_MBOX_OR_MOZILLA_FALSE$ac_delim
+WITH_MH_TRUE!$WITH_MH_TRUE$ac_delim
+WITH_MH_FALSE!$WITH_MH_FALSE$ac_delim
+WITH_MAILDIR_TRUE!$WITH_MAILDIR_TRUE$ac_delim
+WITH_MAILDIR_FALSE!$WITH_MAILDIR_FALSE$ac_delim
+WITH_POP3_TRUE!$WITH_POP3_TRUE$ac_delim
+WITH_POP3_FALSE!$WITH_POP3_FALSE$ac_delim
+WITH_IMAP_TRUE!$WITH_IMAP_TRUE$ac_delim
+WITH_IMAP_FALSE!$WITH_IMAP_FALSE$ac_delim
+WITH_POP3_OR_IMAP_TRUE!$WITH_POP3_OR_IMAP_TRUE$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+WITH_POP3_OR_IMAP_FALSE!$WITH_POP3_OR_IMAP_FALSE$ac_delim
+WITH_POP3_OR_IMAP_OR_GMAIL_TRUE!$WITH_POP3_OR_IMAP_OR_GMAIL_TRUE$ac_delim
+WITH_POP3_OR_IMAP_OR_GMAIL_FALSE!$WITH_POP3_OR_IMAP_OR_GMAIL_FALSE$ac_delim
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE!$WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE$ac_delim
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE!$WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE$ac_delim
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE!$WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE$ac_delim
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE!$WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE$ac_delim
+WITH_SSL_TRUE!$WITH_SSL_TRUE$ac_delim
+WITH_SSL_FALSE!$WITH_SSL_FALSE$ac_delim
+WITH_SASL_TRUE!$WITH_SASL_TRUE$ac_delim
+WITH_SASL_FALSE!$WITH_SASL_FALSE$ac_delim
+WITH_GMAIL_TRUE!$WITH_GMAIL_TRUE$ac_delim
+WITH_GMAIL_FALSE!$WITH_GMAIL_FALSE$ac_delim
+WITH_EVOLUTION_TRUE!$WITH_EVOLUTION_TRUE$ac_delim
+WITH_EVOLUTION_FALSE!$WITH_EVOLUTION_FALSE$ac_delim
+WITH_SYLPHEED_TRUE!$WITH_SYLPHEED_TRUE$ac_delim
+WITH_SYLPHEED_FALSE!$WITH_SYLPHEED_FALSE$ac_delim
+WITH_MIME_TRUE!$WITH_MIME_TRUE$ac_delim
+WITH_MIME_FALSE!$WITH_MIME_FALSE$ac_delim
+WITH_REGRESSION_TESTS_TRUE!$WITH_REGRESSION_TESTS_TRUE$ac_delim
+WITH_REGRESSION_TESTS_FALSE!$WITH_REGRESSION_TESTS_FALSE$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
_ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[ ]*$//
+}'
+fi
+
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
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
+fi # test -n "$CONFIG_FILES"
+
+
+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
+do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ { (exit 1); exit 1; }; };;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+ ac_save_IFS=$IFS
+ IFS=:
+ set x $ac_tag
+ IFS=$ac_save_IFS
+ shift
+ ac_file=$1
+ shift
+
+ case $ac_mode in
+ :L) ac_source=$1;;
+ :[FH])
+ ac_file_inputs=
+ for ac_f
+ do
+ case $ac_f in
+ -) ac_f="$tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+ test -f "$ac_f" ||
+ case $ac_f in
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+ ac_file_inputs="$ac_file_inputs $ac_f"
+ done
+
+ # 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 by config.status. */
+ configure_input="Generated from "`IFS=:
+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ if test x"$ac_file" != x-; then
+ configure_input="$ac_file. $configure_input"
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ fi
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin";;
+ esac
+ ;;
esac
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ ac_dir=`$as_dirname -- "$ac_file" ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ { as_dir="$ac_dir"
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
-
ac_builddir=.
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
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
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
case $srcdir in
- .) # No --srcdir option. We are building in place.
+ .) # 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_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
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 ;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+ case $ac_mode in
+ :F)
+ #
+ # CONFIG_FILE
+ #
case $INSTALL in
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+ esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
esac
+_ACEOF
- if test x"$ac_file" != x-; then
- { 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 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.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- 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";;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo "$f"
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo "$srcdir/$f"
- else
- # /dev/null tree
- { { 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; }
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+case `sed -n '/datarootdir/ {
+ p
+ q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+' $ac_file_inputs` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
+ s&@infodir@&$infodir&g
+ s&@localedir@&$localedir&g
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
_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
- if test x"$ac_file" != x-; then
- mv $tmp/out $ac_file
- else
- cat $tmp/out
- rm -f $tmp/out
- fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB='[ ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;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&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&2;}
+
+ rm -f "$tmp/stdin"
case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
+ -) cat "$tmp/out"; rm -f "$tmp/out";;
+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
esac
-
- 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
- # src tree.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- 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; }; }
- # Do quote $f, to prevent DOS paths from being IFS'd.
- echo "$f";;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo "$f"
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo "$srcdir/$f"
- else
- # /dev/null tree
- { { 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; }
- # Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-
+ ;;
+ :H)
+ #
+ # CONFIG_HEADER
+ #
_ACEOF
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h. The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status. Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `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 <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-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
-_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.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments. This is necessary, for
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status. If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless. But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
+ac_dB='\\)[ (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+ sed -n '
+ t rset
+ :rset
+ s/^[ ]*#[ ]*define[ ][ ]*//
+ t ok
+ d
+ :ok
+ s/[\\&,]/\\&/g
+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+ ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #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 <<\_ACEOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_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).
-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo ' :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[ #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
do
- # Write a limited-size here document to $tmp/defines.sed.
- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#define' lines.
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+ # Write a here document:
+ cat >>$CONFIG_STATUS <<_ACEOF
+ # First, check the format of the line:
+ cat >"\$tmp/defines.sed" <<\\CEOF
+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
+b
+:def
+_ACEOF
+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
echo 'CEOF
- sed -f $tmp/defines.sed $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+ grep . conftest.tail >/dev/null || break
rm -f conftest.defines
mv conftest.tail conftest.defines
done
-rm -f conftest.defines
-echo ' fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
- # Write a limited-size here document to $tmp/undefs.sed.
- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#undef'
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
- echo 'CEOF
- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
- rm -f conftest.undefs
- mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
+rm -f conftest.defines conftest.tail
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
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 by config.status. */
- if test x"$ac_file" = x-; then
- echo "/* Generated by configure. */" >$tmp/config.h
- else
- 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 diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+ echo "/* $configure_input */" >"$tmp/config.h"
+ cat "$ac_result" >>"$tmp/config.h"
+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
{ echo "$as_me:$LINENO: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
- 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\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
rm -f $ac_file
- mv $tmp/config.h $ac_file
+ mv "$tmp/config.h" $ac_file
fi
else
- cat $tmp/config.h
- rm -f $tmp/config.h
+ echo "/* $configure_input */"
+ cat "$ac_result"
fi
+ rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
@@ -25662,135 +26667,39 @@ for _am_header in $config_headers :; do
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X$ac_file : 'X\(//\)[^/]' \| \
X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
echo X$ac_file |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-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'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
- 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
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+ esac
- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
- case $ac_dest in
- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+ case $ac_file$ac_mode in
+ "depfiles":C) 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.
@@ -25798,20 +26707,32 @@ echo "$as_me: executing $ac_dest commands" >&6;}
# 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 ||
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ 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'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
else
continue
fi
@@ -25833,52 +26754,79 @@ echo X"$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 ||
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ 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'`
- { if $as_mkdir_p; then
- mkdir -p $dirpart/$fdir
- else
- as_dir=$dirpart/$fdir
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
-
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
done
;;
- default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)
+ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac ;;
- intltool )
+ "intltool":C)
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
@@ -25899,7 +26847,7 @@ for file in intltool-extract intltool-merge intltool-update; do
done
;;
- po/stamp-it )
+ "po/stamp-it":C)
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
sed '/^#/d
@@ -25922,11 +26870,10 @@ echo "$as_me: error: po/Makefile is not ready." >&2;}
rm -f "po/Makefile.tmp"
mv "po/stamp-it.tmp" "po/stamp-it"
;;
+
esac
-done
-_ACEOF
+done # for ac_tag
-cat >>$CONFIG_STATUS <<\_ACEOF
{ (exit 0); exit 0; }
_ACEOF
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Mail Notification], 4.0, jylefort@brutele.be)
+AC_INIT([Mail Notification], 4.1, jylefort@brutele.be)
AC_CONFIG_SRCDIR(src/mn-main.c)
AC_PREREQ(2.59)
@@ -31,7 +31,7 @@ MN_ARG_ENABLE(regression-tests, [build and run regression tests], no)
# needed by AC_REENTRANT_RESOLVER
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(foreign)
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
AC_PROG_LIBTOOL
@@ -70,11 +70,10 @@ AC_STRUCT_TM
AM_PATH_GTK_2_0(2.6.0,, [AC_MSG_ERROR([unable to find the GTK+ library])])
-PKG_CHECK_MODULES(GNOME, [gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify],, [AC_MSG_ERROR([unable to find the GNOME libraries])])
+PKG_CHECK_MODULES(GNOME, [gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify],, [AC_MSG_ERROR([unable to find the GNOME libraries])])
AM_GCONF_SOURCE_2
AM_PATH_GNOME_PREFIX
-AM_PATH_GNOME_CAPPLETDIR
AC_PATH_PROG(GCONFTOOL, gconftool-2)
if test -z "$GCONFTOOL"; then
@@ -142,7 +141,10 @@ if MN_FEATURE_DISABLED(pop3) && MN_FEATURE_DISABLED(imap); then
fi
if MN_FEATURE_ENABLED(ssl); then
- AM_PATH_OPENSSL(,, [MN_FEATURE_DISABLE(ssl, [OpenSSL not found])])
+ AM_PATH_OPENSSL(0.9.6,, [MN_FEATURE_DISABLE(ssl, [OpenSSL not found])])
+ if MN_FEATURE_ENABLED(ssl); then
+ AC_OPENSSL_MT(, [MN_FEATURE_DISABLE(ssl, [OpenSSL does not support multi-threading])])
+ fi
fi
if MN_FEATURE_ENABLED(sasl); then
AM_PATH_SASL2(,, [MN_FEATURE_DISABLE(sasl, [Cyrus SASL not found])])
@@ -150,7 +152,10 @@ fi
if MN_FEATURE_ENABLED(evolution); then
evolution=no
- AM_PATH_EVOLUTION_PLUGIN(2.10,, [evolution=yes])
+ AM_PATH_EVOLUTION_PLUGIN(2.12,, [evolution=yes])
+ if test $evolution = no; then
+ AM_PATH_EVOLUTION_PLUGIN(2.10,, [evolution=yes])
+ fi
if test $evolution = no; then
AM_PATH_EVOLUTION_PLUGIN(2.8,, [evolution=yes])
fi
diff --git a/data/Makefile.am b/data/Makefile.am
@@ -3,7 +3,7 @@ evolution_server_in = GNOME_MailNotification_Evolution.server.in
evolution_server = GNOME_MailNotification_Evolution.server
endif
-# gnome_cappletdir is defined by configure
+gnome_cappletdir = $(datadir)/applications
gnome_capplet_in_files = mail-notification-properties.desktop.in
gnome_capplet_DATA = mail-notification-properties.desktop
diff --git a/data/Makefile.in b/data/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -42,7 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/evolution-plugin.m4 \
$(top_srcdir)/m4/gnome.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/openssl.m4 \
$(top_srcdir)/m4/reentrant-resolver.m4 \
$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
@@ -71,8 +67,6 @@ DATA = $(autostart_DATA) $(gnome_capplet_DATA) $(schemas_DATA) \
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
AMTAR = @AMTAR@
AR = @AR@
@@ -108,8 +102,6 @@ EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -120,8 +112,10 @@ GMSGFMT = @GMSGFMT@
GNOME_CFLAGS = @GNOME_CFLAGS@
GNOME_LIBS = @GNOME_LIBS@
GOB2 = @GOB2@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -161,11 +155,11 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
OPENSSL_LIBS = @OPENSSL_LIBS@
@@ -191,55 +185,15 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
-WITH_EVOLUTION_FALSE = @WITH_EVOLUTION_FALSE@
-WITH_EVOLUTION_TRUE = @WITH_EVOLUTION_TRUE@
-WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
-WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
-WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
-WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
-WITH_MAILDIR_FALSE = @WITH_MAILDIR_FALSE@
-WITH_MAILDIR_TRUE = @WITH_MAILDIR_TRUE@
-WITH_MBOX_FALSE = @WITH_MBOX_FALSE@
-WITH_MBOX_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
-WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_TRUE@
-WITH_MBOX_TRUE = @WITH_MBOX_TRUE@
-WITH_MH_FALSE = @WITH_MH_FALSE@
-WITH_MH_TRUE = @WITH_MH_TRUE@
-WITH_MIME_FALSE = @WITH_MIME_FALSE@
-WITH_MIME_TRUE = @WITH_MIME_TRUE@
-WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
-WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@
-WITH_POP3_FALSE = @WITH_POP3_FALSE@
-WITH_POP3_OR_IMAP_FALSE = @WITH_POP3_OR_IMAP_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_FALSE = @WITH_POP3_OR_IMAP_OR_GMAIL_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_TRUE = @WITH_POP3_OR_IMAP_OR_GMAIL_TRUE@
-WITH_POP3_OR_IMAP_TRUE = @WITH_POP3_OR_IMAP_TRUE@
-WITH_POP3_TRUE = @WITH_POP3_TRUE@
-WITH_REGRESSION_TESTS_FALSE = @WITH_REGRESSION_TESTS_FALSE@
-WITH_REGRESSION_TESTS_TRUE = @WITH_REGRESSION_TESTS_TRUE@
-WITH_SASL_FALSE = @WITH_SASL_FALSE@
-WITH_SASL_TRUE = @WITH_SASL_TRUE@
-WITH_SSL_FALSE = @WITH_SSL_FALSE@
-WITH_SSL_TRUE = @WITH_SSL_TRUE@
-WITH_SYLPHEED_FALSE = @WITH_SYLPHEED_FALSE@
-WITH_SYLPHEED_TRUE = @WITH_SYLPHEED_TRUE@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -251,39 +205,48 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
evolution_plugindir = @evolution_plugindir@
exec_prefix = @exec_prefix@
-gnome_cappletdir = @gnome_cappletdir@
gnome_prefix = @gnome_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
@WITH_EVOLUTION_TRUE@evolution_server_in = GNOME_MailNotification_Evolution.server.in
@WITH_EVOLUTION_TRUE@evolution_server = GNOME_MailNotification_Evolution.server
-
-# gnome_cappletdir is defined by configure
+gnome_cappletdir = $(datadir)/applications
gnome_capplet_in_files = mail-notification-properties.desktop.in
gnome_capplet_DATA = mail-notification-properties.desktop
autostartdir = $(sysconfdir)/xdg/autostart
@@ -349,13 +312,9 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
install-autostartDATA: $(autostart_DATA)
@$(NORMAL_INSTALL)
- test -z "$(autostartdir)" || $(mkdir_p) "$(DESTDIR)$(autostartdir)"
+ test -z "$(autostartdir)" || $(MKDIR_P) "$(DESTDIR)$(autostartdir)"
@list='$(autostart_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -372,7 +331,7 @@ uninstall-autostartDATA:
done
install-gnome_cappletDATA: $(gnome_capplet_DATA)
@$(NORMAL_INSTALL)
- test -z "$(gnome_cappletdir)" || $(mkdir_p) "$(DESTDIR)$(gnome_cappletdir)"
+ test -z "$(gnome_cappletdir)" || $(MKDIR_P) "$(DESTDIR)$(gnome_cappletdir)"
@list='$(gnome_capplet_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -389,7 +348,7 @@ uninstall-gnome_cappletDATA:
done
install-schemasDATA: $(schemas_DATA)
@$(NORMAL_INSTALL)
- test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
+ test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
@list='$(schemas_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -406,7 +365,7 @@ uninstall-schemasDATA:
done
install-serverDATA: $(server_DATA)
@$(NORMAL_INSTALL)
- test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
+ test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
@list='$(server_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -429,22 +388,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; 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"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -460,7 +418,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(gnome_cappletdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -494,7 +452,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -510,12 +468,20 @@ install-data-am: install-autostartDATA install-data-local \
install-gnome_cappletDATA install-schemasDATA \
install-serverDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -535,20 +501,23 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-autostartDATA uninstall-gnome_cappletDATA \
- uninstall-info-am uninstall-schemasDATA uninstall-serverDATA
+ uninstall-schemasDATA uninstall-serverDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
install-autostartDATA install-data install-data-am \
- install-data-local install-exec install-exec-am \
- install-gnome_cappletDATA install-info install-info-am \
- install-man install-schemasDATA install-serverDATA \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-autostartDATA \
- uninstall-gnome_cappletDATA uninstall-info-am \
+ install-data-local install-dvi install-dvi-am install-exec \
+ install-exec-am install-gnome_cappletDATA install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-schemasDATA install-serverDATA install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-autostartDATA uninstall-gnome_cappletDATA \
uninstall-schemasDATA uninstall-serverDATA
diff --git a/data/mail-notification.schemas.in.in b/data/mail-notification.schemas.in.in
@@ -175,6 +175,18 @@
</locale>
</schema>
<schema>
+ <key>/schemas/apps/mail-notification/popups/actions</key>
+ <applyto>/apps/mail-notification/popups/actions</applyto>
+ <owner>mail-notification</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <default>[open,mark-as-read,mark-as-spam]</default>
+ <locale name="C">
+ <short>Message popups actions</short>
+ <long>The ordered list of actions to include in the message popups. Each element must be "open", "mark-as-read", "mark-as-spam" or "delete".</long>
+ </locale>
+ </schema>
+ <schema>
<key>/schemas/apps/mail-notification/popups/position</key>
<applyto>/apps/mail-notification/popups/position</applyto>
<owner>mail-notification</owner>
diff --git a/depcomp b/depcomp
@@ -1,9 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2005-07-09.11
+scriptversion=2006-10-15.18
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 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
@@ -91,7 +92,20 @@ 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"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am. Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+ for arg
+ do
+ case $arg in
+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+ *) set fnord "$@" "$arg" ;;
+ esac
+ shift # fnord
+ shift # $arg
+ done
+ "$@"
stat=$?
if test $stat -eq 0; then :
else
@@ -276,6 +290,46 @@ icc)
rm -f "$tmpdepfile"
;;
+hp2)
+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+ # compilers, which have integrated preprocessors. The correct option
+ # to use with these is +Maked; it writes dependencies to a file named
+ # 'foo.d', which lands next to the object file, wherever that
+ # happens to be.
+ # Much of this is similar to the tru64 case; see comments there.
+ 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$base.d
+ tmpdepfile2=$dir.libs/$base.d
+ "$@" -Wc,+Maked
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ "$@" +Maked
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add `dependent.h:' lines.
+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile" "$tmpdepfile2"
+ ;;
+
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'.
@@ -288,13 +342,13 @@ tru64)
if test "$libtool" = yes; then
# With Tru64 cc, shared objects can also be used to make a
- # static library. This mecanism is used in libtool 1.4 series to
+ # static library. This mechanism is used in libtool 1.4 series to
# handle both shared and static libraries in a single compilation.
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
#
# With libtool 1.5 this exception was removed, and libtool now
# generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in in $dir.libs/$base.o.d and
+ # compilations output dependencies in $dir.libs/$base.o.d and
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
diff --git a/help/C/Makefile.in b/help/C/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -76,15 +76,11 @@
# Version: 0.1.2 (last updated: March 20, 2002)
#
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -106,7 +102,7 @@ subdir = help/C
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/evolution-plugin.m4 \
$(top_srcdir)/m4/gnome.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/openssl.m4 \
$(top_srcdir)/m4/reentrant-resolver.m4 \
$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
@@ -121,8 +117,6 @@ DATA = $(dist_noinst_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
AMTAR = @AMTAR@
AR = @AR@
@@ -158,8 +152,6 @@ EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -170,8 +162,10 @@ GMSGFMT = @GMSGFMT@
GNOME_CFLAGS = @GNOME_CFLAGS@
GNOME_LIBS = @GNOME_LIBS@
GOB2 = @GOB2@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -211,11 +205,11 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
OPENSSL_LIBS = @OPENSSL_LIBS@
@@ -241,55 +235,15 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
-WITH_EVOLUTION_FALSE = @WITH_EVOLUTION_FALSE@
-WITH_EVOLUTION_TRUE = @WITH_EVOLUTION_TRUE@
-WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
-WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
-WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
-WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
-WITH_MAILDIR_FALSE = @WITH_MAILDIR_FALSE@
-WITH_MAILDIR_TRUE = @WITH_MAILDIR_TRUE@
-WITH_MBOX_FALSE = @WITH_MBOX_FALSE@
-WITH_MBOX_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
-WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_TRUE@
-WITH_MBOX_TRUE = @WITH_MBOX_TRUE@
-WITH_MH_FALSE = @WITH_MH_FALSE@
-WITH_MH_TRUE = @WITH_MH_TRUE@
-WITH_MIME_FALSE = @WITH_MIME_FALSE@
-WITH_MIME_TRUE = @WITH_MIME_TRUE@
-WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
-WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@
-WITH_POP3_FALSE = @WITH_POP3_FALSE@
-WITH_POP3_OR_IMAP_FALSE = @WITH_POP3_OR_IMAP_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_FALSE = @WITH_POP3_OR_IMAP_OR_GMAIL_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_TRUE = @WITH_POP3_OR_IMAP_OR_GMAIL_TRUE@
-WITH_POP3_OR_IMAP_TRUE = @WITH_POP3_OR_IMAP_TRUE@
-WITH_POP3_TRUE = @WITH_POP3_TRUE@
-WITH_REGRESSION_TESTS_FALSE = @WITH_REGRESSION_TESTS_FALSE@
-WITH_REGRESSION_TESTS_TRUE = @WITH_REGRESSION_TESTS_TRUE@
-WITH_SASL_FALSE = @WITH_SASL_FALSE@
-WITH_SASL_TRUE = @WITH_SASL_TRUE@
-WITH_SSL_FALSE = @WITH_SSL_FALSE@
-WITH_SSL_TRUE = @WITH_SSL_TRUE@
-WITH_SYLPHEED_FALSE = @WITH_SYLPHEED_FALSE@
-WITH_SYLPHEED_TRUE = @WITH_SYLPHEED_TRUE@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -301,35 +255,49 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+
+# ************* Begin of section some packagers may need to modify **************
+# This variable (docdir) specifies where the documents should be installed.
+# This default value should work for most packages.
+docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+dvidir = @dvidir@
evolution_plugindir = @evolution_plugindir@
exec_prefix = @exec_prefix@
-gnome_cappletdir = @gnome_cappletdir@
gnome_prefix = @gnome_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
figdir = figures
docname = mail-notification
lang = C
@@ -338,11 +306,6 @@ entities = documentation-license.xml software-license.xml
dist_noinst_DATA = validate.stamp
MAINTAINERCLEANFILES = validate.stamp
-# ************* Begin of section some packagers may need to modify **************
-# This variable (docdir) specifies where the documents should be installed.
-# This default value should work for most packages.
-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-
# ************** You should not have to edit below this line *******************
xml_files = $(entities) $(docname).xml
omf_dir = $(top_srcdir)/omf-install
@@ -388,10 +351,6 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
tags: TAGS
TAGS:
@@ -400,23 +359,21 @@ CTAGS:
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/../../help
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; 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"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -466,7 +423,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -482,12 +439,20 @@ install-data-am: install-data-local
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -506,18 +471,22 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
+
+.MAKE: install-am install-data-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
dist-hook distclean distclean-generic distclean-libtool \
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am install-data-hook \
- install-data-local install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ install-data-local install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am uninstall-local
+ uninstall-local
validate.stamp: $(docname).xml $(entities)
diff --git a/help/C/documentation-license.xml b/help/C/documentation-license.xml
@@ -1,42 +1,76 @@
-<legalnotice id="documentation-license">
- <para>
- Redistribution and use in source (SGML DocBook) and 'compiled'
- forms (SGML, HTML, PDF, PostScript, RTF and so forth) with or
- without modification, are permitted provided that the following
- conditions are met:
-
- <orderedlist>
- <listitem>
- <para>Redistributions of source code (SGML DocBook) must
- retain the above copyright notice, this list of conditions and
- the following disclaimer as the first lines of this file
- unmodified.
- </para>
- </listitem>
- <listitem>
- <para>Redistributions in compiled form (transformed to other
- DTDs, converted to PDF, PostScript, RTF and other formats)
- must reproduce the above copyright notice, this list of
- conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- </para>
- </listitem>
- </orderedlist>
- </para>
-
- <para>
- THIS DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
- </para>
-</legalnotice>
+ <legalnotice id="legalnotice">
+ <para>
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation
+ License (GFDL), Version 1.1 or any later version published
+ by the Free Software Foundation with no Invariant Sections,
+ no Front-Cover Texts, and no Back-Cover Texts. You can find
+ a copy of the GFDL at this <ulink type="help"
+ url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+ distributed with this manual.
+ </para>
+ <para> This manual is part of a collection of GNOME manuals
+ distributed under the GFDL. If you want to distribute this
+ manual separately from the collection, you can do so by
+ adding a copy of the license to the manual, as described in
+ section 6 of the license.
+ </para>
+
+ <para>
+ Many of the names used by companies to distinguish their
+ products and services are claimed as trademarks. Where those
+ names appear in any GNOME documentation, and the members of
+ the GNOME Documentation Project are made aware of those
+ trademarks, then the names are in capital letters or initial
+ capital letters.
+ </para>
+
+ <para>
+ DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
+ UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
+ WITH THE FURTHER UNDERSTANDING THAT:
+
+ <orderedlist>
+ <listitem>
+ <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+ IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
+ THAT THE DOCUMENT OR MODIFIED VERSION OF THE
+ DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
+ A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
+ RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
+ OF THE DOCUMENT OR MODIFIED VERSION OF THE
+ DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
+ MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
+ YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
+ CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
+ SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+ OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+ LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
+ VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
+ EXCEPT UNDER THIS DISCLAIMER; AND
+ </para>
+ </listitem>
+ <listitem>
+ <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
+ THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
+ CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
+ INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
+ DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
+ OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
+ PARTIES, BE LIABLE TO ANY PERSON FOR ANY
+ DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
+ CONSEQUENTIAL DAMAGES OF ANY CHARACTER
+ INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
+ OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
+ MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
+ LOSSES ARISING OUT OF OR RELATING TO USE OF THE
+ DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
+ EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
+ THE POSSIBILITY OF SUCH DAMAGES.
+ </para>
+ </listitem>
+ </orderedlist>
+ </para>
+ </legalnotice>
+
+\ No newline at end of file
diff --git a/help/C/mail-notification-C.omf b/help/C/mail-notification-C.omf
@@ -12,9 +12,9 @@
Mail Notification Manual
</title>
<date>
- 2007-01-17
+ 2007-06-26
</date>
- <version identifier="2.18" date="2007-01-17" description="Version 2.18"/>
+ <version identifier="2.19" date="2007-06-26" description="Version 2.19"/>
<subject category="GNOME|Internet"/>
<description>
Mail Notification Manual
diff --git a/help/C/mail-notification.xml b/help/C/mail-notification.xml
@@ -2,9 +2,9 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY app "<application>Mail Notification</application>">
- <!ENTITY appversion "4.0">
- <!ENTITY manrevision "2.18">
- <!ENTITY date "Wednesday, January 17, 2007">
+ <!ENTITY appversion "4.1">
+ <!ENTITY manrevision "2.19">
+ <!ENTITY date "Tuesday, June 26, 2007">
<!ENTITY project "The Mail Notification Project">
@@ -27,39 +27,13 @@
<!ENTITY gnomevfs "<link linkend="gnomevfs">GnomeVFS</link>">
]>
-<!-- $Id: mail-notification.xml,v 1.150 2007/01/17 14:54:22 jylefort Exp $ -->
+<!-- $Id: mail-notification.xml,v 1.152 2007-06-26 11:29:10 jylefort Exp $ -->
<!-- Mail Notification Manual -->
<!-- Copyright (C) 2003-2007 Jean-Yves Lefort -->
<!-- All rights reserved. -->
-<!-- Redistribution and use in source (SGML DocBook) and 'compiled' -->
-<!-- forms (SGML, HTML, PDF, PostScript, RTF and so forth) with or -->
-<!-- without modification, are permitted provided that the following -->
-<!-- conditions are met: -->
-<!-- 1. Redistributions of source code (SGML DocBook) must -->
-<!-- retain the above copyright notice, this list of conditions and -->
-<!-- the following disclaimer as the first lines of this file -->
-<!-- unmodified. -->
-<!-- 2. Redistributions in compiled form (transformed to other -->
-<!-- DTDs, converted to PDF, PostScript, RTF and other formats) -->
-<!-- must reproduce the above copyright notice, this list of -->
-<!-- conditions and the following disclaimer in the documentation -->
-<!-- and/or other materials provided with the distribution. -->
-
-<!-- THIS DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND -->
-<!-- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -->
-<!-- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -->
-<!-- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -->
-<!-- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
-<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -->
-<!-- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -->
-<!-- TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -->
-<!-- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -->
-<!-- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -->
-<!-- TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF -->
-<!-- THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY -->
-<!-- OF SUCH DAMAGE. -->
+<!-- See documentation-license.xml for licensing information. -->
<!-- This document does its best to adhere to the -->
<!-- GNOME Documentation Style Guide V1.3 -->
@@ -138,6 +112,17 @@
</revdescription>
</revision>
<revision>
+ <revnumber>Mail Notification Manual V2.18</revnumber>
+ <date>Wednesday, January 17, 2007</date>
+ <revdescription>
+ <para role="author">
+ Jean-Yves Lefort
+ <email>jylefort@brutele.be</email>
+ </para>
+ <para role="publisher">&project;</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>Mail Notification Manual V2.17</revnumber>
<date>Thursday, December 7, 2006</date>
<revdescription>
@@ -459,7 +444,7 @@
<varlistentry>
<term>--unset-obsolete-configuration</term>
- <listitem><para>Unset obsolete GConf configuration</para></listitem>
+ <listitem><para>Unset obsolete <application>GConf</application> configuration</para></listitem>
</varlistentry>
<varlistentry>
@@ -995,8 +980,8 @@
<para>
For the folder selector to be available and for
monitoring an Evolution mailbox, Evolution must be
- running and the Evolution Mail Notification plugin
- must be loaded.
+ running and the Evolution <guilabel>Jean-Yves Lefort's
+ Mail Notification</guilabel> plugin must be loaded.
</para>
</note>
</listitem>
@@ -1130,7 +1115,14 @@
<listitem><para><guilabel>Open</guilabel></para></listitem>
<listitem><para><guilabel>Mark as Read</guilabel></para></listitem>
<listitem><para><guilabel>Mark as Spam</guilabel></para></listitem>
+ <listitem><para><guilabel>Delete</guilabel></para></listitem>
</itemizedlist>
+ <para>
+ Note that the <guilabel>Delete</guilabel> action is disabled by
+ default. It can be enabled by modifying the <database
+ class="field">/apps/mail-notification/popups/actions</database>
+ <application>GConf</application> key.
+ </para>
<sect2 id="built-in-actions">
<title>Built-in Actions</title>
@@ -1147,6 +1139,7 @@
<entry><guilabel>Open</guilabel></entry>
<entry><guilabel>Mark as Read</guilabel></entry>
<entry><guilabel>Mark as Spam</guilabel></entry>
+ <entry><guilabel>Delete</guilabel></entry>
</row>
</thead>
<tbody>
@@ -1155,54 +1148,63 @@
<entry>no</entry>
<entry>no</entry>
<entry>no</entry>
+ <entry>no</entry>
</row>
<row>
<entry>&mh;</entry>
<entry>yes</entry>
<entry>no</entry>
<entry>no</entry>
+ <entry>no</entry>
</row>
<row>
<entry>&maildir;</entry>
<entry>yes</entry>
<entry>yes</entry>
<entry>no</entry>
+ <entry>no</entry>
</row>
<row>
<entry>&pop3;</entry>
<entry>no</entry>
<entry>no</entry>
<entry>no</entry>
+ <entry>no</entry>
</row>
<row>
<entry>&imap;</entry>
<entry>no</entry>
<entry>no</entry>
<entry>no</entry>
+ <entry>no</entry>
</row>
<row>
<entry>&gmail;</entry>
<entry>yes</entry>
<entry>no</entry>
<entry>no</entry>
+ <entry>no</entry>
</row>
<row>
<entry>Evolution</entry>
<entry>yes</entry>
<entry>yes</entry>
<entry>yes</entry>
+ <entry>yes</entry>
</row>
<row>
<entry>&mozilla;</entry>
<entry>no</entry>
<entry>no</entry>
<entry>no</entry>
+ <entry>no</entry>
</row>
<row>
<entry>&sylpheed;</entry>
<entry>yes</entry>
<entry>yes</entry>
<entry>no</entry>
+ <entry>no</entry>
</row>
</tbody>
</tgroup>
@@ -1251,6 +1253,10 @@
<entry><guilabel>Mark as Spam</guilabel></entry>
<entry><parameter>mark-as-spam-command</parameter></entry>
</row>
+ <row>
+ <entry><guilabel>Delete</guilabel></entry>
+ <entry><parameter>delete-command</parameter></entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -1805,13 +1811,7 @@ widget "*" style "mn-icons"</programlisting>
</listitem>
<listitem>
<para>
- Select the <command>mail-notification --sm-disable</command>
- command.
- </para>
- </listitem>
- <listitem>
- <para>
- Click on the <guibutton>Disable</guibutton> button.
+ Uncheck the <guilabel>Mail Notification</guilabel> entry.
</para>
</listitem>
</orderedlist>
diff --git a/help/Makefile.in b/help/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -13,15 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -41,7 +37,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/evolution-plugin.m4 \
$(top_srcdir)/m4/gnome.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/openssl.m4 \
$(top_srcdir)/m4/reentrant-resolver.m4 \
$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
@@ -54,18 +50,19 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
AMTAR = @AMTAR@
AR = @AR@
@@ -101,8 +98,6 @@ EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -113,8 +108,10 @@ GMSGFMT = @GMSGFMT@
GNOME_CFLAGS = @GNOME_CFLAGS@
GNOME_LIBS = @GNOME_LIBS@
GOB2 = @GOB2@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -154,11 +151,11 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
OPENSSL_LIBS = @OPENSSL_LIBS@
@@ -184,55 +181,15 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
-WITH_EVOLUTION_FALSE = @WITH_EVOLUTION_FALSE@
-WITH_EVOLUTION_TRUE = @WITH_EVOLUTION_TRUE@
-WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
-WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
-WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
-WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
-WITH_MAILDIR_FALSE = @WITH_MAILDIR_FALSE@
-WITH_MAILDIR_TRUE = @WITH_MAILDIR_TRUE@
-WITH_MBOX_FALSE = @WITH_MBOX_FALSE@
-WITH_MBOX_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
-WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_TRUE@
-WITH_MBOX_TRUE = @WITH_MBOX_TRUE@
-WITH_MH_FALSE = @WITH_MH_FALSE@
-WITH_MH_TRUE = @WITH_MH_TRUE@
-WITH_MIME_FALSE = @WITH_MIME_FALSE@
-WITH_MIME_TRUE = @WITH_MIME_TRUE@
-WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
-WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@
-WITH_POP3_FALSE = @WITH_POP3_FALSE@
-WITH_POP3_OR_IMAP_FALSE = @WITH_POP3_OR_IMAP_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_FALSE = @WITH_POP3_OR_IMAP_OR_GMAIL_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_TRUE = @WITH_POP3_OR_IMAP_OR_GMAIL_TRUE@
-WITH_POP3_OR_IMAP_TRUE = @WITH_POP3_OR_IMAP_TRUE@
-WITH_POP3_TRUE = @WITH_POP3_TRUE@
-WITH_REGRESSION_TESTS_FALSE = @WITH_REGRESSION_TESTS_FALSE@
-WITH_REGRESSION_TESTS_TRUE = @WITH_REGRESSION_TESTS_TRUE@
-WITH_SASL_FALSE = @WITH_SASL_FALSE@
-WITH_SASL_TRUE = @WITH_SASL_TRUE@
-WITH_SSL_FALSE = @WITH_SSL_FALSE@
-WITH_SSL_TRUE = @WITH_SSL_TRUE@
-WITH_SYLPHEED_FALSE = @WITH_SYLPHEED_FALSE@
-WITH_SYLPHEED_TRUE = @WITH_SYLPHEED_TRUE@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -244,35 +201,45 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
evolution_plugindir = @evolution_plugindir@
exec_prefix = @exec_prefix@
-gnome_cappletdir = @gnome_cappletdir@
gnome_prefix = @gnome_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = C
all: all-recursive
@@ -313,10 +280,6 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
@@ -348,8 +311,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -450,22 +412,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; 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"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -479,7 +440,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -487,6 +448,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -526,8 +489,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
- distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
@@ -541,12 +503,20 @@ info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -565,22 +535,24 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ ctags ctags-recursive distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
html-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 \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-libtool \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-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/install-sh b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-05-14.22
+scriptversion=2006-10-14.15
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,15 +39,24 @@ scriptversion=2005-05-14.22
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
@@ -58,7 +67,13 @@ stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-chmodcmd="$chmodprog 0755"
+posix_glob=
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chmodcmd=$chmodprog
chowncmd=
chgrpcmd=
stripcmd=
@@ -95,7 +110,7 @@ Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
-while test -n "$1"; do
+while test $# -ne 0; do
case $1 in
-c) shift
continue;;
@@ -111,9 +126,15 @@ while test -n "$1"; do
--help) echo "$usage"; exit $?;;
- -m) chmodcmd="$chmodprog $2"
+ -m) mode=$2
shift
shift
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
continue;;
-o) chowncmd="$chownprog $2"
@@ -136,25 +157,33 @@ while test -n "$1"; do
--version) echo "$0 $scriptversion"; exit $?;;
- *) # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- test -n "$dir_arg$dstarg" && break
- # Otherwise, the last argument is the destination. Remove it from $@.
- for arg
- do
- if test -n "$dstarg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
- shift # fnord
- fi
- shift # arg
- dstarg=$arg
- done
+ --) shift
break;;
+
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
+
+ *) break;;
esac
done
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dstarg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dstarg"
+ shift # fnord
+ fi
+ shift # arg
+ dstarg=$arg
+ done
+fi
+
+if test $# -eq 0; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
@@ -164,6 +193,33 @@ if test -z "$1"; then
exit 0
fi
+if test -z "$dir_arg"; then
+ trap '(exit $?); exit' 1 2 13 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
+
for src
do
# Protect names starting with `-'.
@@ -173,15 +229,11 @@ do
if test -n "$dir_arg"; then
dst=$src
- src=
-
- if test -d "$dst"; then
- mkdircmd=:
- chmodcmd=
- else
- mkdircmd=$mkdirprog
- fi
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
else
+
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
@@ -208,53 +260,188 @@ do
echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
- dst=$dst/`basename "$src"`
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+ dstdir_status=$?
fi
fi
- # This sed command emulates the dirname command.
- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
- # Make sure that the destination directory exists.
-
- # Skip lots of stat calls in the usual case.
- if test ! -d "$dstdir"; then
- defaultIFS='
- '
- IFS="${IFS-$defaultIFS}"
-
- oIFS=$IFS
- # Some sh's can't handle IFS=/ for some reason.
- IFS='%'
- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
- shift
- IFS=$oIFS
+ obsolete_mkdir_used=false
+
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
+
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
- pathcomp=
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
- while test $# -ne 0 ; do
- pathcomp=$pathcomp$1
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+ /*) prefix=/ ;;
+ -*) prefix=./ ;;
+ *) prefix= ;;
+ esac
+
+ case $posix_glob in
+ '')
+ if (set -f) 2>/dev/null; then
+ posix_glob=true
+ else
+ posix_glob=false
+ fi ;;
+ esac
+
+ oIFS=$IFS
+ IFS=/
+ $posix_glob && set -f
+ set fnord $dstdir
shift
- if test ! -d "$pathcomp"; then
- $mkdirprog "$pathcomp"
- # mkdir can fail with a `File exist' error in case several
- # install-sh are creating the directory concurrently. This
- # is OK.
- test -d "$pathcomp" || exit
+ $posix_glob && set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
fi
- pathcomp=$pathcomp/
- done
+ fi
fi
if test -n "$dir_arg"; then
- $doit $mkdircmd "$dst" \
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
else
- dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
@@ -262,10 +449,9 @@ do
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
- trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
- $doit $cpprog "$src" "$dsttmp" &&
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -276,10 +462,10 @@ do
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
# Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
|| {
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
@@ -291,11 +477,12 @@ do
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
- if test -f "$dstdir/$dstfile"; then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+ if test -f "$dst"; then
+ $doit $rmcmd -f "$dst" 2>/dev/null \
+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
|| {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
else
@@ -304,16 +491,13 @@ do
} &&
# Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ $doit $mvcmd "$dsttmp" "$dst"
}
- }
- fi || { (exit 1); exit 1; }
-done
+ } || exit 1
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
- (exit 0); exit 0
-}
+ trap '' 0
+ fi
+done
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/intltool-extract.in b/intltool-extract.in
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.0";
+my $VERSION = "0.35.5";
## Loaded modules
use strict;
@@ -114,6 +114,11 @@ sub split_on_argument {
sub place_normal {
$FILE = $ARGV[0];
$OUTFILE = "$FILE.h";
+
+ my $dirname = dirname ($OUTFILE);
+ if (! -d "$dirname" && $dirname ne "") {
+ system ("mkdir -p $dirname");
+ }
}
sub place_local {
@@ -156,7 +161,7 @@ XML files. Read manpage (man ${PROGRAM}) for more info.
--type=TYPE Specify the file type of FILENAME. Currently supports:
"gettext/glade", "gettext/ini", "gettext/keys"
"gettext/rfc822deb", "gettext/schemas",
- "gettext/scheme", "gettext/xml"
+ "gettext/scheme", "gettext/xml", "gettext/quoted"
-l, --local Writes output into current working directory
(conflicts with --update)
--update Writes output into the same directory the source file
@@ -212,6 +217,7 @@ sub convert {
&type_scheme if $gettext_type eq "scheme";
&type_schemas if $gettext_type eq "schemas";
&type_rfc822deb if $gettext_type eq "rfc822deb";
+ &type_quoted if $gettext_type eq "quoted";
}
sub entity_decode_minimal
@@ -242,7 +248,7 @@ sub escape_char
{
return '\"' if $_ eq '"';
return '\n' if $_ eq "\n";
- return '\\' if $_ eq '\\';
+ return '\\\\' if $_ eq '\\';
return $_;
}
@@ -255,8 +261,11 @@ sub escape
sub type_ini {
### For generic translatable desktop files ###
- while ($input =~ /^_.*=(.*)$/mg) {
- $messages{$1} = [];
+ while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
+ if (defined($2)) {
+ $comments{$3} = $2;
+ }
+ $messages{$3} = [];
}
}
@@ -711,6 +720,17 @@ sub rfc822deb_split {
return @list;
}
+sub type_quoted {
+ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
+ my $message = $1;
+ my $before = $`;
+ $message =~ s/\\\"/\"/g;
+ $before =~ s/[^\n]//g;
+ $messages{$message} = [];
+ $loc{$message} = length ($before) + 2;
+ }
+}
+
sub type_glade {
### For translatable Glade XML files ###
diff --git a/intltool-merge.in b/intltool-merge.in
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.0";
+my $VERSION = "0.35.5";
## Loaded modules
use strict;
@@ -60,6 +60,7 @@ my $KEYS_STYLE_ARG = 0;
my $DESKTOP_STYLE_ARG = 0;
my $SCHEMAS_STYLE_ARG = 0;
my $RFC822DEB_STYLE_ARG = 0;
+my $QUOTED_STYLE_ARG = 0;
my $QUIET_ARG = 0;
my $PASS_THROUGH_ARG = 0;
my $UTF8_ARG = 0;
@@ -79,6 +80,7 @@ GetOptions
"desktop-style|d" => \$DESKTOP_STYLE_ARG,
"schemas-style|s" => \$SCHEMAS_STYLE_ARG,
"rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
+ "quoted-style" => \$QUOTED_STYLE_ARG,
"pass-through|p" => \$PASS_THROUGH_ARG,
"utf8|u" => \$UTF8_ARG,
"multiple-output|m" => \$MULTIPLE_OUTPUT,
@@ -157,6 +159,14 @@ elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2)
&rfc822deb_merge_translations;
&finalize;
}
+elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
+{
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+ "ed_merge_translations;
+ &finalize;
+}
else
{
&print_help;
@@ -193,6 +203,7 @@ Mandatory options: (exactly one must be specified)
-k, --keys-style includes translations in the keys style
-s, --schemas-style includes translations in the schemas style
-r, --rfc822deb-style includes translations in the RFC822 style
+ --quoted-style includes translations in the quoted string style
-x, --xml-style includes translations in the standard xml style
Other options:
@@ -415,7 +426,7 @@ sub create_translation_database
{
$nextfuzzy = 1 if /^#, fuzzy/;
- if (/^msgid "((\\.|[^\\])*)"/ )
+ if (/^msgid "((\\.|[^\\]+)*)"/ )
{
$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
$msgid = "";
@@ -431,14 +442,14 @@ sub create_translation_database
$nextfuzzy = 0;
}
- if (/^msgstr "((\\.|[^\\])*)"/)
+ if (/^msgstr "((\\.|[^\\]+)*)"/)
{
$msgstr = unescape_po_string($1);
$inmsgstr = 1;
$inmsgid = 0;
}
- if (/^"((\\.|[^\\])*)"/)
+ if (/^"((\\.|[^\\]+)*)"/)
{
$msgid .= unescape_po_string($1) if $inmsgid;
$msgstr .= unescape_po_string($1) if $inmsgstr;
@@ -1006,8 +1017,8 @@ sub xml_merge_output
if ($MULTIPLE_OUTPUT) {
for my $lang (sort keys %po_files_by_lang) {
- if ( ! -e $lang ) {
- mkdir $lang, 0777 or die "Cannot create subdirectory $lang: $!\n";
+ if ( ! -d $lang ) {
+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
}
open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
binmode (OUTPUT) if $^O eq 'MSWin32';
@@ -1354,3 +1365,39 @@ sub rfc822deb_split
return @list;
}
+sub quoted_translation
+{
+ my ($lang, $string) = @_;
+
+ $string =~ s/\\\"/\"/g;
+
+ my $translation = $translations{$lang, $string};
+ $translation = $string if !$translation;
+
+ $translation =~ s/\"/\\\"/g;
+ return $translation
+}
+
+sub quoted_merge_translations
+{
+ if (!$MULTIPLE_OUTPUT) {
+ print "Quoted only supports Multiple Output.\n";
+ exit(1);
+ }
+
+ for my $lang (sort keys %po_files_by_lang) {
+ if ( ! -d $lang ) {
+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+ }
+ open INPUT, "<${FILE}" or die;
+ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ while (<INPUT>)
+ {
+ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
+ print OUTPUT;
+ }
+ close OUTPUT;
+ close INPUT;
+ }
+}
diff --git a/intltool-update.in b/intltool-update.in
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.0";
+my $VERSION = "0.35.5";
my $PACKAGE = "intltool";
## Loaded modules
@@ -90,10 +90,9 @@ my $buildin_gettext_support =
$| = 1;
## Sometimes the source tree will be rooted somewhere else.
-my $SRCDIR = ".";
+my $SRCDIR = $ENV{"srcdir"} || ".";
my $POTFILES_in;
-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
$POTFILES_in = "<$SRCDIR/POTFILES.in";
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
@@ -124,8 +123,10 @@ my $arg_count = ($DIST_ARG > 0)
&Console_Write_IntltoolHelp if $arg_count > 1;
+my $PKGNAME = FindPackageName ();
+
# --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
+my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
if ($POT_ARG)
{
@@ -316,7 +317,8 @@ sub FindLeftoutFiles
@buf_potfiles_ignore,
@buf_allfiles,
@buf_allfiles_sorted,
- @buf_potfiles_sorted
+ @buf_potfiles_sorted,
+ @buf_potfiles_ignore_sorted
);
## Search and find all translatable files
@@ -342,7 +344,7 @@ sub FindLeftoutFiles
## comparing with POTFILES.in
foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
{
- (-s $ignore) or next;
+ (-s "$SRCDIR/$ignore") or next;
if ("$ignore" eq "POTFILES.ignore")
{
@@ -351,7 +353,7 @@ sub FindLeftoutFiles
}
print "Found $ignore: Ignoring files...\n" if $VERBOSE;
- open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
+ open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
while (<FILE>)
{
@@ -359,7 +361,7 @@ sub FindLeftoutFiles
}
close FILE;
- @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
+ @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
}
foreach my $file (@buf_i18n_plain)
@@ -417,7 +419,7 @@ sub FindLeftoutFiles
}
}
- if (/\.GetString ?\(QUOTEDTEXT/)
+ if (/\w\.GetString *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -426,7 +428,8 @@ sub FindLeftoutFiles
last;
}
- if (/_\(QUOTEDTEXT/)
+ ## N_ Q_ and _ are the three macros defined in gi8n.h
+ if (/[NQ]?_ *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -489,6 +492,11 @@ sub FindLeftoutFiles
$in2{$_} = 1;
}
+ foreach (@buf_potfiles_ignore_sorted)
+ {
+ $in2{$_} = 1;
+ }
+
my @result;
foreach (@buf_allfiles_sorted)
@@ -504,7 +512,7 @@ sub FindLeftoutFiles
foreach (@buf_potfiles_sorted)
{
chomp (my $dummy = $_);
- if ("$dummy" ne "" and ! -f "../$dummy")
+ if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
{
push @buf_potfiles_notexist, $_;
}
@@ -537,7 +545,7 @@ sub FindLeftoutFiles
warn "\n" if ($VERBOSE or @result);
warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
warn @buf_potfiles_notexist, "\n";
- warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
+ warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
"containing this list of absent files has been written in the current directory.\n";
}
}
@@ -555,16 +563,21 @@ sub Console_WriteError_InvalidOption
exit 1;
}
-sub GenerateHeaders
+sub isIntltoolExtractInPath
{
- my $EXTRACT = "@INTLTOOL_EXTRACT@";
- chomp $EXTRACT;
+ my ($file) = @_;
+ # If either a file exists, or when run it returns 0 exit status
+ return 1 if ((-x $file) or (system("$file >/dev/null") == 0));
+ return 0;
+}
- $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
+sub GenerateHeaders
+{
+ my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
## Generate the .h header files, so we can allow glade and
## xml translation support
- if (! -x "$EXTRACT")
+ if (! isIntltoolExtractInPath("$EXTRACT"))
{
print STDERR "\n *** The intltool-extract script wasn't found!"
."\n *** Without it, intltool-update can not generate files.\n";
@@ -671,12 +684,8 @@ sub GeneratePOTemplate
}
else
{
- if ($SRCDIR eq ".") {
- print OUTFILE "../$_\n";
- } else {
- print OUTFILE "$SRCDIR/../$_\n";
- }
- $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+ print OUTFILE "$SRCDIR/../$_\n";
+ $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
}
next if (! $gettext_support_nonascii);
diff --git a/ltmain.sh b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-4"
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
# See if we are running on zsh, and set the options which allow our
@@ -226,20 +226,6 @@ func_win32_libid ()
# arg is usually of the form 'gcc ...'
func_infer_tag ()
{
- # FreeBSD-specific: where we install compilers with non-standard names
- tag_compilers_CC="*cc cc* *gcc gcc*"
- tag_compilers_CXX="*c++ c++* *g++ g++*"
- base_compiler=`set -- "$@"; echo $1`
-
- # If $tagname isn't set, then try to infer if the default "CC" tag applies
- if test -z "$tagname"; then
- for zp in $tag_compilers_CC; do
- case $base_compiler in
- $zp) tagname="CC"; break;;
- esac
- done
- fi
-
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -280,22 +266,7 @@ func_infer_tag ()
break
;;
esac
-
- # FreeBSD-specific: try compilers based on inferred tag
- if test -z "$tagname"; then
- eval "tag_compilers=\$tag_compilers_${z}"
- if test -n "$tag_compilers"; then
- for zp in $tag_compilers; do
- case $base_compiler in
- $zp) tagname=$z; break;;
- esac
- done
- if test -n "$tagname"; then
- break
- fi
- fi
- fi
- fi
+ fi
done
# If $tagname still isn't set, then no tagged configuration
# was found and let the user know that the "--tag" command
@@ -1633,7 +1604,6 @@ EOF
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
- deplibs="$deplibs $arg"
continue
;;
@@ -2112,7 +2082,10 @@ EOF
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test "$pass" = dlopen; then
@@ -2131,29 +2104,6 @@ EOF
else
compiler_flags="$compiler_flags $deplib"
fi
-
- case $linkmode in
- lib)
- deplibs="$deplib $deplibs"
- test "$pass" = conv && continue
- newdependency_libs="$deplib $newdependency_libs"
- ;;
- prog)
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- continue
- fi
- if test "$pass" = scan; then
- deplibs="$deplib $deplibs"
- else
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- fi
- ;;
- *)
- ;;
- esac # linkmode
-
continue
;;
-l*)
@@ -3254,6 +3204,11 @@ EOF
age="$number_minor"
revision="$number_minor"
;;
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
+ ;;
esac
;;
no)
@@ -4758,9 +4713,6 @@ static const void *lt_preloaded_setup() {
;;
esac
;;
- *-*-freebsd*)
- # FreeBSD doesn't need this...
- ;;
*)
$echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
exit $EXIT_FAILURE
diff --git a/m4/Makefile.in b/m4/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -13,15 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -41,7 +37,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/evolution-plugin.m4 \
$(top_srcdir)/m4/gnome.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/openssl.m4 \
$(top_srcdir)/m4/reentrant-resolver.m4 \
$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
@@ -55,8 +51,6 @@ DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
AMTAR = @AMTAR@
AR = @AR@
@@ -92,8 +86,6 @@ EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -104,8 +96,10 @@ GMSGFMT = @GMSGFMT@
GNOME_CFLAGS = @GNOME_CFLAGS@
GNOME_LIBS = @GNOME_LIBS@
GOB2 = @GOB2@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -145,11 +139,11 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
OPENSSL_LIBS = @OPENSSL_LIBS@
@@ -175,55 +169,15 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
-WITH_EVOLUTION_FALSE = @WITH_EVOLUTION_FALSE@
-WITH_EVOLUTION_TRUE = @WITH_EVOLUTION_TRUE@
-WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
-WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
-WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
-WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
-WITH_MAILDIR_FALSE = @WITH_MAILDIR_FALSE@
-WITH_MAILDIR_TRUE = @WITH_MAILDIR_TRUE@
-WITH_MBOX_FALSE = @WITH_MBOX_FALSE@
-WITH_MBOX_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
-WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_TRUE@
-WITH_MBOX_TRUE = @WITH_MBOX_TRUE@
-WITH_MH_FALSE = @WITH_MH_FALSE@
-WITH_MH_TRUE = @WITH_MH_TRUE@
-WITH_MIME_FALSE = @WITH_MIME_FALSE@
-WITH_MIME_TRUE = @WITH_MIME_TRUE@
-WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
-WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@
-WITH_POP3_FALSE = @WITH_POP3_FALSE@
-WITH_POP3_OR_IMAP_FALSE = @WITH_POP3_OR_IMAP_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_FALSE = @WITH_POP3_OR_IMAP_OR_GMAIL_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_TRUE = @WITH_POP3_OR_IMAP_OR_GMAIL_TRUE@
-WITH_POP3_OR_IMAP_TRUE = @WITH_POP3_OR_IMAP_TRUE@
-WITH_POP3_TRUE = @WITH_POP3_TRUE@
-WITH_REGRESSION_TESTS_FALSE = @WITH_REGRESSION_TESTS_FALSE@
-WITH_REGRESSION_TESTS_TRUE = @WITH_REGRESSION_TESTS_TRUE@
-WITH_SASL_FALSE = @WITH_SASL_FALSE@
-WITH_SASL_TRUE = @WITH_SASL_TRUE@
-WITH_SSL_FALSE = @WITH_SSL_FALSE@
-WITH_SSL_TRUE = @WITH_SSL_TRUE@
-WITH_SYLPHEED_FALSE = @WITH_SYLPHEED_FALSE@
-WITH_SYLPHEED_TRUE = @WITH_SYLPHEED_TRUE@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -235,35 +189,45 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
evolution_plugindir = @evolution_plugindir@
exec_prefix = @exec_prefix@
-gnome_cappletdir = @gnome_cappletdir@
gnome_prefix = @gnome_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
evolution-plugin.m4 \
gnome.m4 \
@@ -310,10 +274,6 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
tags: TAGS
TAGS:
@@ -322,22 +282,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; 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"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -382,7 +341,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -396,12 +355,20 @@ info-am:
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -420,17 +387,20 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-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 \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-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/m4/gnome.m4 b/m4/gnome.m4
@@ -1,6 +1,6 @@
# This file is part of Mail Notification.
#
-# Copyright (C) 2005 Jean-Yves Lefort.
+# Copyright (C) 2005-2007 Jean-Yves Lefort.
#
# As a special exception to the Mail Notification licensing terms,
# Jean-Yves Lefort gives unlimited permission to copy, distribute and
@@ -27,22 +27,3 @@ else
fi
AC_SUBST(gnome_prefix)])
-
-dnl AM_PATH_GNOME_CAPPLETDIR
-dnl
-AC_DEFUN([AM_PATH_GNOME_CAPPLETDIR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-
-AC_MSG_CHECKING([for the GNOME capplet directory])
-
-# GNOME < 2.10
-gnome_cappletdir='${datadir}/control-center-2.0/capplets'
-
-if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists 'libgnome-2.0 >= 2.10.0' >/dev/null 2>&1; then
- # GNOME >= 2.10
- gnome_cappletdir='${datadir}/applications'
-fi
-
-AC_MSG_RESULT([$gnome_cappletdir])
-
-AC_SUBST(gnome_cappletdir)])
diff --git a/m4/intltool.m4 b/m4/intltool.m4
@@ -1,204 +0,0 @@
-## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
-## Copyright (C) 2001 Eazel, Inc.
-## Author: Maciej Stachowiak <mjs@noisehavoc.org>
-## Kenneth Christiansen <kenneth@gnu.org>
-##
-## 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., 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.
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 35 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL],
-[AC_PREREQ([2.50])dnl
-
-case "$am__api_version" in
- 1.[01234])
- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
- ;;
- *)
- ;;
-esac
-
-if test -n "$1"; then
- AC_MSG_CHECKING(for intltool >= $1)
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
- ]
- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
-fi
-
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-AC_SUBST(INTLTOOL_DESKTOP_RULE)
-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-AC_SUBST(INTLTOOL_KEYS_RULE)
-AC_SUBST(INTLTOOL_PROP_RULE)
-AC_SUBST(INTLTOOL_OAF_RULE)
-AC_SUBST(INTLTOOL_PONG_RULE)
-AC_SUBST(INTLTOOL_SERVER_RULE)
-AC_SUBST(INTLTOOL_SHEET_RULE)
-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
-AC_SUBST(INTLTOOL_UI_RULE)
-AC_SUBST(INTLTOOL_XAM_RULE)
-AC_SUBST(INTLTOOL_KBD_RULE)
-AC_SUBST(INTLTOOL_XML_RULE)
-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-AC_SUBST(INTLTOOL_CAVES_RULE)
-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-AC_SUBST(INTLTOOL_THEME_RULE)
-AC_SUBST(INTLTOOL_SERVICE_RULE)
-
-# Use the tools built into the package, not the ones that are installed.
-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
- AC_MSG_ERROR([perl not found; required for intltool])
-fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
- AC_MSG_ERROR([perl 5.x required for intltool])
-fi
-if test "x$2" != "xno-xml"; then
- AC_MSG_CHECKING([for XML::Parser])
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- AC_MSG_RESULT([ok])
- else
- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
- fi
-fi
-
-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-IT_PO_SUBDIR([po])
-
-dnl The following is very similar to
-dnl
-dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
-dnl
-dnl with the following slight differences:
-dnl - the *.in files are in ac_aux_dir,
-dnl - if the file haven't changed upon reconfigure, it's not touched,
-dnl - the evaluation of the third parameter enables a hack which computes
-dnl the actual value of $libdir,
-dnl - the user sees "executing intltool commands", instead of
-dnl "creating intltool-extract" and such.
-dnl
-dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
-dnl a reason for it.
-
-AC_CONFIG_COMMANDS([intltool], [
-
-for file in intltool-extract intltool-merge intltool-update; do
- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
- < ${ac_aux_dir}/${file}.in > ${file}.out
- if cmp -s ${file} ${file}.out 2>/dev/null; then
- rm -f ${file}.out
- else
- mv -f ${file}.out ${file}
- fi
- chmod ugo+x ${file}
- chmod u+w ${file}
-done
-
-],
-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be exetuted at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
- AC_CONFIG_COMMANDS([$1/stamp-it], [
- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
- >"$1/stamp-it.tmp"
- [sed '/^#/d
- s/^[[].*] *//
- /^[ ]*$/d
- '"s|^| $ac_top_srcdir/|" \
- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
- ]
- if test ! -f "$1/Makefile"; then
- AC_MSG_ERROR([$1/Makefile is not ready.])
- fi
- mv "$1/Makefile" "$1/Makefile.tmp"
- [sed '/^POTFILES =/,/[^\\]$/ {
- /^POTFILES =/!d
- r $1/POTFILES
- }
- ' "$1/Makefile.tmp" >"$1/Makefile"]
- rm -f "$1/Makefile.tmp"
- mv "$1/stamp-it.tmp" "$1/stamp-it"
- ])
-])dnl
-])
-
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
diff --git a/m4/openssl.m4 b/m4/openssl.m4
@@ -58,3 +58,39 @@ fi
AC_SUBST(OPENSSL_CFLAGS)
AC_SUBST(OPENSSL_LIBS)])
+
+# can only be called after AM_PATH_OPENSSL succeeded
+dnl AC_OPENSSL_MT([ACTION-IF-YES], [ACTION-IF-NO])
+dnl
+AC_DEFUN([AC_OPENSSL_MT],
+[ac_save_CFLAGS="$CFLAGS"
+ac_save_LIBS="$LIBS"
+CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+LIBS="$LIBS $OPENSSL_LIBS"
+
+AC_MSG_CHECKING([whether OpenSSL supports multi-threading])
+AC_RUN_IFELSE([
+#define OPENSSL_THREAD_DEFINES
+#include <openssl/opensslconf.h>
+
+int main() {
+#ifdef OPENSSL_THREADS
+ exit(0); /* ok */
+#else
+ exit(1); /* no thread support */
+#endif
+}
+], [openssl_mt=yes], [openssl_mt=no], [openssl_mt=yes])
+AC_MSG_RESULT($openssl_mt)
+
+CFLAGS="$ac_save_CFLAGS"
+LIBS="$ac_save_LIBS"
+
+if test $openssl_mt = yes; then
+ ifelse([$1],, :, [$1])
+else
+ ifelse([$2],, :, [$2])
+fi
+
+AC_SUBST(OPENSSL_CFLAGS)
+AC_SUBST(OPENSSL_LIBS)])
diff --git a/missing b/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
@@ -33,6 +33,8 @@ if test $# -eq 0; then
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@ fi
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@ Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
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
@@ -106,7 +109,7 @@ esac
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@ esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@ WARNING: \`$1' is $msg. You should only need it if
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
You can get \`$1' 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'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@ WARNING: \`$1' $msg. You should only need it if
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@ WARNING: \`$1' is $msg. You should only need it if
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@ WARNING: \`$1' is $msg. You should only need it if
\`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
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@ WARNING: \`$1' is $msg. You should only need it if
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@ WARNING: \`$1' is $msg. You should only need it if
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff --git a/mkinstalldirs b/mkinstalldirs
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2005-06-29.22
+scriptversion=2006-05-11.19
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
@@ -11,6 +11,9 @@ scriptversion=2005-06-29.22
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
+nl='
+'
+IFS=" "" $nl"
errstatus=0
dirmode=
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
@@ -25,7 +25,7 @@ SHELL = /bin/sh
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ..
+top_builddir = @top_builddir@
VPATH = @srcdir@
prefix = @prefix@
@@ -56,15 +56,19 @@ ALL_LINGUAS = @ALL_LINGUAS@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
POTFILES = \
-#This Gets Replace for some reason
+# This comment gets stripped out
-CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
.SUFFIXES:
.SUFFIXES: .po .pox .gmo .mo .msg .cat
@@ -98,11 +102,7 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
$(mkdir_p) $(DESTDIR)$(itlocaledir)
- if test -n "$(PO_LINGUAS)"; then \
- linguas="$(PO_LINGUAS)"; \
- else \
- linguas="$(ALL_LINGUAS)"; \
- fi; \
+ linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
@@ -136,17 +136,18 @@ dvi info tags TAGS ID:
installcheck:
uninstall:
- if test -n "$(PO_LINGUAS)"; then \
- linguas="$(PO_LINGUAS)"; \
- else \
- linguas="$(ALL_LINGUAS)"; \
- fi; \
+ linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
check: all $(GETTEXT_PACKAGE).pot
+ rm -f missing notexist
+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+ if [ -r missing -o -r notexist ]; then \
+ exit 1; \
+ fi
mostlyclean:
rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
@@ -179,11 +180,7 @@ dist distdir: $(DISTFILES)
update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
- if test -n "$(PO_LINGUAS)"; then \
- linguas="$(PO_LINGUAS)"; \
- else \
- linguas="$(ALL_LINGUAS)"; \
- fi; \
+ linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
echo "$$lang:"; \
result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
@@ -211,8 +208,8 @@ Makefile POTFILES: stamp-it
$(MAKE) stamp-it; \
fi
-stamp-it: Makefile.in.in ../config.status POTFILES.in
- cd .. \
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
$(SHELL) ./config.status
diff --git a/po/cs.po b/po/cs.po
@@ -8,10 +8,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 4.0\n"
+"Project-Id-Version: mail-notification 4.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-28 10:45+0100\n"
-"PO-Revision-Date: 2007-01-17 16:00+0100\n"
+"POT-Creation-Date: 2007-06-19 08:41+0200\n"
+"PO-Revision-Date: 2007-06-26 12:06+0200\n"
"Last-Translator: Pav Lucistnik <pav@FreeBSD.org>\n"
"Language-Team: Pav Lucistnik <pav@FreeBSD.org>\n"
"MIME-Version: 1.0\n"
@@ -49,8 +49,8 @@ msgstr "Nastavit upozornění na poštu"
#: ../data/mail-notification-properties.desktop.in.h:2
#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:234
-#: ../src/mn-main.c:142 ../src/mn-main.c:348 ../src/mn-main.c:364
-#: ../src/mn-main.c:440
+#: ../src/mn-main.c:143 ../src/mn-main.c:350 ../src/mn-main.c:371
+#: ../src/mn-main.c:445
msgid "Mail Notification"
msgstr "Upozornění na poštu"
@@ -115,34 +115,38 @@ msgid "Mail read command"
msgstr "Příkaz po přečtění pošty"
#: ../data/mail-notification.schemas.in.in.h:13
+msgid "Message popups actions"
+msgstr "Akce plovoucích oken zpráv"
+
+#: ../data/mail-notification.schemas.in.in.h:14
msgid "Message popups position"
msgstr "Pozice plovoucích oken zpráv"
-#: ../data/mail-notification.schemas.in.in.h:14
+#: ../data/mail-notification.schemas.in.in.h:15
msgid "Minutes to wait before expiring message popups"
msgstr "Minuty před zavřením plovoucích oken zpráv"
-#: ../data/mail-notification.schemas.in.in.h:15
+#: ../data/mail-notification.schemas.in.in.h:16
msgid "New mail command"
msgstr "Příkaz při nové poště"
-#: ../data/mail-notification.schemas.in.in.h:16
+#: ../data/mail-notification.schemas.in.in.h:17
msgid "Run a command when all mail is read"
msgstr "Spustit příkaz při přečtení veškeré pošty"
-#: ../data/mail-notification.schemas.in.in.h:17
+#: ../data/mail-notification.schemas.in.in.h:18
msgid "Run a command when new mail arrives"
msgstr "Spustit příkaz při příchodu nové pošty"
-#: ../data/mail-notification.schemas.in.in.h:18
+#: ../data/mail-notification.schemas.in.in.h:19
msgid "Run a command when the message list changes"
msgstr "Spustit příkaz při změně obsahu poštovní schránky"
-#: ../data/mail-notification.schemas.in.in.h:19
+#: ../data/mail-notification.schemas.in.in.h:20
msgid "Seconds to wait before expiring message popups"
msgstr "Sekundy před zavřením plovoucích oken zpráv"
-#: ../data/mail-notification.schemas.in.in.h:20
+#: ../data/mail-notification.schemas.in.in.h:21
msgid ""
"The action to perform when the icon is clicked. Must be \"display-properties-"
"dialog\", \"launch-mail-reader\", \"open-latest-message\" or \"update-mail-"
@@ -152,23 +156,23 @@ msgstr ""
"dialog\", \"launch-mail-reader\", \"open-latest-message\" nebo \"update-mail-"
"status\"."
-#: ../data/mail-notification.schemas.in.in.h:21
+#: ../data/mail-notification.schemas.in.in.h:22
msgid "The command to run when all mail is read."
msgstr "Příkaz spouštěný po přečtení veškeré pošty."
-#: ../data/mail-notification.schemas.in.in.h:22
+#: ../data/mail-notification.schemas.in.in.h:23
msgid "The command to run when new mail arrives."
msgstr "Příkaz spouštěný když dorazí nová pošta."
-#: ../data/mail-notification.schemas.in.in.h:23
+#: ../data/mail-notification.schemas.in.in.h:24
msgid "The command to run when the message list changes."
msgstr "Příkaz spouštěný při změně obsahu poštovní schránky."
-#: ../data/mail-notification.schemas.in.in.h:24
+#: ../data/mail-notification.schemas.in.in.h:25
msgid "The height of the properties dialog in pixels."
msgstr "Výška dialogu nastavení v pixelech."
-#: ../data/mail-notification.schemas.in.in.h:25
+#: ../data/mail-notification.schemas.in.in.h:26
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
@@ -176,17 +180,25 @@ msgstr ""
"Seznam důvěryhodných SSL/TLS serverů (jméno počítače:port), kterým chybí "
"X509 certifikát."
-#: ../data/mail-notification.schemas.in.in.h:26
+#: ../data/mail-notification.schemas.in.in.h:27
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr ""
"Seznam důvěryhodných X509 certifikátů, reprezentovaných jejími MD5 obtisky."
-#: ../data/mail-notification.schemas.in.in.h:27
+#: ../data/mail-notification.schemas.in.in.h:28
+msgid ""
+"The ordered list of actions to include in the message popups. Each element "
+"must be \"open\", \"mark-as-read\", \"mark-as-spam\" or \"delete\"."
+msgstr ""
+"Seznam akcí pro zobrazení v plovoucím okně zprávy. Prvky mohou být \"open\", "
+"\"mark-as-read\", \"mark-as-spam\" a \"delete\"."
+
+#: ../data/mail-notification.schemas.in.in.h:29
msgid "The position of the message popups. Must be \"attached\" or \"free\"."
msgstr "Umístění plovoucích oken zpráv. Musí být \"attached\" nebo \"free\"."
-#: ../data/mail-notification.schemas.in.in.h:28
+#: ../data/mail-notification.schemas.in.in.h:30
msgid ""
"The type of mail summary to display in the icon's tooltip. Must be \"standard"
"\", \"compact\" or \"none\"."
@@ -194,55 +206,55 @@ msgstr ""
"Který druh souhrnu pošty zobrazit v tooltipu ikony. Musí být \"standard"
"\" (standardní)\", \"compact\" (kompaktní) nebo \"none\" (žádný)."
-#: ../data/mail-notification.schemas.in.in.h:29
+#: ../data/mail-notification.schemas.in.in.h:31
msgid "The width of the properties dialog in pixels."
msgstr "Šířka dialogu nastavení v pixelech."
-#: ../data/mail-notification.schemas.in.in.h:30
+#: ../data/mail-notification.schemas.in.in.h:32
msgid "Tooltip mail summary"
msgstr "Souhrn pošty v tooltipu"
-#: ../data/mail-notification.schemas.in.in.h:31
+#: ../data/mail-notification.schemas.in.in.h:33
msgid "Trusted servers list"
msgstr "Seznam důvěryhodných serverů"
-#: ../data/mail-notification.schemas.in.in.h:32
+#: ../data/mail-notification.schemas.in.in.h:34
msgid "Whether the status icon should blink on errors or not."
msgstr "Jestli má stavová ikona blikat při chybě nebo ne."
-#: ../data/mail-notification.schemas.in.in.h:33
+#: ../data/mail-notification.schemas.in.in.h:35
msgid "Whether to display an icon when there is no new mail or not."
msgstr "Jestli zobrazit ikonu, i když není žádná nová pošta, nebo ne."
-#: ../data/mail-notification.schemas.in.in.h:34
+#: ../data/mail-notification.schemas.in.in.h:36
msgid "Whether to display seen mail or not."
msgstr "Jestli zobrazit přečtenou poštu nebo ne."
-#: ../data/mail-notification.schemas.in.in.h:35
+#: ../data/mail-notification.schemas.in.in.h:37
msgid "Whether to enable message popups or not."
msgstr "Jestli automaticky zavírat plovoucí okna zpráv nebo ne."
-#: ../data/mail-notification.schemas.in.in.h:36
+#: ../data/mail-notification.schemas.in.in.h:38
msgid ""
"Whether to expire message popups or not. Must be \"default\", \"false\" or "
"\"true\"."
msgstr ""
-"Jestli automaticky zavírat plovoucí okna zpráv nebo ne. Musí být \"default\", \"false\" nebo "
-"\"true\"."
+"Jestli automaticky zavírat plovoucí okna zpráv nebo ne. Musí být \"default"
+"\", \"false\" nebo \"true\"."
-#: ../data/mail-notification.schemas.in.in.h:37
+#: ../data/mail-notification.schemas.in.in.h:39
msgid "Whether to run a command when all mail is read or not."
msgstr "Jestli spouštět příkaz po přečtení veškeré pošty nebo ne."
-#: ../data/mail-notification.schemas.in.in.h:38
+#: ../data/mail-notification.schemas.in.in.h:40
msgid "Whether to run a command when new mail arrives or not."
msgstr "Jestli spouštět příkaz při doručení nové pošty nebo ne."
-#: ../data/mail-notification.schemas.in.in.h:39
+#: ../data/mail-notification.schemas.in.in.h:41
msgid "Whether to run a command when the message list changes or not."
msgstr "Jestli spouštět příkaz při změně obsahu poštovní schránky nebo ne."
-#: ../data/mail-notification.schemas.in.in.h:40
+#: ../data/mail-notification.schemas.in.in.h:42
msgid "Width of properties dialog"
msgstr "Šířka dialogu nastavení"
@@ -267,7 +279,7 @@ msgstr "Ikona Upozornění na poštu"
msgid "translator-credits"
msgstr "Pav Lučištník <pav@FreeBSD.org>"
-#: ../src/mn-auth-combo-box.gob:104
+#: ../src/mn-auth-combo-box.gob:101
#: ../src/mn-autodetect-mailbox-properties.gob:110
msgid "Autodetect"
msgstr "Autodetekovat"
@@ -315,95 +327,111 @@ msgstr "nemohu zavřít soubor: %s"
msgid "unable to open mailbox: %s"
msgstr "nemohu otevřít soubor: %s"
-#: ../src/mn-client-session.c:248
+#: ../src/mn-client-session.c:257
#, c-format
msgid "resolving %s"
msgstr "hledám %s"
-#: ../src/mn-client-session.c:264
+#: ../src/mn-client-session.c:273
#, c-format
msgid "unable to resolve %s: %s"
msgstr "nemohu nalézt %s: %s"
-#: ../src/mn-client-session.c:305
+#: ../src/mn-client-session.c:314
#, c-format
msgid "network address #%i"
msgstr "síťová adresa #%i"
-#: ../src/mn-client-session.c:308
+#: ../src/mn-client-session.c:317
#, c-format
msgid "unable to convert network address #%i into textual form: %s"
msgstr "nemohu převést síťovou adresu #%i do textové podoby: %s"
-#: ../src/mn-client-session.c:319
+#: ../src/mn-client-session.c:328
#, c-format
msgid "%s: unsupported address family"
msgstr "%s: nepodporovaná adresní rodina"
-#: ../src/mn-client-session.c:326
+#: ../src/mn-client-session.c:335
#, c-format
msgid "%s: unable to create socket: %s"
msgstr "%s: nemohu vytvořit soket: %s"
-#: ../src/mn-client-session.c:330
+#: ../src/mn-client-session.c:339
#, c-format
msgid "connecting to %s (%s) port %i"
msgstr "připojování k %s (%s) port %i"
-#: ../src/mn-client-session.c:333
+#: ../src/mn-client-session.c:342
#, c-format
msgid "unable to connect: %s"
msgstr "nemohu se připojit: %s"
-#: ../src/mn-client-session.c:338
+#: ../src/mn-client-session.c:347
msgid "connected successfully"
msgstr "úspěšně připojen"
#. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:352
+#: ../src/mn-client-session.c:361
#, c-format
msgid "unable to connect to %s"
msgstr "nemohu se připojit k %s"
-#: ../src/mn-client-session.c:379
+#: ../src/mn-client-session.c:388
#, c-format
msgid "unable to initialize the OpenSSL library: %s"
msgstr "nemohu inicializovat knihovnu OpenSSL: %s"
-#: ../src/mn-client-session.c:387
+#: ../src/mn-client-session.c:396
#, c-format
msgid "unable to create a SSL/TLS object: %s"
msgstr "nemohu vytvořit SSL/TLS objekt: %s"
-#: ../src/mn-client-session.c:393
+#: ../src/mn-client-session.c:402
#, c-format
msgid "unable to set the SSL/TLS file descriptor: %s"
msgstr "nemohu nastavit SSL/TLS deskriptor souboru: %s"
-#: ../src/mn-client-session.c:399
+#: ../src/mn-client-session.c:408
#, c-format
msgid "unable to perform the SSL/TLS handshake: %s"
msgstr "nemohu provést SSL/TLS handshake: %s"
-#: ../src/mn-client-session.c:405
+#: ../src/mn-client-session.c:414
msgid "untrusted server"
msgstr "nedůvěryhodný server"
-#: ../src/mn-client-session.c:409
+#: ../src/mn-client-session.c:418
#, c-format
msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
msgstr "SSL/TLS vrstva je nyní aktivní (%s, %s %i bitů)"
-#: ../src/mn-client-session.c:456
+#: ../src/mn-client-session.c:589
+msgid "server name not found in certificate"
+msgstr "certifikát neobsahuje jméno serveru"
+
+#: ../src/mn-client-session.c:594
#, c-format
-msgid "%s, fingerprint: %s"
-msgstr "%s, obtisk: %s"
+msgid ""
+"user-provided server name \"%s\" does not match certificate-provided server "
+"name \"%s\""
+msgstr ""
+"jméno serveru \"%s\" zadané uživatelem neodpovídá jménu serveru \"%s\" z certifikátu"
-#: ../src/mn-client-session.c:485
+#: ../src/mn-client-session.c:612
+#, c-format
+msgid ""
+"user-provided server name \"%s\" matches none of the certificate-provided "
+"server names %s"
+msgstr ""
+"jméno serveru \"%s\" zadané uživatele neodpovídá žádnému ze jmen uvedených "
+"v certifikátu: %s"
+
+#: ../src/mn-client-session.c:688
msgid "missing certificate"
msgstr "chybí certifikát"
-#: ../src/mn-client-session.c:511
+#: ../src/mn-client-session.c:717
#, c-format
msgid ""
"Mail Notification was unable to trust \"%s\" (%s). It is possible that "
@@ -421,120 +449,125 @@ msgstr ""
"připojen k \"%s\". Pokud zvolíte připojení k serveru, tato zpráva již "
"nebude znovu zobrazena."
-#: ../src/mn-client-session.c:526
+#: ../src/mn-client-session.c:731
+#, c-format
+msgid "Certificate fingerprint: %s."
+msgstr "Obtisk certifikátu: %s."
+
+#: ../src/mn-client-session.c:738
msgid "Connect to untrusted server?"
msgstr "Připojit k nedůvěryhodnému serveru?"
-#: ../src/mn-client-session.c:591
+#: ../src/mn-client-session.c:803
#, c-format
msgid "response \"%s\" is not valid in current context"
msgstr "odezva \"%s\" není platná v aktuálním kontextu"
-#: ../src/mn-client-session.c:620
+#: ../src/mn-client-session.c:832
#, c-format
msgid "unable to parse response \"%s\""
msgstr "nemohu zpracovat odezvu \"%s\""
-#: ../src/mn-client-session.c:670 ../src/mn-client-session.c:677
+#: ../src/mn-client-session.c:882 ../src/mn-client-session.c:889
#, c-format
msgid "unable to read from server: %s"
msgstr "nemohu číst ze serveru: %s"
-#: ../src/mn-client-session.c:675
+#: ../src/mn-client-session.c:887
msgid "unable to read from server: EOF"
msgstr "nemohu část ze serveru: EOF"
-#: ../src/mn-client-session.c:687
+#: ../src/mn-client-session.c:899
#, c-format
msgid "unable to decode data using SASL: %s"
msgstr "nemohu dešifrovat data pomoci SASL: %s"
-#: ../src/mn-client-session.c:832
+#: ../src/mn-client-session.c:1044
#, c-format
msgid "unable to encode data using SASL: %s"
msgstr "nemohu zašifrovat data pomoci SASL: %s"
-#: ../src/mn-client-session.c:863 ../src/mn-client-session.c:870
+#: ../src/mn-client-session.c:1075 ../src/mn-client-session.c:1082
#, c-format
msgid "unable to write to server: %s"
msgstr "nemohu zapsat na server: %s"
-#: ../src/mn-client-session.c:868
+#: ../src/mn-client-session.c:1080
msgid "unable to write to server: EOF"
msgstr "nemohu zapsat na server: EOF"
-#: ../src/mn-client-session.c:899 ../src/mn-pop3-mailbox.gob:434
+#: ../src/mn-client-session.c:1111 ../src/mn-pop3-mailbox.gob:434
#, c-format
msgid "unable to encode Base64: %s"
msgstr "nemohu převést do Base64: %s"
-#: ../src/mn-client-session.c:1076
+#: ../src/mn-client-session.c:1288
#, c-format
msgid "unable to initialize the SASL library: %s"
msgstr "nemohu inicializovat knihovnu SASL: %s"
-#: ../src/mn-client-session.c:1088
+#: ../src/mn-client-session.c:1300
#, c-format
msgid "unable to retrieve local address of socket: %s"
msgstr "nemohu získat místní adresu soketu: %s"
-#: ../src/mn-client-session.c:1094
+#: ../src/mn-client-session.c:1306
#, c-format
msgid "unable to retrieve remote address of socket: %s"
msgstr "nemohu získat vzdálenou adresu soketu: %s"
-#: ../src/mn-client-session.c:1128
+#: ../src/mn-client-session.c:1340
#, c-format
msgid "unable to set SASL security properties: %s"
msgstr "nemohu nastavit zabezpečení SASL: %s"
-#: ../src/mn-client-session.c:1152
+#: ../src/mn-client-session.c:1364
msgid ""
"unable to start SASL authentication: SASL asked for something we did not know"
msgstr "nemohu zahájit ověření SASL: SASL se zeptal na něco, co neznáme"
-#: ../src/mn-client-session.c:1171
+#: ../src/mn-client-session.c:1383
#, c-format
msgid "unable to start SASL authentication: %s"
msgstr "nemohu zahájit ověření SASL: %s"
-#: ../src/mn-client-session.c:1175
+#: ../src/mn-client-session.c:1387
#, c-format
msgid "unable to create a SASL connection: %s"
msgstr "nemohu vytvořit SASL spojení: %s"
-#: ../src/mn-client-session.c:1222
+#: ../src/mn-client-session.c:1434
msgid "SASL asked for something we did not know, aborting SASL authentication"
msgstr "SASL se zeptal na něco, co neznáme, přerušuji ověření SASL"
-#: ../src/mn-client-session.c:1239
+#: ../src/mn-client-session.c:1451
#, c-format
msgid "%s, aborting SASL authentication"
msgstr "%s, přerušuji ověření SASL"
#. compliance error
-#: ../src/mn-client-session.c:1244
+#: ../src/mn-client-session.c:1456
#, c-format
msgid "unable to decode Base64 input from server: %s"
msgstr "nemohu zpracovat Base64 údaje od serveru: %s"
-#: ../src/mn-client-session.c:1280
+#: ../src/mn-client-session.c:1492
#, c-format
msgid "a SASL security layer of strength factor %i is now active"
msgstr "bezpečnostní vrstva SASL o bezpečnostním faktoru %i je nyní aktivní"
#. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1285
+#: ../src/mn-client-session.c:1497
#, c-format
msgid "unable to get SASL_MAXOUTBUF property: %s"
msgstr "nelze získat vlastnost SASL_MAXOUTBUF: %s"
-#: ../src/mn-client-session.c:1291
+#: ../src/mn-client-session.c:1503
#, c-format
msgid "warning: unable to get SASL_SSF property: %s"
msgstr "varování: nelze získat vlastnost SASL_SSF: %s"
-#: ../src/mn-client-session.c:1450
+#: ../src/mn-client-session.c:1662
msgid "unknown server error"
msgstr "neznámá chyba serveru"
@@ -554,25 +587,25 @@ msgstr "Předmět"
msgid "Sent"
msgstr "Odesláno"
-#: ../src/mn-conf.c:281
+#: ../src/mn-conf.c:282
msgid "A directory creation error has occurred"
msgstr "Chyba při vytváření adresáře"
-#: ../src/mn-conf.c:282
+#: ../src/mn-conf.c:283
#, c-format
msgid "Unable to create directory \"%s\": %s."
msgstr "Nemohu vytvořit adresář \"%s\": %s."
-#: ../src/mn-conf.c:406
+#: ../src/mn-conf.c:407
#, c-format
msgid "recursively unsetting %s"
msgstr "rekurzivně odnastavuji %s"
-#: ../src/mn-conf.c:410
+#: ../src/mn-conf.c:411
msgid "syncing the GConf database"
msgstr "synchronizuji GConf databázi"
-#: ../src/mn-conf.c:413
+#: ../src/mn-conf.c:414
msgid "completed"
msgstr "dokončeno"
@@ -580,7 +613,7 @@ msgstr "dokončeno"
msgid "invalid location"
msgstr "neplatné umístění"
-#: mn-evolution-folder-tree-control.gob:69
+#: ../src/mn-evolution-folder-tree-control.gob:69
msgid "The currently selected URI"
msgstr "Vybrané URI"
@@ -592,10 +625,11 @@ msgstr "Složka"
#: ../src/mn-evolution-mailbox-properties.gob:204
msgid ""
"Mail Notification can not contact Evolution. Make sure that Evolution is "
-"running and that the Evolution Mail Notification plugin is loaded."
+"running and that the Evolution Jean-Yves Lefort's Mail Notification plugin "
+"is loaded."
msgstr ""
"Nemohu se spojit s Evolution. Ujistěte se, že Evolution běží a že Evolution "
-"Mail Notification plugin je aktivní."
+"Jean-Yves Lefortův Mail Notification plugin je aktivní."
#: ../src/mn-evolution-mailbox.gob:78
msgid "folder not found"
@@ -622,7 +656,7 @@ msgstr ""
"Bonobo nemohlo nalézt server %s. Prosím zkontrolujte instalaci Upozornění na "
"poštu."
-#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:518
+#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:523
#, c-format
msgid ""
"Bonobo was unable to register the %s server. Please check your Mail "
@@ -670,7 +704,7 @@ msgstr "nemohu posouvat v %s: %s"
msgid "unable to tell position of %s: %s"
msgstr "nemohu určit pozici v %s: %s"
-#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:167
+#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:174
#, c-format
msgid "unable to close %s: %s"
msgstr "nemohu zavřít %s: %s"
@@ -706,28 +740,23 @@ msgstr "_Autodetekovat"
msgid "Al_ways"
msgstr "_Vždy"
-#: ../src/mn-imap-mailbox.gob:385
+#: ../src/mn-imap-mailbox.gob:381
msgid "server did not send capabilities"
msgstr "server neposlal capability"
-#: ../src/mn-imap-mailbox.gob:552
+#: ../src/mn-imap-mailbox.gob:548
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr "server ohlásil LOGINDISABLED, nepoužívám LOGIN přihlášení"
-#: ../src/mn-imap-mailbox.gob:553
+#: ../src/mn-imap-mailbox.gob:549
msgid "unable to login"
msgstr "nemohu se přihlásit"
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:753
-msgid "server did not send all the messages we requested"
-msgstr "server neposlal všechny zprávy, které jsme vyžádali"
-
-#: ../src/mn-imap-mailbox.gob:823
+#: ../src/mn-imap-mailbox.gob:822
msgid "unable to fetch message"
msgstr "nemohu stáhnout zprávu"
-#: ../src/mn-imap-mailbox.gob:848
+#: ../src/mn-imap-mailbox.gob:838
msgid ""
"\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
"logging out"
@@ -735,26 +764,26 @@ msgstr ""
"\"Použít rozšíření IDLE\" nastaveno na \"never\" ve vlastnostech schránky, "
"odpojuji se"
-#: ../src/mn-imap-mailbox.gob:859
+#: ../src/mn-imap-mailbox.gob:849
#, c-format
msgid "the remote server runs %s, not using the IDLE extension"
msgstr "vzdálený server běží %s, nepoužívám rozšíření IDLE"
-#: ../src/mn-imap-mailbox.gob:864
+#: ../src/mn-imap-mailbox.gob:854
#, c-format
msgid ""
"the remote server runs %s, the IDLE extension might not function properly"
msgstr "vzdálený server běží %s, rozšíření IDLE nemusí pracovat správně"
-#: ../src/mn-imap-mailbox.gob:873
+#: ../src/mn-imap-mailbox.gob:863
msgid "the remote server does not support the IDLE extension, logging out"
msgstr "vzdálený server nepodporuje rozšíření IDLE, odpojuji se"
-#: ../src/mn-imap-mailbox.gob:1378 ../src/mn-pop3-mailbox.gob:297
+#: ../src/mn-imap-mailbox.gob:1368 ../src/mn-pop3-mailbox.gob:297
msgid "server does not support in-band SSL/TLS"
msgstr "server nepodporuje in-band SSL/TLS"
-#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:954
+#: ../src/mn-imap-mailbox.gob:1392 ../src/mn-pop3-mailbox.gob:956
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
@@ -762,30 +791,24 @@ msgstr ""
"přihlašovací mechanismus SASL byl vybrán, ale podpora SASL nebyla "
"zkompilována "
-#: ../src/mn-imap-mailbox.gob:1412 ../src/mn-pop3-mailbox.gob:974
+#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:976
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "neznámý přihlašovací mechanismus \"%s\""
-#: ../src/mn-imap-mailbox.gob:1444 ../src/mn-pop3-mailbox.gob:1010
+#: ../src/mn-imap-mailbox.gob:1434 ../src/mn-pop3-mailbox.gob:1012
#, c-format
msgid "disabling mechanism \"%s\" and retrying SASL authentication"
msgstr "zakazuji mechanismus \"%s\" a zkouším znovu přihlášení SASL"
-#: ../src/mn-imap-mailbox.gob:1456
+#: ../src/mn-imap-mailbox.gob:1446
msgid "falling back to IMAP LOGIN authentication"
msgstr "zkouším přihlášení IMAP LOGIN"
-#: ../src/mn-imap-mailbox.gob:1468 ../src/mn-pop3-mailbox.gob:1039
+#: ../src/mn-imap-mailbox.gob:1458 ../src/mn-pop3-mailbox.gob:1041
msgid "authentication failed"
msgstr "přihlášení selhalo"
-#. success; caller must switch state itself
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:1529
-msgid "server did not send search results"
-msgstr "server neposlal výsledky hledání"
-
#. translators: header capitalization
#: ../src/mn-mail-icon.gob:93
msgid "_Mail Reader"
@@ -835,16 +858,16 @@ msgstr "%s schránka"
msgid "detecting mailbox type..."
msgstr "detekuji typ schránky..."
-#: ../src/mn-mailbox.gob:504
+#: ../src/mn-mailbox.gob:507
msgid "\"type\" attribute missing"
msgstr "atribut \"type\" chybí"
-#: ../src/mn-mailbox.gob:511
+#: ../src/mn-mailbox.gob:514
#, c-format
msgid "unknown mailbox type \"%s\""
msgstr "neznámý typ schránky \"%s\""
-#: ../src/mn-mailbox.gob:907
+#: ../src/mn-mailbox.gob:910
#, c-format
msgid "property \"%s\" has no value"
msgstr "vlastnost \"%s\" nemá žádnou hodnotu"
@@ -955,70 +978,70 @@ msgstr "nemohu zavřít složku \"%s\": %s"
msgid "error while reading folder \"%s\": %s"
msgstr "chyba během čtení složky \"%s\": %s"
-#: ../src/mn-main.c:109
+#: ../src/mn-main.c:110
msgid "yes"
msgstr "ano"
-#: ../src/mn-main.c:109
+#: ../src/mn-main.c:110
msgid "no"
msgstr "ne"
-#: ../src/mn-main.c:142
+#: ../src/mn-main.c:143
#, c-format
msgid "%s version %s\n"
msgstr "%s verze %s\n"
-#: ../src/mn-main.c:147
+#: ../src/mn-main.c:148
msgid "Mailbox backends:\n"
msgstr "Backendy poštovních schránek:\n"
-#: ../src/mn-main.c:152
+#: ../src/mn-main.c:153
msgid "POP3 and IMAP features:\n"
msgstr "Funkce POP3 a IMAP:\n"
-#: ../src/mn-main.c:157
+#: ../src/mn-main.c:158
msgid "Sylpheed features:\n"
msgstr "Funkce Sylpheed:\n"
-#: ../src/mn-main.c:205
+#: ../src/mn-main.c:206
#, c-format
msgid "A Bonobo exception (%s) has occurred in %s()."
msgstr "Bonobo vyjímka (%s) nastala v %s()."
-#: ../src/mn-main.c:247
+#: ../src/mn-main.c:248
#, c-format
msgid "%s option ignored since Mail Notification is not already running"
msgstr "Volba %s ignorována, protože Upozornění na poštu neběží"
-#: ../src/mn-main.c:267
+#: ../src/mn-main.c:268
msgid "Show version information"
msgstr "Zobrazit informace o verzi"
-#: ../src/mn-main.c:276
+#: ../src/mn-main.c:277
msgid "Enable informational output"
msgstr "Povolit informační výstup"
-#: ../src/mn-main.c:285
+#: ../src/mn-main.c:286
msgid "Display the properties dialog"
msgstr "Zobrazit dialog nastavení"
-#: ../src/mn-main.c:294
+#: ../src/mn-main.c:295
msgid "Display the about dialog"
msgstr "Zobrazit dialog O aplikaci"
-#: ../src/mn-main.c:303
+#: ../src/mn-main.c:304
msgid "Update the mail status"
msgstr "Aktualizovat stav pošty"
-#: ../src/mn-main.c:312
+#: ../src/mn-main.c:313
msgid "Print a XML mail summary"
msgstr "Zobrazit souhrn pošty v XML"
-#: ../src/mn-main.c:321
+#: ../src/mn-main.c:322
msgid "Unset obsolete GConf configuration"
msgstr "Odnastavit zastaralé nastavení GConf"
-#: ../src/mn-main.c:330
+#: ../src/mn-main.c:331
msgid "Quit Mail Notification"
msgstr "Ukončit Upozornění na poštu"
@@ -1026,11 +1049,11 @@ msgstr "Ukončit Upozornění na poštu"
#. * We cannot use mn_fatal_error_dialog() because gtk_init() has
#. * not been called yet.
#.
-#: ../src/mn-main.c:356
+#: ../src/mn-main.c:358
msgid "multi-threading is not available"
msgstr "vlákna nejsou k dispozici"
-#: ../src/mn-main.c:407
+#: ../src/mn-main.c:412
msgid ""
"Bonobo could not locate the automation object. Please check your Mail "
"Notification installation."
@@ -1038,23 +1061,23 @@ msgstr ""
"Bonobo nemůže nalézt automation objekt. Prosím zkontrolujte instalaci "
"Upozornění na poštu."
-#: ../src/mn-main.c:413
+#: ../src/mn-main.c:418
msgid "quitting Mail Notification"
msgstr "ukončuji Upozornění na poštu"
-#: ../src/mn-main.c:417
+#: ../src/mn-main.c:422
msgid "Mail Notification is not running"
msgstr "Upozornění na poštu neběží"
-#: ../src/mn-main.c:432
+#: ../src/mn-main.c:437
msgid "Unable to initialize the GnomeVFS library."
msgstr "Nemohu inicializovat knihovnu GnomeVFS."
-#: ../src/mn-main.c:442
+#: ../src/mn-main.c:447
msgid "An initialization error has occurred in Mail Notification"
msgstr "V Upozornění na poštu nastala chyba při spouštění"
-#: ../src/mn-main.c:443
+#: ../src/mn-main.c:448
msgid ""
"Unable to initialize the notification library. Message popups will not be "
"displayed."
@@ -1062,15 +1085,15 @@ msgstr ""
"Nepodařilo se spustit upozorňovací knihovnu. Plovoucí okna zpráv nebudou "
"zobrazována."
-#: ../src/mn-main.c:481
+#: ../src/mn-main.c:486
msgid "updating the mail status"
msgstr "aktualizuji stav pošty"
-#: ../src/mn-main.c:497
+#: ../src/mn-main.c:502
msgid "Mail Notification is already running"
msgstr "Upozornění na poštu již běží"
-#: ../src/mn-main.c:514
+#: ../src/mn-main.c:519
#, c-format
msgid ""
"Bonobo could not locate the %s file. Please check your Mail Notification "
@@ -1079,38 +1102,38 @@ msgstr ""
"Bonobo nemohlo najít soubor %s. Prosím zkontrolujte instalaci Upozornění na "
"poštu."
-#: ../src/mn-message-mime.c:168
+#: ../src/mn-message-mime.c:193
msgid "unable to parse MIME message"
msgstr "nemohu zpracovat MIME zprávu"
-#: ../src/mn-message.gob:144
+#: ../src/mn-message.gob:145
msgid "Unknown"
msgstr "Neznámý"
-#: ../src/mn-message.gob:207
+#: ../src/mn-message.gob:208
msgid "unterminated substitution"
msgstr "neukončené nahrazení"
-#: ../src/mn-message.gob:246
+#: ../src/mn-message.gob:247
#, c-format
msgid "unknown substitution \"%s\""
msgstr "neznámé nahrazení \"%s\""
-#: ../src/mn-message.gob:249
+#: ../src/mn-message.gob:250
msgid "empty substitution"
msgstr "prázdné nahrazení"
-#: ../src/mn-message.gob:312 ../src/mn-util.c:1372
+#: ../src/mn-message.gob:313 ../src/mn-util.c:1427
#, c-format
msgid "Unable to execute \"%s\": %s."
msgstr "Nemohu spustit \"%s\": %s."
-#: ../src/mn-mh-mailbox-backend.gob:170
+#: ../src/mn-mh-mailbox-backend.gob:177
#, c-format
msgid "error while reading %s: %s"
msgstr "chyba při čtení %s: %s"
-#: ../src/mn-mh-mailbox-backend.gob:183
+#: ../src/mn-mh-mailbox-backend.gob:190
#, c-format
msgid "unable to open %s: %s"
msgstr "nemohu otevřít %s: %s"
@@ -1153,11 +1176,11 @@ msgstr "_Mechanismus:"
msgid "Connection"
msgstr "Spojení"
-#: ../src/mn-pi-mailbox.gob:153
+#: ../src/mn-pi-mailbox.gob:154
msgid "SSL/TLS support has not been compiled in"
msgstr "Podpora SSL/TLS není zahrnuta v této kompilaci"
-#: ../src/mn-pi-mailbox.gob:319
+#: ../src/mn-pi-mailbox.gob:320
#, c-format
msgid ""
"Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -1170,14 +1193,14 @@ msgstr ""
"\n"
"Prosím zadejte znovu přihlašovací údaje."
-#: ../src/mn-pi-mailbox.gob:320
+#: ../src/mn-pi-mailbox.gob:321
#, c-format
msgid "Enter your credentials for %s mailbox %s."
msgstr "Zadejte přihlašovací údaje pro %s schránku %s."
#. keep the title in sync with gnome-authentication-manager
#. translators: header capitalization
-#: ../src/mn-pi-mailbox.gob:363
+#: ../src/mn-pi-mailbox.gob:364
msgid "Authentication Required"
msgstr "Vyžadována autentizace"
@@ -1211,74 +1234,88 @@ msgstr[0] "respektuji LOGIN-DELAY, čekám %i sekundu"
msgstr[1] "respektuji LOGIN-DELAY, čekám %i sekundy"
msgstr[2] "respektuji LOGIN-DELAY, čekám %i sekund"
-#: ../src/mn-pop3-mailbox.gob:966
+#: ../src/mn-pop3-mailbox.gob:968
msgid "server does not support APOP authentication"
msgstr "server nepodporuje přihlášení APOP"
-#: ../src/mn-pop3-mailbox.gob:1022
+#: ../src/mn-pop3-mailbox.gob:1024
msgid "falling back to APOP authentication"
msgstr "zkouším přihlášení APOP"
-#: ../src/mn-pop3-mailbox.gob:1027
+#: ../src/mn-pop3-mailbox.gob:1029
msgid "falling back to USER/PASS authentication"
msgstr "zkouším přihlášení USER/PASS"
-#: ../src/mn-popup.gob:52 ../src/mn-standard-message-view.gob:63
+#: ../src/mn-popup.gob:60 ../src/mn-standard-message-view.gob:63
msgid "Mailbox:"
msgstr "Schránka:"
-#: ../src/mn-popup.gob:54 ../src/mn-standard-message-view.gob:65
+#: ../src/mn-popup.gob:62 ../src/mn-standard-message-view.gob:65
msgid "Unreadable message:"
msgstr "Nečitelná zpráva:"
-#: ../src/mn-popup.gob:57 ../src/mn-standard-message-view.gob:68
+#: ../src/mn-popup.gob:65 ../src/mn-standard-message-view.gob:68
msgid "From:"
msgstr "Od:"
-#: ../src/mn-popup.gob:58 ../src/mn-standard-message-view.gob:69
+#: ../src/mn-popup.gob:66 ../src/mn-standard-message-view.gob:69
msgid "Subject:"
msgstr "Předmět:"
+#: ../src/mn-popup.gob:128
+#, c-format
+msgid "configuration key %s: there is no action named `%s'"
+msgstr "konfigurační klíč %s: akce `%s' neexistuje"
+
#. translators: header capitalization
-#: ../src/mn-popup.gob:79
+#: ../src/mn-popup.gob:141
msgid "Open"
msgstr "Otevřít"
#. translators: header capitalization
-#: ../src/mn-popup.gob:87
+#: ../src/mn-popup.gob:154
msgid "Mark as Read"
msgstr "Označit jako přečtené"
#. translators: header capitalization
-#: ../src/mn-popup.gob:95
+#: ../src/mn-popup.gob:167
msgid "Mark as Spam"
msgstr "Označit jako nevyžádané"
-#: ../src/mn-popup.gob:117
+#. translators: header capitalization
+#: ../src/mn-popup.gob:180
+msgid "Delete"
+msgstr "Smazat"
+
+#: ../src/mn-popup.gob:196
msgid "Unable to open message"
msgstr "Nemohu opevřít zprávu"
-#: ../src/mn-popup.gob:134
+#: ../src/mn-popup.gob:213
msgid "Unable to mark message as read"
msgstr "Nemohu označit zprávu jako přečtenou"
-#: ../src/mn-popup.gob:151
+#: ../src/mn-popup.gob:230
msgid "Unable to mark message as spam"
msgstr "Nemohu označit zprávu jako nevyžádanou"
-#: ../src/mn-popup.gob:210
+#: ../src/mn-popup.gob:247
+msgid "Unable to delete message"
+msgstr "Nemohu smazat zprávu"
+
+#: ../src/mn-popup.gob:306
#, c-format
msgid "unable to show popup: %s"
msgstr "nemohu zobrazit plovoucí okno: %s"
-#: ../src/mn-popup.gob:227
+#: ../src/mn-popup.gob:323
#, c-format
msgid "unable to close popup: %s"
msgstr "nemohu zavřít plovoucí okno: %s"
#. we set the summary here because libnotify requires it
#. translators: header capitalization
-#: ../src/mn-popup.gob:238
+#: ../src/mn-popup.gob:334
msgid "New Message"
msgstr "Nová zpráva"
@@ -1313,8 +1350,8 @@ msgid ""
"You can configure a mail reader by choosing <b>System → Preferences → "
"Preferred Applications</b>."
msgstr ""
-"Progam pro čtení pošty nastavíte v <b>Systém → Nastavení → "
-"Preferované aplikace</b>."
+"Progam pro čtení pošty nastavíte v <b>Systém → Nastavení → Preferované "
+"aplikace</b>."
#: ../src/mn-shell.gob:236 ../src/mn-shell.gob:242 ../src/mn-shell.gob:534
msgid "Unable to open the latest message"
@@ -1344,7 +1381,7 @@ msgstr "Chyby"
msgid "Mail Summary"
msgstr "Souhrn pošty"
-#: ../src/mn-ssl.c:77
+#: ../src/mn-ssl.c:159
msgid "unknown SSL/TLS error"
msgstr "neznámá SSL/TLS chyba"
@@ -1358,8 +1395,7 @@ msgid "Select _All"
msgstr "Vybrat _vše"
#. translators: header capitalization
-#. translators: header capitalization
-#: ../src/mn-stock.c:33
+#: ../src/mn-stock.c:32
msgid "Co_nnect"
msgstr "_Připojit"
@@ -1433,12 +1469,12 @@ msgstr "Ukázková zpráva #%i"
msgid "Mail Notification Properties Dialog"
msgstr "Dialog nastavení Upozornění na poštu"
-#: ../src/mn-util.c:350
+#: ../src/mn-util.c:351
#, c-format
msgid "error loading image: %s"
msgstr "nemohu načíst obrázek: %s"
-#: ../src/mn-util.c:366
+#: ../src/mn-util.c:367
#, c-format
msgid ""
"Unable to load interface \"%s\". Please check your Mail Notification "
@@ -1447,7 +1483,7 @@ msgstr ""
"Nelze načíst rozhraní \"%s\". Prosím zkontrolujte instalaci Upozornění na "
"poštu."
-#: ../src/mn-util.c:381
+#: ../src/mn-util.c:382
#, c-format
msgid ""
"Widget \"%s\" not found in interface \"%s\". Please check your Mail "
@@ -1456,12 +1492,12 @@ msgstr ""
"Widget \"%s\" nebyl nalezen v rozhraní \"%s\". Prosím zkontrolujte instalaci "
"Upozornění na poštu."
-#: ../src/mn-util.c:450
+#: ../src/mn-util.c:451
#, c-format
msgid "Unable to open self as a module (%s)."
msgstr "Nemohu otevřít sebe jako modul (%s)."
-#: ../src/mn-util.c:455
+#: ../src/mn-util.c:456
#, c-format
msgid ""
"Signal handler \"%s\" not found. Please check your Mail Notification "
@@ -1470,33 +1506,33 @@ msgstr ""
"Singal handler \"%s\" nebyl nalezen. Prosím zkontrolujte instalaci "
"Upozornění na poštu."
-#: ../src/mn-util.c:606 ../src/mn-util.c:629 ../src/mn-util.c:649
-#: ../src/mn-util.c:671
+#: ../src/mn-util.c:607 ../src/mn-util.c:630 ../src/mn-util.c:650
+#: ../src/mn-util.c:672
msgid "A drag and drop error has occurred"
msgstr "Nastala chyba přetažení"
-#: ../src/mn-util.c:607
+#: ../src/mn-util.c:608
msgid "An invalid location list has been received."
msgstr "Obdržen neplatný seznam umístění."
-#: ../src/mn-util.c:650
+#: ../src/mn-util.c:651
msgid "An invalid Mozilla location has been received."
msgstr "Obdrženo neplatné umístění programu Mozilla."
-#: ../src/mn-util.c:726
+#: ../src/mn-util.c:727
msgid "Unable to display help"
msgstr "Nemohu zobrazit nápovědu"
-#: ../src/mn-util.c:738
+#: ../src/mn-util.c:739
msgid "Unable to open link"
msgstr "Nemohu otevřít odkaz"
-#: ../src/mn-util.c:752
+#: ../src/mn-util.c:753
#, c-format
msgid "Unable to create a thread: %s."
msgstr "Nemohu vytvořit vlákno: %s."
-#: ../src/mn-util.c:929
+#: ../src/mn-util.c:930
#, c-format
msgid ""
"The following location is invalid:\n"
@@ -1519,16 +1555,16 @@ msgstr[2] ""
"\n"
"%s"
-#: ../src/mn-util.c:945
+#: ../src/mn-util.c:946
msgid "A fatal error has occurred in Mail Notification"
msgstr "Nastala fatální chyba"
-#: ../src/mn-util.c:989
+#: ../src/mn-util.c:990
#, c-format
msgid "unable to get current time: %s"
msgstr "nemohu získat aktuální čas: %s"
-#: ../src/mn-util.c:1304
+#: ../src/mn-util.c:1359
#, c-format
msgid "%i second ago"
msgid_plural "%i seconds ago"
@@ -1536,7 +1572,7 @@ msgstr[0] "před %i sekundou"
msgstr[1] "před %i sekundami"
msgstr[2] "před %i sekundami"
-#: ../src/mn-util.c:1308
+#: ../src/mn-util.c:1363
#, c-format
msgid "about %i minute ago"
msgid_plural "about %i minutes ago"
@@ -1544,7 +1580,7 @@ msgstr[0] "před %i minutou"
msgstr[1] "před %i minutami"
msgstr[2] "před %i minutami"
-#: ../src/mn-util.c:1313
+#: ../src/mn-util.c:1368
#, c-format
msgid "about %i hour ago"
msgid_plural "about %i hours ago"
@@ -1552,7 +1588,7 @@ msgstr[0] "před %i hodinou"
msgstr[1] "před %i hodinami"
msgstr[2] "před %i hodinami"
-#: ../src/mn-util.c:1318
+#: ../src/mn-util.c:1373
#, c-format
msgid "about %i day ago"
msgid_plural "about %i days ago"
@@ -1560,7 +1596,7 @@ msgstr[0] "před %i dnem"
msgstr[1] "před %i dny"
msgstr[2] "před %i dny"
-#: ../src/mn-util.c:1323
+#: ../src/mn-util.c:1378
#, c-format
msgid "about %i week ago"
msgid_plural "about %i weeks ago"
@@ -1568,24 +1604,24 @@ msgstr[0] "před %i týdnem"
msgstr[1] "před %i týdny"
msgstr[2] "před %i týdny"
-#: ../src/mn-util.c:1336
+#: ../src/mn-util.c:1391
msgid "unknown date"
msgstr "neznámé datum"
-#: ../src/mn-util.c:1371
+#: ../src/mn-util.c:1426
msgid "A command error has occurred in Mail Notification"
msgstr "Nastala chyba při spouštění příkazu"
-#: ../src/mn-vfs-mailbox.gob:228
+#: ../src/mn-vfs-mailbox.gob:249
#, c-format
msgid "unable to monitor %s (%s), poll mode activated"
msgstr "nemohu sledovat %s (%s), poll režim aktivován"
-#: ../src/mn-vfs-mailbox.gob:392
+#: ../src/mn-vfs-mailbox.gob:421
msgid "unknown mailbox format"
msgstr "neznámý formát schránky"
-#: ../src/mn-vfs-mailbox.gob:392
+#: ../src/mn-vfs-mailbox.gob:421
msgid "does not exist"
msgstr "neexistuje"
@@ -1752,6 +1788,12 @@ msgstr "rozložení souhrnu pošty v tooltipu ikony|_Kompaktní"
msgid "icon tooltip's mail summary layout|_Standard"
msgstr "rozložení souhrnu pošty v tooltipu ikony|_Standardní"
+#~ msgid "server did not send all the messages we requested"
+#~ msgstr "server neposlal všechny zprávy, které jsme vyžádali"
+
+#~ msgid "server did not send search results"
+#~ msgstr "server neposlal výsledky hledání"
+
#~ msgid "Automatically close the mail summary popup"
#~ msgstr "Automaticky zavírat vyskakovací souhrn pošty"
diff --git a/po/fr.po b/po/fr.po
@@ -8,10 +8,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 4.0\n"
+"Project-Id-Version: mail-notification 4.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-07 10:59+0100\n"
-"PO-Revision-Date: 2007-01-17 16:02+0100\n"
+"POT-Creation-Date: 2007-06-18 07:44+0200\n"
+"PO-Revision-Date: 2007-06-18 07:47+0200\n"
"Last-Translator: Jean-Yves Lefort <jylefort@brutele.be>\n"
"Language-Team: Jean-Yves Lefort <jylefort@brutele.be>\n"
"MIME-Version: 1.0\n"
@@ -49,8 +49,8 @@ msgstr "Configurer l'avertisseur de courrier"
#: ../data/mail-notification-properties.desktop.in.h:2
#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:234
-#: ../src/mn-main.c:142 ../src/mn-main.c:348 ../src/mn-main.c:364
-#: ../src/mn-main.c:440
+#: ../src/mn-main.c:143 ../src/mn-main.c:350 ../src/mn-main.c:371
+#: ../src/mn-main.c:445
msgid "Mail Notification"
msgstr "Avertisseur de courrier"
@@ -115,34 +115,38 @@ msgid "Mail read command"
msgstr "Commande de courrier lu"
#: ../data/mail-notification.schemas.in.in.h:13
+msgid "Message popups actions"
+msgstr "Actions des popups"
+
+#: ../data/mail-notification.schemas.in.in.h:14
msgid "Message popups position"
msgstr "Position des popups"
-#: ../data/mail-notification.schemas.in.in.h:14
+#: ../data/mail-notification.schemas.in.in.h:15
msgid "Minutes to wait before expiring message popups"
msgstr "Minutes du délai d'expiration des popups"
-#: ../data/mail-notification.schemas.in.in.h:15
+#: ../data/mail-notification.schemas.in.in.h:16
msgid "New mail command"
msgstr "Commande de nouveau message"
-#: ../data/mail-notification.schemas.in.in.h:16
+#: ../data/mail-notification.schemas.in.in.h:17
msgid "Run a command when all mail is read"
msgstr "Exécuter une commande lorsque tout le courrier est lu"
-#: ../data/mail-notification.schemas.in.in.h:17
+#: ../data/mail-notification.schemas.in.in.h:18
msgid "Run a command when new mail arrives"
msgstr "Exécuter une commande lorsque du nouveau courrier arrive"
-#: ../data/mail-notification.schemas.in.in.h:18
+#: ../data/mail-notification.schemas.in.in.h:19
msgid "Run a command when the message list changes"
msgstr "Exécuter une commande lorsque la liste des messages change"
-#: ../data/mail-notification.schemas.in.in.h:19
+#: ../data/mail-notification.schemas.in.in.h:20
msgid "Seconds to wait before expiring message popups"
msgstr "Secondes du délai d'expiration des popups"
-#: ../data/mail-notification.schemas.in.in.h:20
+#: ../data/mail-notification.schemas.in.in.h:21
msgid ""
"The action to perform when the icon is clicked. Must be \"display-properties-"
"dialog\", \"launch-mail-reader\", \"open-latest-message\" or \"update-mail-"
@@ -152,23 +156,23 @@ msgstr ""
"properties-dialog\", \"launch-mail-reader\", \"open-latest-message\" ou "
"\"update-mail-status\"."
-#: ../data/mail-notification.schemas.in.in.h:21
+#: ../data/mail-notification.schemas.in.in.h:22
msgid "The command to run when all mail is read."
msgstr "La commande à exécuter lorsque tout le courrier est lu"
-#: ../data/mail-notification.schemas.in.in.h:22
+#: ../data/mail-notification.schemas.in.in.h:23
msgid "The command to run when new mail arrives."
msgstr "La commande à exécuter lorsque du nouveau courrier arrive."
-#: ../data/mail-notification.schemas.in.in.h:23
+#: ../data/mail-notification.schemas.in.in.h:24
msgid "The command to run when the message list changes."
msgstr "La commande à exécuter lorsque la liste des messages change."
-#: ../data/mail-notification.schemas.in.in.h:24
+#: ../data/mail-notification.schemas.in.in.h:25
msgid "The height of the properties dialog in pixels."
msgstr "La hauteur de la boîte de dialogue contenant les propriétés en pixels."
-#: ../data/mail-notification.schemas.in.in.h:25
+#: ../data/mail-notification.schemas.in.in.h:26
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
@@ -176,18 +180,26 @@ msgstr ""
"La liste des serveurs SSL/TLS (hôte:port) de confiance auxquels il manque un "
"certificat X509."
-#: ../data/mail-notification.schemas.in.in.h:26
+#: ../data/mail-notification.schemas.in.in.h:27
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr ""
"La liste des certificats X509 de confiance, représentés par leur empreinte "
"digitale."
-#: ../data/mail-notification.schemas.in.in.h:27
+#: ../data/mail-notification.schemas.in.in.h:28
+msgid ""
+"The ordered list of actions to include in the message popups. Each element "
+"must be \"open\", \"mark-as-read\", \"mark-as-spam\" or \"delete\"."
+msgstr ""
+"La liste triée d'actions à inclure dans les popups. Chaque élément doit être "
+"\"open\", \"mark-as-read\", \"mark-as-spam\" ou \"delete\"."
+
+#: ../data/mail-notification.schemas.in.in.h:29
msgid "The position of the message popups. Must be \"attached\" or \"free\"."
msgstr "La position des popups. Doit être \"attached\" ou \"free\"."
-#: ../data/mail-notification.schemas.in.in.h:28
+#: ../data/mail-notification.schemas.in.in.h:30
msgid ""
"The type of mail summary to display in the icon's tooltip. Must be \"standard"
"\", \"compact\" or \"none\"."
@@ -195,37 +207,37 @@ msgstr ""
"Le type d'aperçu du courrier à afficher dans le ballon d'aide de l'icône. "
"Doit être \"standard\", \"compact\" ou \"aucun\"."
-#: ../data/mail-notification.schemas.in.in.h:29
+#: ../data/mail-notification.schemas.in.in.h:31
msgid "The width of the properties dialog in pixels."
msgstr "La largeur de la boîte de dialogue contenant les propriétés en pixels."
-#: ../data/mail-notification.schemas.in.in.h:30
+#: ../data/mail-notification.schemas.in.in.h:32
msgid "Tooltip mail summary"
msgstr "Aperçu du courrier dans le ballon d'aide"
-#: ../data/mail-notification.schemas.in.in.h:31
+#: ../data/mail-notification.schemas.in.in.h:33
msgid "Trusted servers list"
msgstr "Liste des serveurs de confiance"
-#: ../data/mail-notification.schemas.in.in.h:32
+#: ../data/mail-notification.schemas.in.in.h:34
msgid "Whether the status icon should blink on errors or not."
msgstr "Si l'icône de statut doit clignoter lors d'erreurs ou pas."
-#: ../data/mail-notification.schemas.in.in.h:33
+#: ../data/mail-notification.schemas.in.in.h:35
msgid "Whether to display an icon when there is no new mail or not."
msgstr ""
"Si une icône doit être affichée lorsqu'il n'y a pas de nouveau courrier ou "
"pas."
-#: ../data/mail-notification.schemas.in.in.h:34
+#: ../data/mail-notification.schemas.in.in.h:36
msgid "Whether to display seen mail or not."
msgstr "Si le courrier vu doit être affiché ou pas."
-#: ../data/mail-notification.schemas.in.in.h:35
+#: ../data/mail-notification.schemas.in.in.h:37
msgid "Whether to enable message popups or not."
msgstr "Si les popups doivent être activés ou pas."
-#: ../data/mail-notification.schemas.in.in.h:36
+#: ../data/mail-notification.schemas.in.in.h:38
msgid ""
"Whether to expire message popups or not. Must be \"default\", \"false\" or "
"\"true\"."
@@ -233,23 +245,23 @@ msgstr ""
"Si l'expiration des popups doit être activée ou pas. Doit être \"default\", "
"\"false\" ou \"true\"."
-#: ../data/mail-notification.schemas.in.in.h:37
+#: ../data/mail-notification.schemas.in.in.h:39
msgid "Whether to run a command when all mail is read or not."
msgstr ""
"Si une commande doit être exécutée lorsque tout le courrier est lu ou pas."
-#: ../data/mail-notification.schemas.in.in.h:38
+#: ../data/mail-notification.schemas.in.in.h:40
msgid "Whether to run a command when new mail arrives or not."
msgstr ""
"Si une commande doit être exécutée lorsque du nouveau courrier arrive ou pas."
-#: ../data/mail-notification.schemas.in.in.h:39
+#: ../data/mail-notification.schemas.in.in.h:41
msgid "Whether to run a command when the message list changes or not."
msgstr ""
"Si une commande doit être exécutée lorsque la liste des messages change ou "
"pas."
-#: ../data/mail-notification.schemas.in.in.h:40
+#: ../data/mail-notification.schemas.in.in.h:42
msgid "Width of properties dialog"
msgstr "Largeur de la boîte de dialogue contenant les propriétés"
@@ -274,7 +286,7 @@ msgstr "Une icône d'avertissement de courrier"
msgid "translator-credits"
msgstr "Jean-Yves Lefort <jylefort@brutele.be>"
-#: ../src/mn-auth-combo-box.gob:104
+#: ../src/mn-auth-combo-box.gob:101
#: ../src/mn-autodetect-mailbox-properties.gob:110
msgid "Autodetect"
msgstr "Autodétecter"
@@ -322,96 +334,113 @@ msgstr "impossible de fermer le fichier : %s"
msgid "unable to open mailbox: %s"
msgstr "impossible d'ouvrir la boîte aux lettres : %s"
-#: ../src/mn-client-session.c:248
+#: ../src/mn-client-session.c:257
#, c-format
msgid "resolving %s"
msgstr "résolution de %s en cours"
-#: ../src/mn-client-session.c:264
+#: ../src/mn-client-session.c:273
#, c-format
msgid "unable to resolve %s: %s"
msgstr "impossible de résoudre %s : %s"
-#: ../src/mn-client-session.c:305
+#: ../src/mn-client-session.c:314
#, c-format
msgid "network address #%i"
msgstr "adresse réseau %i"
-#: ../src/mn-client-session.c:308
+#: ../src/mn-client-session.c:317
#, c-format
msgid "unable to convert network address #%i into textual form: %s"
msgstr ""
"impossible de convertir l'adresse réseau %i vers une forme textuelle : %s"
-#: ../src/mn-client-session.c:319
+#: ../src/mn-client-session.c:328
#, c-format
msgid "%s: unsupported address family"
msgstr "%s : famille d'adresse non prise en charge"
-#: ../src/mn-client-session.c:326
+#: ../src/mn-client-session.c:335
#, c-format
msgid "%s: unable to create socket: %s"
msgstr "%s : impossible de créer un socket : %s"
-#: ../src/mn-client-session.c:330
+#: ../src/mn-client-session.c:339
#, c-format
msgid "connecting to %s (%s) port %i"
msgstr "connexion à %s (%s) port %i en cours"
-#: ../src/mn-client-session.c:333
+#: ../src/mn-client-session.c:342
#, c-format
msgid "unable to connect: %s"
msgstr "impossible de se connecter : %s"
-#: ../src/mn-client-session.c:338
+#: ../src/mn-client-session.c:347
msgid "connected successfully"
msgstr "connecté avec succès"
#. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:352
+#: ../src/mn-client-session.c:361
#, c-format
msgid "unable to connect to %s"
msgstr "impossible de se connecter à %s"
-#: ../src/mn-client-session.c:379
+#: ../src/mn-client-session.c:388
#, c-format
msgid "unable to initialize the OpenSSL library: %s"
msgstr "impossible d'initialiser la bibliothèque OpenSSL : %s"
-#: ../src/mn-client-session.c:387
+#: ../src/mn-client-session.c:396
#, c-format
msgid "unable to create a SSL/TLS object: %s"
msgstr "impossible de créer un objet SSL/TLS : %s"
-#: ../src/mn-client-session.c:393
+#: ../src/mn-client-session.c:402
#, c-format
msgid "unable to set the SSL/TLS file descriptor: %s"
msgstr "impossible de spécifier le descripteur de fichier SSL/TLS : %s"
-#: ../src/mn-client-session.c:399
+#: ../src/mn-client-session.c:408
#, c-format
msgid "unable to perform the SSL/TLS handshake: %s"
msgstr "impossible d'accomplir la négociation SSL/TLS : %s"
-#: ../src/mn-client-session.c:405
+#: ../src/mn-client-session.c:414
msgid "untrusted server"
msgstr "serveur non fiable"
-#: ../src/mn-client-session.c:409
+#: ../src/mn-client-session.c:418
#, c-format
msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
msgstr "une couche SSL/TLS est maintenant active (%s, %s %i-bit)"
-#: ../src/mn-client-session.c:456
+#: ../src/mn-client-session.c:589
+msgid "server name not found in certificate"
+msgstr "nom de serveur non trouvé dans le certificat"
+
+#: ../src/mn-client-session.c:594
+#, c-format
+msgid ""
+"user-provided server name \"%s\" does not match certificate-provided server "
+"name \"%s\""
+msgstr ""
+"le nom de serveur \"%s\" fourni par l'utilisateur ne correspond pas au nom "
+"de serveur \"%s\" fourni par le certificat"
+
+#: ../src/mn-client-session.c:612
#, c-format
-msgid "%s, fingerprint: %s"
-msgstr "%s, empreinte digitale : %s"
+msgid ""
+"user-provided server name \"%s\" matches none of the certificate-provided "
+"server names %s"
+msgstr ""
+"le nom de serveur \"%s\" fourni par l'utilisateur ne correspond à aucun des "
+"noms de serveur %s fournis par le certificat"
-#: ../src/mn-client-session.c:485
+#: ../src/mn-client-session.c:688
msgid "missing certificate"
msgstr "certificat manquant"
-#: ../src/mn-client-session.c:511
+#: ../src/mn-client-session.c:717
#, c-format
msgid ""
"Mail Notification was unable to trust \"%s\" (%s). It is possible that "
@@ -430,125 +459,130 @@ msgstr ""
"vous êtes connecté à \"%s\". Si vous choisissez de vous connecter au "
"serveur, ce message ne sera plus affiché."
-#: ../src/mn-client-session.c:526
+#: ../src/mn-client-session.c:731
+#, c-format
+msgid "Certificate fingerprint: %s."
+msgstr "Empreinte digitale du certificat: %s."
+
+#: ../src/mn-client-session.c:738
msgid "Connect to untrusted server?"
msgstr "Se connecter au serveur non fiable ?"
-#: ../src/mn-client-session.c:591
+#: ../src/mn-client-session.c:803
#, c-format
msgid "response \"%s\" is not valid in current context"
msgstr "la réponse \"%s\" n'est pas valable dans le contexte actuel"
-#: ../src/mn-client-session.c:620
+#: ../src/mn-client-session.c:832
#, c-format
msgid "unable to parse response \"%s\""
msgstr "impossible d'interpréter la réponse \"%s\""
-#: ../src/mn-client-session.c:670 ../src/mn-client-session.c:677
+#: ../src/mn-client-session.c:882 ../src/mn-client-session.c:889
#, c-format
msgid "unable to read from server: %s"
msgstr "impossible de lire depuis le serveur : %s"
-#: ../src/mn-client-session.c:675
+#: ../src/mn-client-session.c:887
msgid "unable to read from server: EOF"
msgstr "impossible de lire depuis le serveur : EOF"
-#: ../src/mn-client-session.c:687
+#: ../src/mn-client-session.c:899
#, c-format
msgid "unable to decode data using SASL: %s"
msgstr "impossible de décoder les données en utilisant SASL : %s"
-#: ../src/mn-client-session.c:832
+#: ../src/mn-client-session.c:1044
#, c-format
msgid "unable to encode data using SASL: %s"
msgstr "impossible d'encoder les données en utilisant SASL : %s"
-#: ../src/mn-client-session.c:863 ../src/mn-client-session.c:870
+#: ../src/mn-client-session.c:1075 ../src/mn-client-session.c:1082
#, c-format
msgid "unable to write to server: %s"
msgstr "impossible d'écrire vers le serveur : %s"
-#: ../src/mn-client-session.c:868
+#: ../src/mn-client-session.c:1080
msgid "unable to write to server: EOF"
msgstr "impossible d'écrire vers le serveur : EOF"
-#: ../src/mn-client-session.c:899 ../src/mn-pop3-mailbox.gob:434
+#: ../src/mn-client-session.c:1111 ../src/mn-pop3-mailbox.gob:434
#, c-format
msgid "unable to encode Base64: %s"
msgstr "impossible d'encoder en Base64 : %s"
-#: ../src/mn-client-session.c:1076
+#: ../src/mn-client-session.c:1288
#, c-format
msgid "unable to initialize the SASL library: %s"
msgstr "impossible d'initialiser la bibliothèque SASL : %s"
-#: ../src/mn-client-session.c:1088
+#: ../src/mn-client-session.c:1300
#, c-format
msgid "unable to retrieve local address of socket: %s"
msgstr "impossible d'obtenir l'adresse locale du socket : %s"
-#: ../src/mn-client-session.c:1094
+#: ../src/mn-client-session.c:1306
#, c-format
msgid "unable to retrieve remote address of socket: %s"
msgstr "impossible d'obtenir l'adresse distante du socket : %s"
-#: ../src/mn-client-session.c:1128
+#: ../src/mn-client-session.c:1340
#, c-format
msgid "unable to set SASL security properties: %s"
msgstr "impossible de spécifier les propriétés de sécurité SASL : %s"
-#: ../src/mn-client-session.c:1152
+#: ../src/mn-client-session.c:1364
msgid ""
"unable to start SASL authentication: SASL asked for something we did not know"
msgstr ""
"impossible de démarrer l'authentification SASL : SASL a demandé quelque "
"chose que nous ne connaissions pas"
-#: ../src/mn-client-session.c:1171
+#: ../src/mn-client-session.c:1383
#, c-format
msgid "unable to start SASL authentication: %s"
msgstr "impossible de démarrer l'authentification SASL : %s"
-#: ../src/mn-client-session.c:1175
+#: ../src/mn-client-session.c:1387
#, c-format
msgid "unable to create a SASL connection: %s"
msgstr "impossible de créer une connexion SASL : %s"
-#: ../src/mn-client-session.c:1222
+#: ../src/mn-client-session.c:1434
msgid "SASL asked for something we did not know, aborting SASL authentication"
msgstr ""
"SASL a demandé quelque chose que nous ne connaissions pas, annulation de "
"l'authentification SASL"
-#: ../src/mn-client-session.c:1239
+#: ../src/mn-client-session.c:1451
#, c-format
msgid "%s, aborting SASL authentication"
msgstr "%s, annulation de l'authentification SASL"
#. compliance error
-#: ../src/mn-client-session.c:1244
+#: ../src/mn-client-session.c:1456
#, c-format
msgid "unable to decode Base64 input from server: %s"
msgstr "impossible de décoder l'entrée Base64 du serveur : %s"
-#: ../src/mn-client-session.c:1280
+#: ../src/mn-client-session.c:1492
#, c-format
msgid "a SASL security layer of strength factor %i is now active"
msgstr ""
"une couche de sécurité SASL de facteur de force %i est maintenant active"
#. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1285
+#: ../src/mn-client-session.c:1497
#, c-format
msgid "unable to get SASL_MAXOUTBUF property: %s"
msgstr "impossible d'obtenir la propriété SASL_MAXOUTBUF : %s"
-#: ../src/mn-client-session.c:1291
+#: ../src/mn-client-session.c:1503
#, c-format
msgid "warning: unable to get SASL_SSF property: %s"
msgstr "avertissement : impossible d'obtenir la propriété SASL_SSF : %s"
-#: ../src/mn-client-session.c:1450
+#: ../src/mn-client-session.c:1662
msgid "unknown server error"
msgstr "erreur serveur inconnue"
@@ -568,25 +602,25 @@ msgstr "Sujet"
msgid "Sent"
msgstr "Envoyé"
-#: ../src/mn-conf.c:281
+#: ../src/mn-conf.c:282
msgid "A directory creation error has occurred"
msgstr "Une erreur de création de répertoire s'est produite"
-#: ../src/mn-conf.c:282
+#: ../src/mn-conf.c:283
#, c-format
msgid "Unable to create directory \"%s\": %s."
msgstr "Impossible de créer le répertoire \"%s\" : %s."
-#: ../src/mn-conf.c:406
+#: ../src/mn-conf.c:407
#, c-format
msgid "recursively unsetting %s"
msgstr "en train de supprimer récursivement %s"
-#: ../src/mn-conf.c:410
+#: ../src/mn-conf.c:411
msgid "syncing the GConf database"
msgstr "en train de synchroniser la base de données GConf"
-#: ../src/mn-conf.c:413
+#: ../src/mn-conf.c:414
msgid "completed"
msgstr "terminé"
@@ -606,11 +640,9 @@ msgstr "Dossier"
#: ../src/mn-evolution-mailbox-properties.gob:204
msgid ""
"Mail Notification can not contact Evolution. Make sure that Evolution is "
-"running and that the Evolution Mail Notification plugin is loaded."
-msgstr ""
-"L'avertisseur de courrier ne peut contacter Evolution. Assurez-vous "
-"qu'Evolution est en cours de fonctionnement et que l'extension Evolution "
-"\"Avertisseur de courrier\" est chargée."
+"running and that the Evolution Jean-Yves Lefort's Mail Notification plugin "
+"is loaded."
+msgstr "L'avertisseur de courrier ne peut contacter Evolution. Assurez-vous qu'Evolution est en cours de fonctionnement et que l'extension Evolution \"Avertisseur de courrier de Jean-Yves Lefort\" est chargée."
#: ../src/mn-evolution-mailbox.gob:78
msgid "folder not found"
@@ -637,7 +669,7 @@ msgstr ""
"Bonobo n'a pu localiser le serveur %s. Veuillez vérifier votre installation "
"de l'avertisseur de courrier."
-#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:518
+#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:523
#, c-format
msgid ""
"Bonobo was unable to register the %s server. Please check your Mail "
@@ -685,7 +717,7 @@ msgstr "impossible de chercher dans %s : %s"
msgid "unable to tell position of %s: %s"
msgstr "impossible de dire la position de %s : %s"
-#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:167
+#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:174
#, c-format
msgid "unable to close %s: %s"
msgstr "impossible de fermer %s : %s"
@@ -721,30 +753,25 @@ msgstr "Auto_détecter"
msgid "Al_ways"
msgstr "_Toujours"
-#: ../src/mn-imap-mailbox.gob:385
+#: ../src/mn-imap-mailbox.gob:381
msgid "server did not send capabilities"
msgstr "le serveur n'a pas envoyé ses possibilités"
-#: ../src/mn-imap-mailbox.gob:552
+#: ../src/mn-imap-mailbox.gob:548
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr ""
"le serveur a annoncé LOGINDISABLED, pas d'utilisation de l'authentification "
"LOGIN"
-#: ../src/mn-imap-mailbox.gob:553
+#: ../src/mn-imap-mailbox.gob:549
msgid "unable to login"
msgstr "impossible d'ouvrir la session"
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:753
-msgid "server did not send all the messages we requested"
-msgstr "le serveur n'a pas envoyé tous les messages que nous avons demandé"
-
-#: ../src/mn-imap-mailbox.gob:823
+#: ../src/mn-imap-mailbox.gob:822
msgid "unable to fetch message"
msgstr "impossible d'obtenir le message"
-#: ../src/mn-imap-mailbox.gob:848
+#: ../src/mn-imap-mailbox.gob:838
msgid ""
"\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
"logging out"
@@ -752,12 +779,12 @@ msgstr ""
"la valeur de l'option \"Utiliser l'extension IDLE\" dans les propriétés de "
"la boîte aux lettres est \"jamais\", fermeture de session"
-#: ../src/mn-imap-mailbox.gob:859
+#: ../src/mn-imap-mailbox.gob:849
#, c-format
msgid "the remote server runs %s, not using the IDLE extension"
msgstr "le serveur distant utilise %s, l'extension IDLE ne sera pas utilisée"
-#: ../src/mn-imap-mailbox.gob:864
+#: ../src/mn-imap-mailbox.gob:854
#, c-format
msgid ""
"the remote server runs %s, the IDLE extension might not function properly"
@@ -765,16 +792,16 @@ msgstr ""
"le serveur distant utilise %s, il se peut que l'extension IDLE ne fonctionne "
"pas correctement"
-#: ../src/mn-imap-mailbox.gob:873
+#: ../src/mn-imap-mailbox.gob:863
msgid "the remote server does not support the IDLE extension, logging out"
msgstr ""
"le serveur distant ne supporte pas l'extension IDLE, fermeture de session"
-#: ../src/mn-imap-mailbox.gob:1378 ../src/mn-pop3-mailbox.gob:297
+#: ../src/mn-imap-mailbox.gob:1368 ../src/mn-pop3-mailbox.gob:297
msgid "server does not support in-band SSL/TLS"
msgstr "le serveur ne supporte pas le mode SSL/TLS interne"
-#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:954
+#: ../src/mn-imap-mailbox.gob:1392 ../src/mn-pop3-mailbox.gob:956
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
@@ -782,32 +809,26 @@ msgstr ""
"un mécanisme d'authentification SASL a été sélectionné mais le support SASL "
"n'a pas été inclus lors de la compilation"
-#: ../src/mn-imap-mailbox.gob:1412 ../src/mn-pop3-mailbox.gob:974
+#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:976
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "mécanisme d'authentification inconnu \"%s\""
-#: ../src/mn-imap-mailbox.gob:1444 ../src/mn-pop3-mailbox.gob:1010
+#: ../src/mn-imap-mailbox.gob:1434 ../src/mn-pop3-mailbox.gob:1012
#, c-format
msgid "disabling mechanism \"%s\" and retrying SASL authentication"
msgstr ""
"désactivation du mécanisme \"%s\" et nouvelle tentative d'authentification "
"SASL"
-#: ../src/mn-imap-mailbox.gob:1456
+#: ../src/mn-imap-mailbox.gob:1446
msgid "falling back to IMAP LOGIN authentication"
msgstr "rétrogradation vers l'authentification IMAP LOGIN"
-#: ../src/mn-imap-mailbox.gob:1468 ../src/mn-pop3-mailbox.gob:1039
+#: ../src/mn-imap-mailbox.gob:1458 ../src/mn-pop3-mailbox.gob:1041
msgid "authentication failed"
msgstr "l'authentification a échoué"
-#. success; caller must switch state itself
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:1529
-msgid "server did not send search results"
-msgstr "le serveur n'a pas envoyé les résultats de la recherche"
-
#. translators: header capitalization
#: ../src/mn-mail-icon.gob:93
msgid "_Mail Reader"
@@ -857,16 +878,16 @@ msgstr "boîte aux lettres %s"
msgid "detecting mailbox type..."
msgstr "détection du type de boîte aux lettres en cours..."
-#: ../src/mn-mailbox.gob:504
+#: ../src/mn-mailbox.gob:507
msgid "\"type\" attribute missing"
msgstr "attribut \"type\" manquant"
-#: ../src/mn-mailbox.gob:511
+#: ../src/mn-mailbox.gob:514
#, c-format
msgid "unknown mailbox type \"%s\""
msgstr "type de boîte aux lettres \"%s\" inconnu"
-#: ../src/mn-mailbox.gob:907
+#: ../src/mn-mailbox.gob:910
#, c-format
msgid "property \"%s\" has no value"
msgstr "la propriété \"%s\" n'a pas de valeur"
@@ -981,72 +1002,72 @@ msgstr "impossible de fermer le dossier \"%s\" : %s"
msgid "error while reading folder \"%s\": %s"
msgstr "erreur lors de la lecture du dossier \"%s\" : %s"
-#: ../src/mn-main.c:109
+#: ../src/mn-main.c:110
msgid "yes"
msgstr "oui"
-#: ../src/mn-main.c:109
+#: ../src/mn-main.c:110
msgid "no"
msgstr "non"
-#: ../src/mn-main.c:142
+#: ../src/mn-main.c:143
#, c-format
msgid "%s version %s\n"
msgstr "%s version %s\n"
-#: ../src/mn-main.c:147
+#: ../src/mn-main.c:148
msgid "Mailbox backends:\n"
msgstr "Prises en charge de boîtes aux lettres :\n"
-#: ../src/mn-main.c:152
+#: ../src/mn-main.c:153
msgid "POP3 and IMAP features:\n"
msgstr "Fonctionnalités POP3 et IMAP :\n"
-#: ../src/mn-main.c:157
+#: ../src/mn-main.c:158
msgid "Sylpheed features:\n"
msgstr "Fonctionnalités Sylpheed :\n"
-#: ../src/mn-main.c:205
+#: ../src/mn-main.c:206
#, c-format
msgid "A Bonobo exception (%s) has occurred in %s()."
msgstr "Une exception Bonobo (%s) s'est produite dans %s()."
-#: ../src/mn-main.c:247
+#: ../src/mn-main.c:248
#, c-format
msgid "%s option ignored since Mail Notification is not already running"
msgstr ""
"option %s ignorée puisque l'avertisseur de courrier n'est pas déjà en cours "
"d'exécution"
-#: ../src/mn-main.c:267
+#: ../src/mn-main.c:268
msgid "Show version information"
msgstr "Afficher les informations de version"
-#: ../src/mn-main.c:276
+#: ../src/mn-main.c:277
msgid "Enable informational output"
msgstr "Activer la sortie informationnelle"
-#: ../src/mn-main.c:285
+#: ../src/mn-main.c:286
msgid "Display the properties dialog"
msgstr "Afficher la boîte de dialogue contenant les propriétés"
-#: ../src/mn-main.c:294
+#: ../src/mn-main.c:295
msgid "Display the about dialog"
msgstr "Afficher la boîte de dialogue \"à propos\""
-#: ../src/mn-main.c:303
+#: ../src/mn-main.c:304
msgid "Update the mail status"
msgstr "Mettre à jour le statut du courrier"
-#: ../src/mn-main.c:312
+#: ../src/mn-main.c:313
msgid "Print a XML mail summary"
-msgstr "Afficher un aperçu du courrier XML"
+msgstr "Afficher un aperçu XML du courrier"
-#: ../src/mn-main.c:321
+#: ../src/mn-main.c:322
msgid "Unset obsolete GConf configuration"
msgstr "Supprimer la configuration GConf obsolète"
-#: ../src/mn-main.c:330
+#: ../src/mn-main.c:331
msgid "Quit Mail Notification"
msgstr "Quitter l'avertisseur de courrier"
@@ -1054,11 +1075,11 @@ msgstr "Quitter l'avertisseur de courrier"
#. * We cannot use mn_fatal_error_dialog() because gtk_init() has
#. * not been called yet.
#.
-#: ../src/mn-main.c:356
+#: ../src/mn-main.c:358
msgid "multi-threading is not available"
msgstr "le multi-threading n'est pas disponible"
-#: ../src/mn-main.c:407
+#: ../src/mn-main.c:412
msgid ""
"Bonobo could not locate the automation object. Please check your Mail "
"Notification installation."
@@ -1066,24 +1087,24 @@ msgstr ""
"Bonobo n'a pu localiser l'objet automation. Veuillez vérifier votre "
"installation de l'avertisseur de courrier."
-#: ../src/mn-main.c:413
+#: ../src/mn-main.c:418
msgid "quitting Mail Notification"
msgstr "en train de quitter l'avertisseur de courrier"
-#: ../src/mn-main.c:417
+#: ../src/mn-main.c:422
msgid "Mail Notification is not running"
msgstr "L'avertisseur de courrier n'est pas en cours d'exécution"
-#: ../src/mn-main.c:432
+#: ../src/mn-main.c:437
msgid "Unable to initialize the GnomeVFS library."
msgstr "Impossible d'initialiser la bibliothèque GnomeVFS."
-#: ../src/mn-main.c:442
+#: ../src/mn-main.c:447
msgid "An initialization error has occurred in Mail Notification"
msgstr ""
"Une erreur d'initialisation s'est produite dans l'avertisseur de courrier"
-#: ../src/mn-main.c:443
+#: ../src/mn-main.c:448
msgid ""
"Unable to initialize the notification library. Message popups will not be "
"displayed."
@@ -1091,15 +1112,15 @@ msgstr ""
"Impossible d'initialiser la bibliothèque d'avertissement. Les popups ne "
"seront pas affichés."
-#: ../src/mn-main.c:481
+#: ../src/mn-main.c:486
msgid "updating the mail status"
msgstr "mise à jour du statut du courrier"
-#: ../src/mn-main.c:497
+#: ../src/mn-main.c:502
msgid "Mail Notification is already running"
msgstr "L'avertisseur de courrier est déjà en cours d'exécution"
-#: ../src/mn-main.c:514
+#: ../src/mn-main.c:519
#, c-format
msgid ""
"Bonobo could not locate the %s file. Please check your Mail Notification "
@@ -1108,38 +1129,38 @@ msgstr ""
"Bonobo n'a pu localiser le fichier %s. Veuillez vérifier votre installation "
"de l'avertisseur de courrier."
-#: ../src/mn-message-mime.c:168
+#: ../src/mn-message-mime.c:193
msgid "unable to parse MIME message"
msgstr "impossible d'interpréter le message MIME"
-#: ../src/mn-message.gob:144
+#: ../src/mn-message.gob:145
msgid "Unknown"
msgstr "Inconnu"
-#: ../src/mn-message.gob:207
+#: ../src/mn-message.gob:208
msgid "unterminated substitution"
msgstr "substitution non terminée"
-#: ../src/mn-message.gob:246
+#: ../src/mn-message.gob:247
#, c-format
msgid "unknown substitution \"%s\""
msgstr "substitution \"%s\" inconnue"
-#: ../src/mn-message.gob:249
+#: ../src/mn-message.gob:250
msgid "empty substitution"
msgstr "substitution vide"
-#: ../src/mn-message.gob:312 ../src/mn-util.c:1372
+#: ../src/mn-message.gob:313 ../src/mn-util.c:1427
#, c-format
msgid "Unable to execute \"%s\": %s."
msgstr "Impossible d'exécuter \"%s\" : %s"
-#: ../src/mn-mh-mailbox-backend.gob:170
+#: ../src/mn-mh-mailbox-backend.gob:177
#, c-format
msgid "error while reading %s: %s"
msgstr "erreur lors de la lecture de %s : %s"
-#: ../src/mn-mh-mailbox-backend.gob:183
+#: ../src/mn-mh-mailbox-backend.gob:190
#, c-format
msgid "unable to open %s: %s"
msgstr "impossible d'ouvrir %s : %s"
@@ -1182,11 +1203,11 @@ msgstr "_Mécanisme :"
msgid "Connection"
msgstr "Connexion"
-#: ../src/mn-pi-mailbox.gob:153
+#: ../src/mn-pi-mailbox.gob:154
msgid "SSL/TLS support has not been compiled in"
msgstr "le support SSL/TLS n'a pas été inclus lors de la compilation"
-#: ../src/mn-pi-mailbox.gob:319
+#: ../src/mn-pi-mailbox.gob:320
#, c-format
msgid ""
"Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -1200,14 +1221,14 @@ msgstr ""
"\n"
"Veuillez à nouveau saisir vos données d'authentification."
-#: ../src/mn-pi-mailbox.gob:320
+#: ../src/mn-pi-mailbox.gob:321
#, c-format
msgid "Enter your credentials for %s mailbox %s."
msgstr "Entrez vos données d'authentification pour la boîte aux lettres %s %s."
#. keep the title in sync with gnome-authentication-manager
#. translators: header capitalization
-#: ../src/mn-pi-mailbox.gob:363
+#: ../src/mn-pi-mailbox.gob:364
msgid "Authentication Required"
msgstr "Authentification requise"
@@ -1240,74 +1261,88 @@ msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
msgstr[0] "attente de %i seconde afin d'obéir à LOGIN-DELAY"
msgstr[1] "attente de %i secondes afin d'obéir à LOGIN-DELAY"
-#: ../src/mn-pop3-mailbox.gob:966
+#: ../src/mn-pop3-mailbox.gob:968
msgid "server does not support APOP authentication"
msgstr "le serveur ne supporte pas l'authentification APOP"
-#: ../src/mn-pop3-mailbox.gob:1022
+#: ../src/mn-pop3-mailbox.gob:1024
msgid "falling back to APOP authentication"
msgstr "rétrogradation vers l'authentification APOP"
-#: ../src/mn-pop3-mailbox.gob:1027
+#: ../src/mn-pop3-mailbox.gob:1029
msgid "falling back to USER/PASS authentication"
msgstr "rétrogradation vers l'authentification USER/PASS"
-#: ../src/mn-popup.gob:52 ../src/mn-standard-message-view.gob:63
+#: ../src/mn-popup.gob:60 ../src/mn-standard-message-view.gob:63
msgid "Mailbox:"
msgstr "Boîte aux lettres :"
-#: ../src/mn-popup.gob:54 ../src/mn-standard-message-view.gob:65
+#: ../src/mn-popup.gob:62 ../src/mn-standard-message-view.gob:65
msgid "Unreadable message:"
msgstr "Message non lisible :"
-#: ../src/mn-popup.gob:57 ../src/mn-standard-message-view.gob:68
+#: ../src/mn-popup.gob:65 ../src/mn-standard-message-view.gob:68
msgid "From:"
msgstr "De :"
-#: ../src/mn-popup.gob:58 ../src/mn-standard-message-view.gob:69
+#: ../src/mn-popup.gob:66 ../src/mn-standard-message-view.gob:69
msgid "Subject:"
msgstr "Sujet :"
+#: ../src/mn-popup.gob:128
+#, c-format
+msgid "configuration key %s: there is no action named `%s'"
+msgstr "clé de configuration %s: il n'y a pas d'action nommée `%s'"
+
#. translators: header capitalization
-#: ../src/mn-popup.gob:79
+#: ../src/mn-popup.gob:141
msgid "Open"
msgstr "Ouvrir"
#. translators: header capitalization
-#: ../src/mn-popup.gob:87
+#: ../src/mn-popup.gob:154
msgid "Mark as Read"
msgstr "Marquer comme lu"
#. translators: header capitalization
-#: ../src/mn-popup.gob:95
+#: ../src/mn-popup.gob:167
msgid "Mark as Spam"
msgstr "Marquer comme indésirable"
-#: ../src/mn-popup.gob:117
+#. translators: header capitalization
+#: ../src/mn-popup.gob:180
+msgid "Delete"
+msgstr "Effacer"
+
+#: ../src/mn-popup.gob:196
msgid "Unable to open message"
msgstr "Impossible d'ouvrir le message"
-#: ../src/mn-popup.gob:134
+#: ../src/mn-popup.gob:213
msgid "Unable to mark message as read"
msgstr "Impossible de marquer le message comme lu"
-#: ../src/mn-popup.gob:151
+#: ../src/mn-popup.gob:230
msgid "Unable to mark message as spam"
msgstr "Impossible de marquer le message comme indésirable"
-#: ../src/mn-popup.gob:210
+#: ../src/mn-popup.gob:247
+msgid "Unable to delete message"
+msgstr "Impossible d'effacer le message"
+
+#: ../src/mn-popup.gob:306
#, c-format
msgid "unable to show popup: %s"
msgstr "impossible d'afficher le popup : %s"
-#: ../src/mn-popup.gob:227
+#: ../src/mn-popup.gob:323
#, c-format
msgid "unable to close popup: %s"
msgstr "impossible de fermer le popup : %s"
#. we set the summary here because libnotify requires it
#. translators: header capitalization
-#: ../src/mn-popup.gob:238
+#: ../src/mn-popup.gob:334
msgid "New Message"
msgstr "Nouveau message"
@@ -1372,7 +1407,7 @@ msgstr "Erreurs"
msgid "Mail Summary"
msgstr "Aperçu du courrier"
-#: ../src/mn-ssl.c:77
+#: ../src/mn-ssl.c:159
msgid "unknown SSL/TLS error"
msgstr "erreur SSL/TLS inconnue"
@@ -1386,8 +1421,7 @@ msgid "Select _All"
msgstr "Sélectionner _tout"
#. translators: header capitalization
-#. translators: header capitalization
-#: ../src/mn-stock.c:33
+#: ../src/mn-stock.c:32
msgid "Co_nnect"
msgstr "Se co_nnecter"
@@ -1462,12 +1496,12 @@ msgid "Mail Notification Properties Dialog"
msgstr ""
"Boîte de dialogue contenant les propriétés de l'avertisseur de courrier"
-#: ../src/mn-util.c:350
+#: ../src/mn-util.c:351
#, c-format
msgid "error loading image: %s"
msgstr "erreur de chargement d'image : %s"
-#: ../src/mn-util.c:366
+#: ../src/mn-util.c:367
#, c-format
msgid ""
"Unable to load interface \"%s\". Please check your Mail Notification "
@@ -1476,7 +1510,7 @@ msgstr ""
"Impossible de charger l'interface \"%s\". Veuillez vérifier votre "
"installation de l'avertisseur de courrier."
-#: ../src/mn-util.c:381
+#: ../src/mn-util.c:382
#, c-format
msgid ""
"Widget \"%s\" not found in interface \"%s\". Please check your Mail "
@@ -1485,12 +1519,12 @@ msgstr ""
"Elément \"%s\" non trouvé dans l'interface \"%s\". Veuillez vérifier votre "
"installation de l'avertisseur de courrier."
-#: ../src/mn-util.c:450
+#: ../src/mn-util.c:451
#, c-format
msgid "Unable to open self as a module (%s)."
msgstr "Impossible de s'auto-ouvrir en tant que module (%s)."
-#: ../src/mn-util.c:455
+#: ../src/mn-util.c:456
#, c-format
msgid ""
"Signal handler \"%s\" not found. Please check your Mail Notification "
@@ -1499,33 +1533,33 @@ msgstr ""
"Gestionnaire de signal \"%s\" non trouvé. Veuillez vérifier votre "
"installation de l'avertisseur de courrier."
-#: ../src/mn-util.c:606 ../src/mn-util.c:629 ../src/mn-util.c:649
-#: ../src/mn-util.c:671
+#: ../src/mn-util.c:607 ../src/mn-util.c:630 ../src/mn-util.c:650
+#: ../src/mn-util.c:672
msgid "A drag and drop error has occurred"
msgstr "Une erreur de glisser-déposer s'est produite"
-#: ../src/mn-util.c:607
+#: ../src/mn-util.c:608
msgid "An invalid location list has been received."
msgstr "Une liste d'emplacements non valide a été reçue."
-#: ../src/mn-util.c:650
+#: ../src/mn-util.c:651
msgid "An invalid Mozilla location has been received."
msgstr "Un emplacement Mozilla non valide a été reçu."
-#: ../src/mn-util.c:726
+#: ../src/mn-util.c:727
msgid "Unable to display help"
msgstr "Impossible d'afficher l'aide"
-#: ../src/mn-util.c:738
+#: ../src/mn-util.c:739
msgid "Unable to open link"
msgstr "Impossible d'ouvrir le lien"
-#: ../src/mn-util.c:752
+#: ../src/mn-util.c:753
#, c-format
msgid "Unable to create a thread: %s."
msgstr "Impossible de créer un thread : %s."
-#: ../src/mn-util.c:929
+#: ../src/mn-util.c:930
#, c-format
msgid ""
"The following location is invalid:\n"
@@ -1544,68 +1578,68 @@ msgstr[1] ""
"\n"
"%s"
-#: ../src/mn-util.c:945
+#: ../src/mn-util.c:946
msgid "A fatal error has occurred in Mail Notification"
msgstr "Une erreur fatale s'est produite dans l'avertisseur de courrier"
-#: ../src/mn-util.c:989
+#: ../src/mn-util.c:990
#, c-format
msgid "unable to get current time: %s"
msgstr "impossible d'obtenir l'heure courante : %s"
-#: ../src/mn-util.c:1304
+#: ../src/mn-util.c:1359
#, c-format
msgid "%i second ago"
msgid_plural "%i seconds ago"
msgstr[0] "il y a %i seconde"
msgstr[1] "il y a %i secondes"
-#: ../src/mn-util.c:1308
+#: ../src/mn-util.c:1363
#, c-format
msgid "about %i minute ago"
msgid_plural "about %i minutes ago"
msgstr[0] "il y a approximativement %i minute"
msgstr[1] "il y a approximativement %i minutes"
-#: ../src/mn-util.c:1313
+#: ../src/mn-util.c:1368
#, c-format
msgid "about %i hour ago"
msgid_plural "about %i hours ago"
msgstr[0] "il y a approximativement %i heure"
msgstr[1] "il y a approximativement %i heures"
-#: ../src/mn-util.c:1318
+#: ../src/mn-util.c:1373
#, c-format
msgid "about %i day ago"
msgid_plural "about %i days ago"
msgstr[0] "il y a approximativement %i jour"
msgstr[1] "il y a approximativement %i jours"
-#: ../src/mn-util.c:1323
+#: ../src/mn-util.c:1378
#, c-format
msgid "about %i week ago"
msgid_plural "about %i weeks ago"
msgstr[0] "il y a approximativement %i semaine"
msgstr[1] "il y a approximativement %i semaines"
-#: ../src/mn-util.c:1336
+#: ../src/mn-util.c:1391
msgid "unknown date"
msgstr "date inconnue"
-#: ../src/mn-util.c:1371
+#: ../src/mn-util.c:1426
msgid "A command error has occurred in Mail Notification"
msgstr "Une erreur de commande s'est produite dans l'avertisseur de courrier"
-#: ../src/mn-vfs-mailbox.gob:228
+#: ../src/mn-vfs-mailbox.gob:249
#, c-format
msgid "unable to monitor %s (%s), poll mode activated"
msgstr "impossible de surveiller %s (%s), vérification explicite activée"
-#: ../src/mn-vfs-mailbox.gob:392
+#: ../src/mn-vfs-mailbox.gob:421
msgid "unknown mailbox format"
msgstr "format de boîte aux lettres inconnu"
-#: ../src/mn-vfs-mailbox.gob:392
+#: ../src/mn-vfs-mailbox.gob:421
msgid "does not exist"
msgstr "n'existe pas"
diff --git a/po/nl.po b/po/nl.po
@@ -4,14 +4,14 @@
# This file is distributed under the same license as the
# mail-notification package.
#
-# Marcel J. Zwiebel <mj.zwiebel@nonux.nl>, 2006
+# Marcel J. Zwiebel <mj.zwiebel@nonux.nl>, 2006-2007
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 4.0\n"
+"Project-Id-Version: mail-notification 4.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-27 22:02+0100\n"
-"PO-Revision-Date: 2007-01-17 16:02+0100\n"
+"POT-Creation-Date: 2007-06-19 08:41+0200\n"
+"PO-Revision-Date: 2007-06-26 12:07+0200\n"
"Last-Translator: Marcel J. Zwiebel <mj.zwiebel@nonux.nl>\n"
"Language-Team: Marcel J. Zwiebel <mj.zwiebel@nonux.nl>\n"
"MIME-Version: 1.0\n"
@@ -49,8 +49,8 @@ msgstr "E-mail notificatie instellen"
#: ../data/mail-notification-properties.desktop.in.h:2
#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:234
-#: ../src/mn-main.c:142 ../src/mn-main.c:348 ../src/mn-main.c:364
-#: ../src/mn-main.c:440
+#: ../src/mn-main.c:143 ../src/mn-main.c:350 ../src/mn-main.c:371
+#: ../src/mn-main.c:445
msgid "Mail Notification"
msgstr "E-mail notificatie"
@@ -95,16 +95,16 @@ msgid ""
"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
"amount of time to wait before expiring message popups (minutes part)."
msgstr ""
-"Als /apps/mail-notification/popups/expiration/enabled is \"true\", de wachttijd "
-"voordat het berichtvenster verlopen verschijnt (minuten)."
+"Als /apps/mail-notification/popups/expiration/enabled is \"true\", de "
+"wachttijd voordat het berichtvenster verlopen verschijnt (minuten)."
#: ../data/mail-notification.schemas.in.in.h:10
msgid ""
"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
"amount of time to wait before expiring message popups (seconds part)."
msgstr ""
-"Als /apps/mail-notification/popups/expiration/enabled is \\\"true\\\", de wachttijd "
-"voordat het berichtvenster verlopen verschijnt (seconden)."
+"Als /apps/mail-notification/popups/expiration/enabled is \\\"true\\\", de "
+"wachttijd voordat het berichtvenster verlopen verschijnt (seconden)."
#: ../data/mail-notification.schemas.in.in.h:11
msgid "Mail changed command"
@@ -115,60 +115,65 @@ msgid "Mail read command"
msgstr "Opdracht bij het lezen van e-mail"
#: ../data/mail-notification.schemas.in.in.h:13
-msgid "Message popups position"
-msgstr "Positie van het e-mail popupvenster"
+#, fuzzy
+msgid "Message popups actions"
+msgstr "Popupvenster acties"
#: ../data/mail-notification.schemas.in.in.h:14
+msgid "Message popups position"
+msgstr "Popupvenster plaatsing"
+
+#: ../data/mail-notification.schemas.in.in.h:15
msgid "Minutes to wait before expiring message popups"
msgstr "Wachttijd in minuten voordat het e-mail popupvenster gesloten wordt"
-#: ../data/mail-notification.schemas.in.in.h:15
+#: ../data/mail-notification.schemas.in.in.h:16
msgid "New mail command"
msgstr "Opdracht bij ontvangst van nieuwe e-mail"
-#: ../data/mail-notification.schemas.in.in.h:16
+#: ../data/mail-notification.schemas.in.in.h:17
msgid "Run a command when all mail is read"
msgstr "Opdracht na het lezen van alle nieuwe e-mail"
-#: ../data/mail-notification.schemas.in.in.h:17
+#: ../data/mail-notification.schemas.in.in.h:18
msgid "Run a command when new mail arrives"
msgstr "Opdracht na het lezen van alle nieuwe e-mail"
-#: ../data/mail-notification.schemas.in.in.h:18
+#: ../data/mail-notification.schemas.in.in.h:19
msgid "Run a command when the message list changes"
msgstr "Opdracht na het wijzigen van de berichtenlijst"
-#: ../data/mail-notification.schemas.in.in.h:19
+#: ../data/mail-notification.schemas.in.in.h:20
msgid "Seconds to wait before expiring message popups"
msgstr "Wachttijd in seconden voordat het e-mail popupvenster gesloten wordt"
-#: ../data/mail-notification.schemas.in.in.h:20
+#: ../data/mail-notification.schemas.in.in.h:21
msgid ""
"The action to perform when the icon is clicked. Must be \"display-properties-"
"dialog\", \"launch-mail-reader\", \"open-latest-message\" or \"update-mail-"
"status\"."
msgstr ""
-"De opdracht die uitgevoerd moet worden bij een muisklik op het icoon. "
-"Heeft ofwel de waarde \"display-properties-"
-"dialog\", \"launch-mail-reader\" of \"update-mail-status\"."
+"De opdracht die uitgevoerd moet worden bij een muisklik op het icoon. Heeft "
+"ofwel de waarde \"display-properties-dialog\", \"launch-mail-reader\" of "
+"\"update-mail-status\"."
-#: ../data/mail-notification.schemas.in.in.h:21
+#: ../data/mail-notification.schemas.in.in.h:22
msgid "The command to run when all mail is read."
msgstr "Opdracht die uitgevoerd moet worden wanneer alle e-mail gelezen is"
-#: ../data/mail-notification.schemas.in.in.h:22
+#: ../data/mail-notification.schemas.in.in.h:23
msgid "The command to run when new mail arrives."
msgstr "Opdracht die uitgevoerd moet worden wanneer nieuwe e-mail arriveert."
-#: ../data/mail-notification.schemas.in.in.h:23
+#: ../data/mail-notification.schemas.in.in.h:24
msgid "The command to run when the message list changes."
msgstr "Opdracht die uitgevoerd moet worden wanneer de berichtenlijst wijzigt."
-#: ../data/mail-notification.schemas.in.in.h:24
+#: ../data/mail-notification.schemas.in.in.h:25
msgid "The height of the properties dialog in pixels."
msgstr "Hoogte van het instellingen dialoogvenster in pixels"
-#: ../data/mail-notification.schemas.in.in.h:25
+#: ../data/mail-notification.schemas.in.in.h:26
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
@@ -176,54 +181,62 @@ msgstr ""
"De lijst met betrouwbare SSL/TLS-servers (hostname:port) zonder X509-"
"certificaat."
-#: ../data/mail-notification.schemas.in.in.h:26
+#: ../data/mail-notification.schemas.in.in.h:27
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr ""
"De lijst met betrouwbare X509-certificaten, gerepresenteerd door hun "
"MD5vingerafdruk."
-#: ../data/mail-notification.schemas.in.in.h:27
+#: ../data/mail-notification.schemas.in.in.h:28
+msgid ""
+"The ordered list of actions to include in the message popups. Each element "
+"must be \"open\", \"mark-as-read\", \"mark-as-spam\" or \"delete\"."
+msgstr ""
+"De geordende lijst van acties getoond in het popupvenster. Elk element "
+"moet zijn \"open\", \"mark-as-read\", \"mark-as-spam\" of \"delete\"."
+
+#: ../data/mail-notification.schemas.in.in.h:29
msgid "The position of the message popups. Must be \"attached\" or \"free\"."
msgstr "De positie van het popupvenster. Moet zijn \"attached\" of \"free\"."
-#: ../data/mail-notification.schemas.in.in.h:28
+#: ../data/mail-notification.schemas.in.in.h:30
msgid ""
"The type of mail summary to display in the icon's tooltip. Must be \"standard"
"\", \"compact\" or \"none\"."
msgstr ""
-"Het type e-mailoverzicht dat getoond wordt in de tooltip van het icoon. Moet zijn \"standard"
-"\",\"compact\" of \"none\"."
+"Het type e-mailoverzicht dat getoond wordt in de tooltip van het icoon. Moet "
+"zijn \"standard\",\"compact\" of \"none\"."
-#: ../data/mail-notification.schemas.in.in.h:29
+#: ../data/mail-notification.schemas.in.in.h:31
msgid "The width of the properties dialog in pixels."
msgstr "Hoogte van het instellingen dialoogvenster in pixels."
-#: ../data/mail-notification.schemas.in.in.h:30
+#: ../data/mail-notification.schemas.in.in.h:32
msgid "Tooltip mail summary"
msgstr "Hoogte van het instellingen dialoogvenster in pixels."
-#: ../data/mail-notification.schemas.in.in.h:31
+#: ../data/mail-notification.schemas.in.in.h:33
msgid "Trusted servers list"
msgstr "Lijst trusted servers"
-#: ../data/mail-notification.schemas.in.in.h:32
+#: ../data/mail-notification.schemas.in.in.h:34
msgid "Whether the status icon should blink on errors or not."
msgstr "Moet het e-mail icoon bij het optreden van fouten knipperen"
-#: ../data/mail-notification.schemas.in.in.h:33
+#: ../data/mail-notification.schemas.in.in.h:35
msgid "Whether to display an icon when there is no new mail or not."
msgstr "Moet een icoon getoond worden als nieuwe e-mail arriveert."
-#: ../data/mail-notification.schemas.in.in.h:34
+#: ../data/mail-notification.schemas.in.in.h:36
msgid "Whether to display seen mail or not."
msgstr "Moet eerder getoonde e-mail opnieuw getoond worden."
-#: ../data/mail-notification.schemas.in.in.h:35
+#: ../data/mail-notification.schemas.in.in.h:37
msgid "Whether to enable message popups or not."
msgstr "Moeten popupvensters ingeschakeld worden."
-#: ../data/mail-notification.schemas.in.in.h:36
+#: ../data/mail-notification.schemas.in.in.h:38
msgid ""
"Whether to expire message popups or not. Must be \"default\", \"false\" or "
"\"true\"."
@@ -231,19 +244,19 @@ msgstr ""
"Moeten popupvenster automatisch gesloten worden. Moet zijn \"default\", "
"\"false\" of \"true\"."
-#: ../data/mail-notification.schemas.in.in.h:37
+#: ../data/mail-notification.schemas.in.in.h:39
msgid "Whether to run a command when all mail is read or not."
msgstr "Moet een opdracht uitgevoerd worden als alle e-mail gelezen is."
-#: ../data/mail-notification.schemas.in.in.h:38
+#: ../data/mail-notification.schemas.in.in.h:40
msgid "Whether to run a command when new mail arrives or not."
msgstr "Moet een opdracht uitgevoerd worden als een nieuwe e-mail arriveert."
-#: ../data/mail-notification.schemas.in.in.h:39
+#: ../data/mail-notification.schemas.in.in.h:41
msgid "Whether to run a command when the message list changes or not."
msgstr "Moet een opdracht uitgevoerd worden als de berichtenlijst wijzigt."
-#: ../data/mail-notification.schemas.in.in.h:40
+#: ../data/mail-notification.schemas.in.in.h:42
msgid "Width of properties dialog"
msgstr "Breedte van het instellingenvenster"
@@ -258,7 +271,9 @@ msgstr "De oriëntatie van het mededelingengebied."
#. translators: header capitalization
#: ../src/mn-about-dialog.gob:50
msgid "A Mail Notification Icon"
-msgstr "Een e-mail icoon dat verschijnt als er nieuwe e-mail berichten in uw postbus zijn gearriveerd."
+msgstr ""
+"Een e-mail icoon dat verschijnt als er nieuwe e-mail berichten in uw postbus "
+"zijn gearriveerd."
#.
#. * translators: Your Name <your-email>
@@ -268,7 +283,7 @@ msgstr "Een e-mail icoon dat verschijnt als er nieuwe e-mail berichten in uw pos
msgid "translator-credits"
msgstr "Marcel J. Zwiebel <mj.zwiebel@nonux.nl>"
-#: ../src/mn-auth-combo-box.gob:104
+#: ../src/mn-auth-combo-box.gob:101
#: ../src/mn-autodetect-mailbox-properties.gob:110
msgid "Autodetect"
msgstr "Automatisch detecteren"
@@ -316,95 +331,112 @@ msgstr "bestand kan niet gesloten worden: %s"
msgid "unable to open mailbox: %s"
msgstr "postbus kan niet geopend worden: %s"
-#: ../src/mn-client-session.c:248
+#: ../src/mn-client-session.c:257
#, c-format
msgid "resolving %s"
msgstr "verbinding maken met %s"
-#: ../src/mn-client-session.c:264
+#: ../src/mn-client-session.c:273
#, c-format
msgid "unable to resolve %s: %s"
msgstr "er kon geen verbinding worden gemaakt met %s: %s"
-#: ../src/mn-client-session.c:305
+#: ../src/mn-client-session.c:314
#, c-format
msgid "network address #%i"
msgstr "netwerkadres #%i"
-#: ../src/mn-client-session.c:308
+#: ../src/mn-client-session.c:317
#, c-format
msgid "unable to convert network address #%i into textual form: %s"
msgstr "het netwerkadres #%i kan niet als tekst geconverteerd worden: %s"
-#: ../src/mn-client-session.c:319
+#: ../src/mn-client-session.c:328
#, c-format
msgid "%s: unsupported address family"
msgstr "%s: adresfamilie wordt niet ondersteund "
-#: ../src/mn-client-session.c:326
+#: ../src/mn-client-session.c:335
#, c-format
msgid "%s: unable to create socket: %s"
msgstr "%s: Socket kon niet aangemaakt worden: %s"
-#: ../src/mn-client-session.c:330
+#: ../src/mn-client-session.c:339
#, c-format
msgid "connecting to %s (%s) port %i"
msgstr "connectie maken met %s (%s) via poort %i"
-#: ../src/mn-client-session.c:333
+#: ../src/mn-client-session.c:342
#, c-format
msgid "unable to connect: %s"
msgstr "er kan geen verbinding worden gemaakt: %s"
-#: ../src/mn-client-session.c:338
+#: ../src/mn-client-session.c:347
msgid "connected successfully"
msgstr "verbinding geslaagd"
#. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:352
+#: ../src/mn-client-session.c:361
#, c-format
msgid "unable to connect to %s"
msgstr "er kan geen verbinding gemaakt worden met %s"
-#: ../src/mn-client-session.c:379
+#: ../src/mn-client-session.c:388
#, c-format
msgid "unable to initialize the OpenSSL library: %s"
msgstr "de OpenSSL bibliotheek kan niet geinitialiseerd worden: %s"
-#: ../src/mn-client-session.c:387
+#: ../src/mn-client-session.c:396
#, c-format
msgid "unable to create a SSL/TLS object: %s"
msgstr "een SSL/TLS object kan niet aangemaakt worden: %s"
-#: ../src/mn-client-session.c:393
+#: ../src/mn-client-session.c:402
#, c-format
msgid "unable to set the SSL/TLS file descriptor: %s"
msgstr "een SSL/TLS descriptor kan niet gezet worden: %s"
-#: ../src/mn-client-session.c:399
+#: ../src/mn-client-session.c:408
#, c-format
msgid "unable to perform the SSL/TLS handshake: %s"
msgstr "een SSL/TLS handshake kan niet uitgevoerd worden: %s"
-#: ../src/mn-client-session.c:405
+#: ../src/mn-client-session.c:414
msgid "untrusted server"
msgstr "niet-betrouwbare server"
-#: ../src/mn-client-session.c:409
+#: ../src/mn-client-session.c:418
#, c-format
msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
msgstr "een SSL/TLS layer is nu actief (%s, %s %i-Bit)"
-#: ../src/mn-client-session.c:456
+#: ../src/mn-client-session.c:589
+msgid "server name not found in certificate"
+msgstr "servernaam niet gevonden in het certificaat"
+
+#: ../src/mn-client-session.c:594
#, c-format
-msgid "%s, fingerprint: %s"
-msgstr "%s, vingerafdruk %s"
+msgid ""
+"user-provided server name \"%s\" does not match certificate-provided server "
+"name \"%s\""
+msgstr ""
+"door de gebruiker toegekende servernaam \"%s\" komt niet overeen met de "
+"servernaam \"%s\" toegekend door het certificaat"
+
+#: ../src/mn-client-session.c:612
+#, c-format
+msgid ""
+"user-provided server name \"%s\" matches none of the certificate-provided "
+"server names %s"
+msgstr ""
+"door de gebruiker toegekende servernaam \"%s\" komt niet voor in de "
+"servernamen \"%s\" toegekend door het certificaat"
-#: ../src/mn-client-session.c:485
+#: ../src/mn-client-session.c:688
msgid "missing certificate"
msgstr "missend certificaat"
-#: ../src/mn-client-session.c:511
+#: ../src/mn-client-session.c:717
#, c-format
msgid ""
"Mail Notification was unable to trust \"%s\" (%s). It is possible that "
@@ -415,129 +447,137 @@ msgid ""
"to \"%s\". If you choose to connect to the server, this message will not be "
"shown again."
msgstr ""
-"E-mail notificatie kan \"%s\" niet vertrouwen (%s). Het is mogelijk dat iemand "
-"uw communicatie ondesrchept om vertrouwelijke informatie te verkrijgen.\n"
+"E-mail notificatie kan \"%s\" niet vertrouwen (%s). Het is mogelijk dat "
+"iemand uw communicatie ondesrchept om vertrouwelijke informatie te "
+"verkrijgen.\n"
"\n"
"U moet alleen verbinding maken met de server als u er zeker van bent dat u "
"verbinding heeft met \"%s\". Als u er toch voor kiest om verbinding met de "
"server te maken, dan zal deze boodschap niet meer getoond worden."
-#: ../src/mn-client-session.c:526
+#: ../src/mn-client-session.c:731
+#, fuzzy, c-format
+msgid "Certificate fingerprint: %s."
+msgstr "Certificaat vingerafdruk: %s"
+
+#: ../src/mn-client-session.c:738
msgid "Connect to untrusted server?"
msgstr "Wilt u verbinding maken met een niet-betrouwbare server?"
-#: ../src/mn-client-session.c:591
+#: ../src/mn-client-session.c:803
#, c-format
msgid "response \"%s\" is not valid in current context"
msgstr "het antwoord \"%s\" is niet geldig binnen de huidige context"
-#: ../src/mn-client-session.c:620
+#: ../src/mn-client-session.c:832
#, c-format
msgid "unable to parse response \"%s\""
msgstr "het antwoord \"%s\" kan niet verwerkt worden"
-#: ../src/mn-client-session.c:670 ../src/mn-client-session.c:677
+#: ../src/mn-client-session.c:882 ../src/mn-client-session.c:889
#, c-format
msgid "unable to read from server: %s"
msgstr "lezen van de server is niet mogelijk: %s"
-#: ../src/mn-client-session.c:675
+#: ../src/mn-client-session.c:887
msgid "unable to read from server: EOF"
msgstr "lezen van de server is niet mogelijk: EOF"
-#: ../src/mn-client-session.c:687
+#: ../src/mn-client-session.c:899
#, c-format
msgid "unable to decode data using SASL: %s"
msgstr "de gegevens kunnen niet met behulp van SASL gedecodeerd worden: %s"
-#: ../src/mn-client-session.c:832
+#: ../src/mn-client-session.c:1044
#, c-format
msgid "unable to encode data using SASL: %s"
msgstr "de gegevens kunnen niet met behulp van SASL gecodeerd worden: %s"
-#: ../src/mn-client-session.c:863 ../src/mn-client-session.c:870
+#: ../src/mn-client-session.c:1075 ../src/mn-client-session.c:1082
#, c-format
msgid "unable to write to server: %s"
msgstr "schrijven op de server is niet mogelijk: %s"
-#: ../src/mn-client-session.c:868
+#: ../src/mn-client-session.c:1080
msgid "unable to write to server: EOF"
msgstr "schrijven op de server is niet mogelijk: EOF"
-#: ../src/mn-client-session.c:899 ../src/mn-pop3-mailbox.gob:434
+#: ../src/mn-client-session.c:1111 ../src/mn-pop3-mailbox.gob:434
#, c-format
msgid "unable to encode Base64: %s"
msgstr "de gegevens kunnen niet met behulp van Base64 gecodeerd worden: %s"
-#: ../src/mn-client-session.c:1076
+#: ../src/mn-client-session.c:1288
#, c-format
msgid "unable to initialize the SASL library: %s"
msgstr "De SASL-bibliotheek kan niet geinitialiseerd worden: %s"
-#: ../src/mn-client-session.c:1088
+#: ../src/mn-client-session.c:1300
#, c-format
msgid "unable to retrieve local address of socket: %s"
msgstr "het locale adres van socket kan niet opgevraagd worden: %s"
-#: ../src/mn-client-session.c:1094
+#: ../src/mn-client-session.c:1306
#, c-format
msgid "unable to retrieve remote address of socket: %s"
msgstr "het externe adres van socket kan niet opgevraagd worden: %s"
-#: ../src/mn-client-session.c:1128
+#: ../src/mn-client-session.c:1340
#, c-format
msgid "unable to set SASL security properties: %s"
msgstr "de SASL-veiligheidseigenschappen kunnen niet gezet worden: %s"
-#: ../src/mn-client-session.c:1152
+#: ../src/mn-client-session.c:1364
msgid ""
"unable to start SASL authentication: SASL asked for something we did not know"
msgstr ""
"de SASL-authenticatie kan niet gestart worden: SASL vroeg naar iets waar we "
"geen verstand van hebben"
-#: ../src/mn-client-session.c:1171
+#: ../src/mn-client-session.c:1383
#, c-format
msgid "unable to start SASL authentication: %s"
msgstr "de SASL-authenticatie kan niet gestart worden: %s"
-#: ../src/mn-client-session.c:1175
+#: ../src/mn-client-session.c:1387
#, c-format
msgid "unable to create a SASL connection: %s"
msgstr "Er kan geen SASL-verbinding worden gemaakt: %s"
-#: ../src/mn-client-session.c:1222
+#: ../src/mn-client-session.c:1434
msgid "SASL asked for something we did not know, aborting SASL authentication"
-msgstr "SASL vroeg naar iets waar we geen verstand van hebben, SASL-authenticatie wordt afgebroken"
+msgstr ""
+"SASL vroeg naar iets waar we geen verstand van hebben, SASL-authenticatie "
+"wordt afgebroken"
-#: ../src/mn-client-session.c:1239
+#: ../src/mn-client-session.c:1451
#, c-format
msgid "%s, aborting SASL authentication"
msgstr "%s, SASL-authenticatie wordt afgebroken"
#. compliance error
-#: ../src/mn-client-session.c:1244
+#: ../src/mn-client-session.c:1456
#, c-format
msgid "unable to decode Base64 input from server: %s"
msgstr "de Base64-invoer van de server kan niet gedecodeerd worden: %s"
-#: ../src/mn-client-session.c:1280
+#: ../src/mn-client-session.c:1492
#, c-format
msgid "a SASL security layer of strength factor %i is now active"
msgstr "de SASL-veiligheidslaag met sterkte niveau %i is nu geactiveerd"
#. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1285
+#: ../src/mn-client-session.c:1497
#, c-format
msgid "unable to get SASL_MAXOUTBUF property: %s"
msgstr "de waarde SASL_MAXOUTBUF kan niet worden gevonden: %s"
-#: ../src/mn-client-session.c:1291
+#: ../src/mn-client-session.c:1503
#, c-format
msgid "warning: unable to get SASL_SSF property: %s"
msgstr "waarschuwing: de waarde SASL_SSF kan niet worden gevonden: %s"
-#: ../src/mn-client-session.c:1450
+#: ../src/mn-client-session.c:1662
msgid "unknown server error"
msgstr "onbekende server-fout :-("
@@ -557,25 +597,25 @@ msgstr "Onderwerp"
msgid "Sent"
msgstr "Verzonden"
-#: ../src/mn-conf.c:281
+#: ../src/mn-conf.c:282
msgid "A directory creation error has occurred"
msgstr "Bij het aanmaken van een map is een fout opgetreden"
-#: ../src/mn-conf.c:282
+#: ../src/mn-conf.c:283
#, c-format
msgid "Unable to create directory \"%s\": %s."
msgstr "De map \"%s\" kan niet aangemaakt worden: %s."
-#: ../src/mn-conf.c:406
+#: ../src/mn-conf.c:407
#, c-format
msgid "recursively unsetting %s"
msgstr "%s recursief terugzetten"
-#: ../src/mn-conf.c:410
+#: ../src/mn-conf.c:411
msgid "syncing the GConf database"
msgstr "synchroniseren met de GConf-database"
-#: ../src/mn-conf.c:413
+#: ../src/mn-conf.c:414
msgid "completed"
msgstr "voltooid"
@@ -583,7 +623,7 @@ msgstr "voltooid"
msgid "invalid location"
msgstr "ongeldige locatie"
-#: mn-evolution-folder-tree-control.gob:69
+#: ../src/mn-evolution-folder-tree-control.gob:69
msgid "The currently selected URI"
msgstr "De huidige geselecteerde URI"
@@ -593,12 +633,14 @@ msgid "Folder"
msgstr "Map"
#: ../src/mn-evolution-mailbox-properties.gob:204
+#, fuzzy
msgid ""
"Mail Notification can not contact Evolution. Make sure that Evolution is "
-"running and that the Evolution Mail Notification plugin is loaded."
+"running and that the Evolution Jean-Yves Lefort's Mail Notification plugin "
+"is loaded."
msgstr ""
"E-mail notificatie kan geen verbinding maken met Evolution. Controleer of "
-"Evolution gestart is en dat de Mail Notification plugin geactiveerd is."
+"Evolution gestart is en dat Jean-Yves Lefort's Mail Notification plugin geactiveerd is."
#: ../src/mn-evolution-mailbox.gob:78
msgid "folder not found"
@@ -625,7 +667,7 @@ msgstr ""
"Bonobo kan de %s server niet vinden. Controleer aub de installatie van E-"
"mail notificatie."
-#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:518
+#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:523
#, c-format
msgid ""
"Bonobo was unable to register the %s server. Please check your Mail "
@@ -673,7 +715,7 @@ msgstr "er kan niet gezocht worden in in %s: %s"
msgid "unable to tell position of %s: %s"
msgstr "onmogelijk om de positie van %s vast te stellen: %s"
-#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:167
+#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:174
#, c-format
msgid "unable to close %s: %s"
msgstr "%s kan niet gesloten worden: %s"
@@ -709,41 +751,38 @@ msgstr "Au_tomatische detectie"
msgid "Al_ways"
msgstr "Al_tijd"
-#: ../src/mn-imap-mailbox.gob:385
+#: ../src/mn-imap-mailbox.gob:381
msgid "server did not send capabilities"
msgstr "geen ontvangst van de server-mogelijkheden"
-#: ../src/mn-imap-mailbox.gob:552
+#: ../src/mn-imap-mailbox.gob:548
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
-msgstr "de server heeft geroepen LOGINDISABLED, LOGIN-authorisatie wordt niet gebruikt"
+msgstr ""
+"de server heeft geroepen LOGINDISABLED, LOGIN-authorisatie wordt niet "
+"gebruikt"
-#: ../src/mn-imap-mailbox.gob:553
+#: ../src/mn-imap-mailbox.gob:549
msgid "unable to login"
msgstr "aanmelding mislukt"
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:753
-msgid "server did not send all the messages we requested"
-msgstr "de server heeft niet alle opgegeven berichten verzonden"
-
-#: ../src/mn-imap-mailbox.gob:823
+#: ../src/mn-imap-mailbox.gob:822
msgid "unable to fetch message"
msgstr "bericht kon niet opgehaald worden"
-#: ../src/mn-imap-mailbox.gob:848
+#: ../src/mn-imap-mailbox.gob:838
msgid ""
"\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
"logging out"
msgstr ""
-"\"Gebruik de IDLE-extensie\" wordt gezet op \"nooit\" in de postbus-eigenschap, "
-"afmelden"
+"\"Gebruik de IDLE-extensie\" wordt gezet op \"nooit\" in de postbus-"
+"eigenschap, afmelden"
-#: ../src/mn-imap-mailbox.gob:859
+#: ../src/mn-imap-mailbox.gob:849
#, c-format
msgid "the remote server runs %s, not using the IDLE extension"
msgstr "de externe server gebruikt %s, de IDLE-extensie wordt niet gebruikt"
-#: ../src/mn-imap-mailbox.gob:864
+#: ../src/mn-imap-mailbox.gob:854
#, c-format
msgid ""
"the remote server runs %s, the IDLE extension might not function properly"
@@ -751,15 +790,15 @@ msgstr ""
"de externe server gebruikt %s, de IDLE-extensie zou misschien niet goed "
"kunnen werken"
-#: ../src/mn-imap-mailbox.gob:873
+#: ../src/mn-imap-mailbox.gob:863
msgid "the remote server does not support the IDLE extension, logging out"
msgstr "de externe server ondersteund de IDLE-extensie niet, er wordt afgemeld"
-#: ../src/mn-imap-mailbox.gob:1378 ../src/mn-pop3-mailbox.gob:297
+#: ../src/mn-imap-mailbox.gob:1368 ../src/mn-pop3-mailbox.gob:297
msgid "server does not support in-band SSL/TLS"
msgstr "de server ondersteund geen in-band SSL/TLS"
-#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:954
+#: ../src/mn-imap-mailbox.gob:1392 ../src/mn-pop3-mailbox.gob:956
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
@@ -767,30 +806,26 @@ msgstr ""
"u heeft authenticatie met behulp van SASL gekozen, echter SASL-ondersteuning "
"is bij de aanmaak van het programma niet ingesteld"
-#: ../src/mn-imap-mailbox.gob:1412 ../src/mn-pop3-mailbox.gob:974
+#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:976
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "onbekend authenticatie-mechanisme \"%s\""
-#: ../src/mn-imap-mailbox.gob:1444 ../src/mn-pop3-mailbox.gob:1010
+#: ../src/mn-imap-mailbox.gob:1434 ../src/mn-pop3-mailbox.gob:1012
#, c-format
msgid "disabling mechanism \"%s\" and retrying SASL authentication"
-msgstr "het mechanisme \"%s\" wordt uitgeschakeld en een nieuwe poging wordt gewaagd met behulp van SASL-authenticatie"
+msgstr ""
+"het mechanisme \"%s\" wordt uitgeschakeld en een nieuwe poging wordt gewaagd "
+"met behulp van SASL-authenticatie"
-#: ../src/mn-imap-mailbox.gob:1456
+#: ../src/mn-imap-mailbox.gob:1446
msgid "falling back to IMAP LOGIN authentication"
msgstr "er wordt teruggevallen op authenticatie via IMAP LOGIN"
-#: ../src/mn-imap-mailbox.gob:1468 ../src/mn-pop3-mailbox.gob:1039
+#: ../src/mn-imap-mailbox.gob:1458 ../src/mn-pop3-mailbox.gob:1041
msgid "authentication failed"
msgstr "authenticatie mislukt"
-#. success; caller must switch state itself
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:1529
-msgid "server did not send search results"
-msgstr "de server heeft geen zoekresultaten verzonden"
-
#. translators: header capitalization
#: ../src/mn-mail-icon.gob:93
msgid "_Mail Reader"
@@ -840,16 +875,16 @@ msgstr "%s-postbus"
msgid "detecting mailbox type..."
msgstr "detecteren postbustype..."
-#: ../src/mn-mailbox.gob:504
+#: ../src/mn-mailbox.gob:507
msgid "\"type\" attribute missing"
msgstr "eigenschap \"type\" werd niet gevonden"
-#: ../src/mn-mailbox.gob:511
+#: ../src/mn-mailbox.gob:514
#, c-format
msgid "unknown mailbox type \"%s\""
msgstr "onbekend type postbus \"%s\""
-#: ../src/mn-mailbox.gob:907
+#: ../src/mn-mailbox.gob:910
#, c-format
msgid "property \"%s\" has no value"
msgstr "eigenschap \"%s\" heeft geen waarde"
@@ -889,7 +924,8 @@ msgstr "Op regel %i: onbekend element \"%s\"."
msgid "An error has occurred while loading the mailboxes configuration"
msgid_plural "Errors have occurred while loading the mailboxes configuration"
msgstr[0] "Bij het laden van de postbusinstellingen is een fout opgetreden."
-msgstr[1] "Bij het laden van de postbusinstellingen zijn meerdere fouten opgetreden."
+msgstr[1] ""
+"Bij het laden van de postbusinstellingen zijn meerdere fouten opgetreden."
#: ../src/mn-mailboxes.gob:388
msgid "Unable to save the mailboxes configuration"
@@ -958,70 +994,70 @@ msgstr "de map \"%s\" kan niet gesloten worden: %s"
msgid "error while reading folder \"%s\": %s"
msgstr "fout bij het lezen van map \"%s\": %s"
-#: ../src/mn-main.c:109
+#: ../src/mn-main.c:110
msgid "yes"
msgstr "ja"
-#: ../src/mn-main.c:109
+#: ../src/mn-main.c:110
msgid "no"
msgstr "nee"
-#: ../src/mn-main.c:142
+#: ../src/mn-main.c:143
#, c-format
msgid "%s version %s\n"
msgstr "%s versie %s\n"
-#: ../src/mn-main.c:147
+#: ../src/mn-main.c:148
msgid "Mailbox backends:\n"
msgstr "Postbuskoppelingen:\n"
-#: ../src/mn-main.c:152
+#: ../src/mn-main.c:153
msgid "POP3 and IMAP features:\n"
msgstr "Ingebouwde POP3- und IMAP-mogelijkheden:\n"
-#: ../src/mn-main.c:157
+#: ../src/mn-main.c:158
msgid "Sylpheed features:\n"
msgstr "Sylpheed-funtionaliteit:\n"
-#: ../src/mn-main.c:205
+#: ../src/mn-main.c:206
#, c-format
msgid "A Bonobo exception (%s) has occurred in %s()."
msgstr "Een Bonobo-exceptie (%s) is opgetreden in %s()."
-#: ../src/mn-main.c:247
+#: ../src/mn-main.c:248
#, c-format
msgid "%s option ignored since Mail Notification is not already running"
msgstr "optie %s wordt genegeerd omdat E-mail notificatie nog niet actief is"
-#: ../src/mn-main.c:267
+#: ../src/mn-main.c:268
msgid "Show version information"
msgstr "Toon versie-informatie"
-#: ../src/mn-main.c:276
+#: ../src/mn-main.c:277
msgid "Enable informational output"
msgstr "Uitvoer informatie activeren"
-#: ../src/mn-main.c:285
+#: ../src/mn-main.c:286
msgid "Display the properties dialog"
msgstr "Toon het eigenschappenvenster"
-#: ../src/mn-main.c:294
+#: ../src/mn-main.c:295
msgid "Display the about dialog"
msgstr "Toon het informatievenster"
-#: ../src/mn-main.c:303
+#: ../src/mn-main.c:304
msgid "Update the mail status"
msgstr "Kijk of er nieuwe berichten zijn"
-#: ../src/mn-main.c:312
+#: ../src/mn-main.c:313
msgid "Print a XML mail summary"
msgstr "Druk een XML-overzicht af"
-#: ../src/mn-main.c:321
+#: ../src/mn-main.c:322
msgid "Unset obsolete GConf configuration"
msgstr "Geef overbodige GConf-configuratie vrij"
-#: ../src/mn-main.c:330
+#: ../src/mn-main.c:331
msgid "Quit Mail Notification"
msgstr "E-mail notificatie afsluiten"
@@ -1029,11 +1065,11 @@ msgstr "E-mail notificatie afsluiten"
#. * We cannot use mn_fatal_error_dialog() because gtk_init() has
#. * not been called yet.
#.
-#: ../src/mn-main.c:356
+#: ../src/mn-main.c:358
msgid "multi-threading is not available"
msgstr "multi-threading wordt niet ondersteund"
-#: ../src/mn-main.c:407
+#: ../src/mn-main.c:412
msgid ""
"Bonobo could not locate the automation object. Please check your Mail "
"Notification installation."
@@ -1041,79 +1077,79 @@ msgstr ""
"Bonobo kan het automation object niet vinden. Controleer aub de installatie "
"van E-mail notificatie."
-#: ../src/mn-main.c:413
+#: ../src/mn-main.c:418
msgid "quitting Mail Notification"
msgstr "E-mail notificatie wordt afgesloten"
-#: ../src/mn-main.c:417
+#: ../src/mn-main.c:422
msgid "Mail Notification is not running"
msgstr "E-mail notificatie is niet actief"
-#: ../src/mn-main.c:432
+#: ../src/mn-main.c:437
msgid "Unable to initialize the GnomeVFS library."
msgstr "De GnomeVFS-bibliotheek kan niet geinitialiseerd worden."
-#: ../src/mn-main.c:442
+#: ../src/mn-main.c:447
msgid "An initialization error has occurred in Mail Notification"
msgstr "Een initialisatiefout is opgetreden in E-mail notificatie"
-#: ../src/mn-main.c:443
+#: ../src/mn-main.c:448
msgid ""
"Unable to initialize the notification library. Message popups will not be "
"displayed."
msgstr ""
-"De notificatiebibliotheek kan niet geinitialiseerd worden. Er zullen "
-"geen popupvensters getoond worden."
+"De notificatiebibliotheek kan niet geinitialiseerd worden. Er zullen geen "
+"popupvensters getoond worden."
-#: ../src/mn-main.c:481
+#: ../src/mn-main.c:486
msgid "updating the mail status"
msgstr "bijwerken e-mail status"
-#: ../src/mn-main.c:497
+#: ../src/mn-main.c:502
msgid "Mail Notification is already running"
msgstr "E-mail notificatie is reeds actief"
-#: ../src/mn-main.c:514
+#: ../src/mn-main.c:519
#, c-format
msgid ""
"Bonobo could not locate the %s file. Please check your Mail Notification "
"installation."
msgstr ""
-"Bonobo kan het %s-bestand niet vinden. Controleer aub de installatie van E-mail "
-"notificatie."
+"Bonobo kan het %s-bestand niet vinden. Controleer aub de installatie van E-"
+"mail notificatie."
-#: ../src/mn-message-mime.c:168
+#: ../src/mn-message-mime.c:193
msgid "unable to parse MIME message"
-msgstr "het MIME-bericht kan niet verwerkt worden"
+msgstr "het MIME-bericht kan niet verwerkt worden"
-#: ../src/mn-message.gob:144
+#: ../src/mn-message.gob:145
msgid "Unknown"
msgstr "Onbekend"
-#: ../src/mn-message.gob:207
+#: ../src/mn-message.gob:208
msgid "unterminated substitution"
msgstr "niet-afgesloten vervanging"
-#: ../src/mn-message.gob:246
+#: ../src/mn-message.gob:247
#, c-format
msgid "unknown substitution \"%s\""
msgstr "vervanging \"%s\" onbekend"
-#: ../src/mn-message.gob:249
+#: ../src/mn-message.gob:250
msgid "empty substitution"
msgstr "lege vervanging"
-#: ../src/mn-message.gob:312 ../src/mn-util.c:1372
+#: ../src/mn-message.gob:313 ../src/mn-util.c:1427
#, c-format
msgid "Unable to execute \"%s\": %s."
msgstr "Niet mogelijk \"%s\" uit te voeren: %s"
-#: ../src/mn-mh-mailbox-backend.gob:170
+#: ../src/mn-mh-mailbox-backend.gob:177
#, c-format
msgid "error while reading %s: %s"
msgstr "fout bij het lezen van %s: %s"
-#: ../src/mn-mh-mailbox-backend.gob:183
+#: ../src/mn-mh-mailbox-backend.gob:190
#, c-format
msgid "unable to open %s: %s"
msgstr "%s kan niet geopend worden: %s"
@@ -1156,11 +1192,11 @@ msgstr "_Mechanisme:"
msgid "Connection"
msgstr "Verbinding"
-#: ../src/mn-pi-mailbox.gob:153
+#: ../src/mn-pi-mailbox.gob:154
msgid "SSL/TLS support has not been compiled in"
msgstr "le support SSL/TLS n'a pas été inclus lors de la compilation"
-#: ../src/mn-pi-mailbox.gob:319
+#: ../src/mn-pi-mailbox.gob:320
#, c-format
msgid ""
"Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -1168,20 +1204,20 @@ msgid ""
"\n"
"Please re-enter your credentials."
msgstr ""
-"E-mail notificatie kon zich niet aanmelden bij postbus %s %s Een "
-"mogelijke verklaring kan zijn dat de opgegeven combinatie gebruikersnaam/"
-"wachtwoord onjuist is. \n"
+"E-mail notificatie kon zich niet aanmelden bij postbus %s %s Een mogelijke "
+"verklaring kan zijn dat de opgegeven combinatie gebruikersnaam/wachtwoord "
+"onjuist is. \n"
"\n"
"Geeft u aub opnieuw uw gebruikersnaam/wachtwoord."
-#: ../src/mn-pi-mailbox.gob:320
+#: ../src/mn-pi-mailbox.gob:321
#, c-format
msgid "Enter your credentials for %s mailbox %s."
msgstr "Geef aub uw gebruikersnaam/wachtwoord voor postbus %s %s ."
#. keep the title in sync with gnome-authentication-manager
#. translators: header capitalization
-#: ../src/mn-pi-mailbox.gob:363
+#: ../src/mn-pi-mailbox.gob:364
msgid "Authentication Required"
msgstr "Aanmelding is verplicht"
@@ -1214,74 +1250,89 @@ msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
msgstr[0] "LOGIN-DELAY wordt gehonoreerd, er wordt %i seconde gewacht"
msgstr[1] "LOGIN-DELAY wordt gehonoreerd, er wordt %i seconden gewacht"
-#: ../src/mn-pop3-mailbox.gob:966
+#: ../src/mn-pop3-mailbox.gob:968
msgid "server does not support APOP authentication"
msgstr "de server ondersteund geen APOP-aanmelding."
-#: ../src/mn-pop3-mailbox.gob:1022
+#: ../src/mn-pop3-mailbox.gob:1024
msgid "falling back to APOP authentication"
msgstr "er wordt teruggevallen op APOP-aanmelding"
-#: ../src/mn-pop3-mailbox.gob:1027
+#: ../src/mn-pop3-mailbox.gob:1029
msgid "falling back to USER/PASS authentication"
msgstr "er wordt teruggevallen op USER/PASS-aanmelding"
-#: ../src/mn-popup.gob:52 ../src/mn-standard-message-view.gob:63
+#: ../src/mn-popup.gob:60 ../src/mn-standard-message-view.gob:63
msgid "Mailbox:"
msgstr "Postbus:"
-#: ../src/mn-popup.gob:54 ../src/mn-standard-message-view.gob:65
+#: ../src/mn-popup.gob:62 ../src/mn-standard-message-view.gob:65
msgid "Unreadable message:"
msgstr "Message non lisible :"
-#: ../src/mn-popup.gob:57 ../src/mn-standard-message-view.gob:68
+#: ../src/mn-popup.gob:65 ../src/mn-standard-message-view.gob:68
msgid "From:"
msgstr "Van:"
-#: ../src/mn-popup.gob:58 ../src/mn-standard-message-view.gob:69
+#: ../src/mn-popup.gob:66 ../src/mn-standard-message-view.gob:69
msgid "Subject:"
msgstr "Onderwerp:"
+#: ../src/mn-popup.gob:128
+#, c-format
+msgid "configuration key %s: there is no action named `%s'"
+msgstr ""
+
#. translators: header capitalization
-#: ../src/mn-popup.gob:79
+#: ../src/mn-popup.gob:141
msgid "Open"
msgstr "Openen"
#. translators: header capitalization
-#: ../src/mn-popup.gob:87
+#: ../src/mn-popup.gob:154
msgid "Mark as Read"
msgstr "Markeer als gelezen"
#. translators: header capitalization
-#: ../src/mn-popup.gob:95
+#: ../src/mn-popup.gob:167
msgid "Mark as Spam"
msgstr "Aanmerken als troep"
-#: ../src/mn-popup.gob:117
+#. translators: header capitalization
+#: ../src/mn-popup.gob:180
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: ../src/mn-popup.gob:196
msgid "Unable to open message"
msgstr "Bericht kan niet geopend worden"
-#: ../src/mn-popup.gob:134
+#: ../src/mn-popup.gob:213
msgid "Unable to mark message as read"
msgstr "Bericht kan niet als gelezen gemarkeerd worden"
-#: ../src/mn-popup.gob:151
+#: ../src/mn-popup.gob:230
msgid "Unable to mark message as spam"
msgstr "Bericht kan niet als troep aangemerkt worden"
-#: ../src/mn-popup.gob:210
+#: ../src/mn-popup.gob:247
+#, fuzzy
+msgid "Unable to delete message"
+msgstr "Bericht kan niet verwijderd worden"
+
+#: ../src/mn-popup.gob:306
#, c-format
msgid "unable to show popup: %s"
msgstr "popvenster kan niet getoond worden: %s"
-#: ../src/mn-popup.gob:227
+#: ../src/mn-popup.gob:323
#, c-format
msgid "unable to close popup: %s"
msgstr "popupvenster kan niet gesloten worden: %s"
#. we set the summary here because libnotify requires it
#. translators: header capitalization
-#: ../src/mn-popup.gob:238
+#: ../src/mn-popup.gob:334
msgid "New Message"
msgstr "Nieuw bericht"
@@ -1346,7 +1397,7 @@ msgstr "Fouten"
msgid "Mail Summary"
msgstr "Overzicht e-mail berichten"
-#: ../src/mn-ssl.c:77
+#: ../src/mn-ssl.c:159
msgid "unknown SSL/TLS error"
msgstr "onbekende SSL/TLS-fout"
@@ -1360,8 +1411,7 @@ msgid "Select _All"
msgstr "_Alles selecteren"
#. translators: header capitalization
-#. translators: header capitalization
-#: ../src/mn-stock.c:33
+#: ../src/mn-stock.c:32
msgid "Co_nnect"
msgstr "_Verbinden"
@@ -1435,12 +1485,12 @@ msgstr "Testbericht %i"
msgid "Mail Notification Properties Dialog"
msgstr "E-mail notificatie eigenschappenvenster"
-#: ../src/mn-util.c:350
+#: ../src/mn-util.c:351
#, c-format
msgid "error loading image: %s"
msgstr "fout bij laden afbeelding: %s"
-#: ../src/mn-util.c:366
+#: ../src/mn-util.c:367
#, c-format
msgid ""
"Unable to load interface \"%s\". Please check your Mail Notification "
@@ -1449,56 +1499,56 @@ msgstr ""
"Kan de \"%s\"-interface niet laden. Controleer aub de installatie van e-mail "
"notificatie."
-#: ../src/mn-util.c:381
+#: ../src/mn-util.c:382
#, c-format
msgid ""
"Widget \"%s\" not found in interface \"%s\". Please check your Mail "
"Notification installation."
msgstr ""
-"Schermelement \"%s\" niet gevonden in de interface. Controleer aub de installatie van e-mail "
-"notificatie."
+"Schermelement \"%s\" niet gevonden in de interface. Controleer aub de "
+"installatie van e-mail notificatie."
-#: ../src/mn-util.c:450
+#: ../src/mn-util.c:451
#, c-format
msgid "Unable to open self as a module (%s)."
msgstr "Kan niet zelf als een module openen (%s)."
-#: ../src/mn-util.c:455
+#: ../src/mn-util.c:456
#, c-format
msgid ""
"Signal handler \"%s\" not found. Please check your Mail Notification "
"installation."
msgstr ""
-"Signaalafhandeling \"%s\" niet gevonden. Controleer aub de installatie van e-mail "
-"notificatie."
+"Signaalafhandeling \"%s\" niet gevonden. Controleer aub de installatie van e-"
+"mail notificatie."
-#: ../src/mn-util.c:606 ../src/mn-util.c:629 ../src/mn-util.c:649
-#: ../src/mn-util.c:671
+#: ../src/mn-util.c:607 ../src/mn-util.c:630 ../src/mn-util.c:650
+#: ../src/mn-util.c:672
msgid "A drag and drop error has occurred"
msgstr "Een drag'n'drop-fout is opgetreden"
-#: ../src/mn-util.c:607
+#: ../src/mn-util.c:608
msgid "An invalid location list has been received."
msgstr "Ontvangst van een ongeldige adreslijst."
-#: ../src/mn-util.c:650
+#: ../src/mn-util.c:651
msgid "An invalid Mozilla location has been received."
msgstr "Ontvangst van een ongeldig Mozilla-adres."
-#: ../src/mn-util.c:726
+#: ../src/mn-util.c:727
msgid "Unable to display help"
msgstr "Kan geen helpinformatie tonen"
-#: ../src/mn-util.c:738
+#: ../src/mn-util.c:739
msgid "Unable to open link"
msgstr "Kan link niet openen"
-#: ../src/mn-util.c:752
+#: ../src/mn-util.c:753
#, c-format
msgid "Unable to create a thread: %s."
msgstr "Kan geen thread aanmaken: %s."
-#: ../src/mn-util.c:929
+#: ../src/mn-util.c:930
#, c-format
msgid ""
"The following location is invalid:\n"
@@ -1521,68 +1571,69 @@ msgstr[1] ""
"\n"
"%s"
-#: ../src/mn-util.c:945
+#: ../src/mn-util.c:946
msgid "A fatal error has occurred in Mail Notification"
msgstr "Een fatale fout is opgetreden in E-mail notificatie "
-#: ../src/mn-util.c:989
+#: ../src/mn-util.c:990
#, c-format
msgid "unable to get current time: %s"
msgstr "kan de huidige tijd niet bepalen: %s"
-#: ../src/mn-util.c:1304
+#: ../src/mn-util.c:1359
#, c-format
msgid "%i second ago"
msgid_plural "%i seconds ago"
msgstr[0] "%i seconde geleden"
msgstr[1] "%i seconden geleden"
-#: ../src/mn-util.c:1308
+#: ../src/mn-util.c:1363
#, c-format
msgid "about %i minute ago"
msgid_plural "about %i minutes ago"
msgstr[0] "ongeveer %i minuut geleden"
msgstr[1] "ongeveer %i minuten geleden"
-#: ../src/mn-util.c:1313
+#: ../src/mn-util.c:1368
#, c-format
msgid "about %i hour ago"
msgid_plural "about %i hours ago"
msgstr[0] "ongeveer %i uur geleden"
msgstr[1] "ongeveer %i uren geleden"
-#: ../src/mn-util.c:1318
+#: ../src/mn-util.c:1373
#, c-format
msgid "about %i day ago"
msgid_plural "about %i days ago"
msgstr[0] "ongeveer %i dag geleden"
msgstr[1] "ongeveer %i dagen geleden"
-#: ../src/mn-util.c:1323
+#: ../src/mn-util.c:1378
#, c-format
msgid "about %i week ago"
msgid_plural "about %i weeks ago"
msgstr[0] "ongeveer %i week geleden"
msgstr[1] "ongeveer %i weken geleden"
-#: ../src/mn-util.c:1336
+#: ../src/mn-util.c:1391
msgid "unknown date"
msgstr "onbekende datum"
-#: ../src/mn-util.c:1371
+#: ../src/mn-util.c:1426
msgid "A command error has occurred in Mail Notification"
msgstr "Een opdrachtfout is opgetreden in E-mail notificatie"
-#: ../src/mn-vfs-mailbox.gob:228
+#: ../src/mn-vfs-mailbox.gob:249
#, c-format
msgid "unable to monitor %s (%s), poll mode activated"
-msgstr "%s (%s) kan niet in de gaten worden gehouden, poll modus wordt geactiveerd"
+msgstr ""
+"%s (%s) kan niet in de gaten worden gehouden, poll modus wordt geactiveerd"
-#: ../src/mn-vfs-mailbox.gob:392
+#: ../src/mn-vfs-mailbox.gob:421
msgid "unknown mailbox format"
msgstr "onbekend postbusformaat"
-#: ../src/mn-vfs-mailbox.gob:392
+#: ../src/mn-vfs-mailbox.gob:421
msgid "does not exist"
msgstr "bestaat niet"
@@ -1597,8 +1648,8 @@ msgid ""
"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
"\""
msgstr ""
-"eigenschap \"%s\": niet mogelijk om tekenreeks \"%s\" om te zetten"
-"in een waarde van het type \"%s\""
+"eigenschap \"%s\": niet mogelijk om tekenreeks \"%s\" om te zettenin een "
+"waarde van het type \"%s\""
#. translators: header capitalization
#: ../ui/mailbox-properties-dialog.glade.h:1 ../ui/properties-dialog.glade.h:8
@@ -1751,3 +1802,8 @@ msgstr "Co_mpact"
msgid "icon tooltip's mail summary layout|_Standard"
msgstr "_Standaard"
+#~ msgid "server did not send all the messages we requested"
+#~ msgstr "de server heeft niet alle opgegeven berichten verzonden"
+
+#~ msgid "server did not send search results"
+#~ msgstr "de server heeft geen zoekresultaten verzonden"
diff --git a/po/sr.po b/po/sr.po
@@ -11,10 +11,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 4.0\n"
+"Project-Id-Version: mail-notification 4.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-28 00:14+0100\n"
-"PO-Revision-Date: 2007-01-17 16:03+0100\n"
+"POT-Creation-Date: 2007-06-19 08:42+0200\n"
+"PO-Revision-Date: 2007-06-26 12:09+0200\n"
"Last-Translator: Филип Милетић <filmil@gmail.com>\n"
"Language-Team: Serbian (sr) <gnu@prevod.org>\n"
"MIME-Version: 1.0\n"
@@ -52,8 +52,8 @@ msgstr "Подеси дојаву приспећа поште"
#: ../data/mail-notification-properties.desktop.in.h:2
#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:234
-#: ../src/mn-main.c:142 ../src/mn-main.c:348 ../src/mn-main.c:364
-#: ../src/mn-main.c:440
+#: ../src/mn-main.c:143 ../src/mn-main.c:350 ../src/mn-main.c:371
+#: ../src/mn-main.c:445
msgid "Mail Notification"
msgstr "Дојава поште"
@@ -97,13 +97,19 @@ msgstr "Висина прозора са поставкама"
msgid ""
"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
"amount of time to wait before expiring message popups (minutes part)."
-msgstr "Ако је подешавање /apps/mail-notification/popups/expiration/enabled постављено на „true?, представља време које треба да протекне пре него што искачући прозор истекне (минути)."
+msgstr ""
+"Ако је подешавање /apps/mail-notification/popups/expiration/enabled "
+"постављено на „true?, представља време које треба да протекне пре него што "
+"искачући прозор истекне (минути)."
#: ../data/mail-notification.schemas.in.in.h:10
msgid ""
"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
"amount of time to wait before expiring message popups (seconds part)."
-msgstr "Ако је подешавање /apps/mail-notification/popups/expiration/enabled постављено на \"true\", време које треба да протекне пре него што искачући прозор истекне (секунде)."
+msgstr ""
+"Ако је подешавање /apps/mail-notification/popups/expiration/enabled "
+"постављено на \"true\", време које треба да протекне пре него што искачући "
+"прозор истекне (секунде)."
#: ../data/mail-notification.schemas.in.in.h:11
msgid "Mail changed command"
@@ -114,73 +120,90 @@ msgid "Mail read command"
msgstr "Команда за читање поште"
#: ../data/mail-notification.schemas.in.in.h:13
+msgid "Message popups actions"
+msgstr "Дејства у искачућим порукама"
+
+#: ../data/mail-notification.schemas.in.in.h:14
msgid "Message popups position"
msgstr "Место искачућег прозора са порукама"
-#: ../data/mail-notification.schemas.in.in.h:14
+#: ../data/mail-notification.schemas.in.in.h:15
msgid "Minutes to wait before expiring message popups"
-msgstr "Број минута који треба да протекне пре затварања искачућег прозора са поруком"
+msgstr ""
+"Број минута који треба да протекне пре затварања искачућег прозора са поруком"
-#: ../data/mail-notification.schemas.in.in.h:15
+#: ../data/mail-notification.schemas.in.in.h:16
msgid "New mail command"
msgstr "Изврши када пошта стигне"
-#: ../data/mail-notification.schemas.in.in.h:16
+#: ../data/mail-notification.schemas.in.in.h:17
msgid "Run a command when all mail is read"
msgstr "Покрени команду када је сва пошта прочитана"
-#: ../data/mail-notification.schemas.in.in.h:17
+#: ../data/mail-notification.schemas.in.in.h:18
msgid "Run a command when new mail arrives"
msgstr "Покрени команду када стигне нова пошта"
-#: ../data/mail-notification.schemas.in.in.h:18
+#: ../data/mail-notification.schemas.in.in.h:19
msgid "Run a command when the message list changes"
msgstr "Покрени команду када се списак порука промени"
-#: ../data/mail-notification.schemas.in.in.h:19
+#: ../data/mail-notification.schemas.in.in.h:20
msgid "Seconds to wait before expiring message popups"
-msgstr "Број секунди који треба да протекне пре затварања искачућег прозора са порукама"
+msgstr ""
+"Број секунди који треба да протекне пре затварања искачућег прозора са "
+"порукама"
-#: ../data/mail-notification.schemas.in.in.h:20
+#: ../data/mail-notification.schemas.in.in.h:21
msgid ""
"The action to perform when the icon is clicked. Must be \"display-properties-"
"dialog\", \"launch-mail-reader\", \"open-latest-message\" or \"update-mail-"
"status\"."
-msgstr "Наредба која се извршава при притиску на сличицу. Могу да буду: „прикажи-прозор-са-поставкама?, „покрени-читач-поште?, „отвори-последњу-поруку? или „освежи-статус-поште?."
+msgstr ""
+"Наредба која се извршава при притиску на сличицу. Могу да буду: „прикажи-"
+"прозор-са-поставкама?, „покрени-читач-поште?, „отвори-последњу-поруку? или "
+"„освежи-статус-поште?."
-#: ../data/mail-notification.schemas.in.in.h:21
+#: ../data/mail-notification.schemas.in.in.h:22
msgid "The command to run when all mail is read."
msgstr "Команда коју треба покренути када је сва пошта прочитана."
-#: ../data/mail-notification.schemas.in.in.h:22
+#: ../data/mail-notification.schemas.in.in.h:23
msgid "The command to run when new mail arrives."
msgstr "Покрени ову команду када стигне нова пошта."
-#: ../data/mail-notification.schemas.in.in.h:23
+#: ../data/mail-notification.schemas.in.in.h:24
msgid "The command to run when the message list changes."
msgstr "Команда која се покреће када се промени списак порука."
-#: ../data/mail-notification.schemas.in.in.h:24
+#: ../data/mail-notification.schemas.in.in.h:25
msgid "The height of the properties dialog in pixels."
msgstr "Висина прозора са поставкама изражена у тачкама."
-#: ../data/mail-notification.schemas.in.in.h:25
+#: ../data/mail-notification.schemas.in.in.h:26
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
msgstr ""
"Списак проверених SSL/TLS сервера (рачунар:порт) који немају X509 сертификат."
-#: ../data/mail-notification.schemas.in.in.h:26
+#: ../data/mail-notification.schemas.in.in.h:27
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr "Списак проверених X509 сертификата, представљених MD5 отиском."
-#: ../data/mail-notification.schemas.in.in.h:27
+#: ../data/mail-notification.schemas.in.in.h:28
+msgid ""
+"The ordered list of actions to include in the message popups. Each element "
+"must be \"open\", \"mark-as-read\", \"mark-as-spam\" or \"delete\"."
+msgstr "Уређени списак радњи које ће бити укључене у искачуће прозоре. Елементи морају да буду једни од „open?, „mark-as-read?, „mark-as-spam? или \"delete\"."
+
+#: ../data/mail-notification.schemas.in.in.h:29
msgid "The position of the message popups. Must be \"attached\" or \"free\"."
-msgstr "Место искачућег прозора са порукама. Може бити „закачен? или „слободан?."
+msgstr ""
+"Место искачућег прозора са порукама. Може бити „закачен? или „слободан?."
-#: ../data/mail-notification.schemas.in.in.h:28
+#: ../data/mail-notification.schemas.in.in.h:30
msgid ""
"The type of mail summary to display in the icon's tooltip. Must be \"standard"
"\", \"compact\" or \"none\"."
@@ -188,54 +211,57 @@ msgstr ""
"Врста сажетка поште који се приказује у облачићу. Може бити „обичан?, "
"„кратак? или „ниједан?."
-#: ../data/mail-notification.schemas.in.in.h:29
+#: ../data/mail-notification.schemas.in.in.h:31
msgid "The width of the properties dialog in pixels."
msgstr "Ширина прозора са поставкама изражена у тачкама."
-#: ../data/mail-notification.schemas.in.in.h:30
+#: ../data/mail-notification.schemas.in.in.h:32
msgid "Tooltip mail summary"
msgstr "Облачић са сажетком порука"
-#: ../data/mail-notification.schemas.in.in.h:31
+#: ../data/mail-notification.schemas.in.in.h:33
msgid "Trusted servers list"
msgstr "Списак проверених сервера"
-#: ../data/mail-notification.schemas.in.in.h:32
+#: ../data/mail-notification.schemas.in.in.h:34
msgid "Whether the status icon should blink on errors or not."
msgstr "Да ли сличица треба да трепери ако дође до грешке или не."
-#: ../data/mail-notification.schemas.in.in.h:33
+#: ../data/mail-notification.schemas.in.in.h:35
msgid "Whether to display an icon when there is no new mail or not."
msgstr "Да ли се приказује сличица када нема нове поште."
-#: ../data/mail-notification.schemas.in.in.h:34
+#: ../data/mail-notification.schemas.in.in.h:36
msgid "Whether to display seen mail or not."
msgstr "Да ли треба приказивати прегледану пошту или не."
-#: ../data/mail-notification.schemas.in.in.h:35
+#: ../data/mail-notification.schemas.in.in.h:37
msgid "Whether to enable message popups or not."
msgstr "Да ли се користе искачући прозори са порукама или не."
-#: ../data/mail-notification.schemas.in.in.h:36
+#: ../data/mail-notification.schemas.in.in.h:38
msgid ""
"Whether to expire message popups or not. Must be \"default\", \"false\" or "
"\"true\"."
-msgstr "Да ли искачући прозори истичу или не. Мора бити „default?, „false? или „true?."
+msgstr ""
+"Да ли искачући прозори истичу или не. Мора бити „default?, „false? или "
+"„true?."
-#: ../data/mail-notification.schemas.in.in.h:37
+#: ../data/mail-notification.schemas.in.in.h:39
msgid "Whether to run a command when all mail is read or not."
msgstr ""
"Да ли треба или не треба покренути неку команду када је сва пошта прочитана."
-#: ../data/mail-notification.schemas.in.in.h:38
+#: ../data/mail-notification.schemas.in.in.h:40
msgid "Whether to run a command when new mail arrives or not."
msgstr "Да ли треба покренути неку команду када стигне нова пошта."
-#: ../data/mail-notification.schemas.in.in.h:39
+#: ../data/mail-notification.schemas.in.in.h:41
msgid "Whether to run a command when the message list changes or not."
-msgstr "Да ли треба покренути неку команду када се списак порука промени или не."
+msgstr ""
+"Да ли треба покренути неку команду када се списак порука промени или не."
-#: ../data/mail-notification.schemas.in.in.h:40
+#: ../data/mail-notification.schemas.in.in.h:42
msgid "Width of properties dialog"
msgstr "Ширина прозора са поставкама"
@@ -260,7 +286,7 @@ msgstr "Сличица за дојаву приспећа поште"
msgid "translator-credits"
msgstr "Филип Милетић <filmil@gmail.com>"
-#: ../src/mn-auth-combo-box.gob:104
+#: ../src/mn-auth-combo-box.gob:101
#: ../src/mn-autodetect-mailbox-properties.gob:110
msgid "Autodetect"
msgstr "А_утодетекција"
@@ -308,95 +334,108 @@ msgstr "није могуће затворити датотеку: %s"
msgid "unable to open mailbox: %s"
msgstr "није могуће отворити сандуче: %s"
-#: ../src/mn-client-session.c:248
+#: ../src/mn-client-session.c:257
#, c-format
msgid "resolving %s"
msgstr "проналазим %s"
-#: ../src/mn-client-session.c:264
+#: ../src/mn-client-session.c:273
#, c-format
msgid "unable to resolve %s: %s"
msgstr "Није могуће пронаћи %s: %s"
-#: ../src/mn-client-session.c:305
+#: ../src/mn-client-session.c:314
#, c-format
msgid "network address #%i"
msgstr "мрежна адреса #%i"
-#: ../src/mn-client-session.c:308
+#: ../src/mn-client-session.c:317
#, c-format
msgid "unable to convert network address #%i into textual form: %s"
msgstr "мрежна адреса #%i се не може пребацити у текстуални облик: %s"
-#: ../src/mn-client-session.c:319
+#: ../src/mn-client-session.c:328
#, c-format
msgid "%s: unsupported address family"
msgstr "%s: ова врста адресе није подржана"
-#: ../src/mn-client-session.c:326
+#: ../src/mn-client-session.c:335
#, c-format
msgid "%s: unable to create socket: %s"
msgstr "%s: није могуће направити утичницу: %s"
-#: ../src/mn-client-session.c:330
+#: ../src/mn-client-session.c:339
#, c-format
msgid "connecting to %s (%s) port %i"
msgstr "повезујем се са %s (%s) порт %i"
-#: ../src/mn-client-session.c:333
+#: ../src/mn-client-session.c:342
#, c-format
msgid "unable to connect: %s"
msgstr "није могуће повезати се са: %s"
-#: ../src/mn-client-session.c:338
+#: ../src/mn-client-session.c:347
msgid "connected successfully"
msgstr "повезивање је успело"
#. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:352
+#: ../src/mn-client-session.c:361
#, c-format
msgid "unable to connect to %s"
msgstr "није могуће повезати се са %s"
-#: ../src/mn-client-session.c:379
+#: ../src/mn-client-session.c:388
#, c-format
msgid "unable to initialize the OpenSSL library: %s"
msgstr "није могуће покренути OpenSSL библиотеку: %s"
-#: ../src/mn-client-session.c:387
+#: ../src/mn-client-session.c:396
#, c-format
msgid "unable to create a SSL/TLS object: %s"
msgstr "није могуће направити SSL/TLS објекат: %s"
-#: ../src/mn-client-session.c:393
+#: ../src/mn-client-session.c:402
#, c-format
msgid "unable to set the SSL/TLS file descriptor: %s"
msgstr "није могуће поставити SSL/TLS опис за датотеку: %s"
-#: ../src/mn-client-session.c:399
+#: ../src/mn-client-session.c:408
#, c-format
msgid "unable to perform the SSL/TLS handshake: %s"
msgstr "није могуће обавити SSL/TLS контакт: %s"
-#: ../src/mn-client-session.c:405
+#: ../src/mn-client-session.c:414
msgid "untrusted server"
msgstr "непроверен сервер"
-#: ../src/mn-client-session.c:409
+#: ../src/mn-client-session.c:418
#, c-format
msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
msgstr "SSL/TLS слој је покренут (%s, %s %i-бит)"
-#: ../src/mn-client-session.c:456
+#: ../src/mn-client-session.c:589
+msgid "server name not found in certificate"
+msgstr "име сервера није пронађено у сертификату"
+
+#: ../src/mn-client-session.c:594
+#, c-format
+msgid ""
+"user-provided server name \"%s\" does not match certificate-provided server "
+"name \"%s\""
+msgstr "име сервера које је задао корисник („%s?) се не поклапа са именом сервера које стоји у сертификату („%s?)"
+
+#: ../src/mn-client-session.c:612
#, c-format
-msgid "%s, fingerprint: %s"
-msgstr "%s, отисак: %s"
+msgid ""
+"user-provided server name \"%s\" matches none of the certificate-provided "
+"server names %s"
+msgstr "име сервера које је задао корисник (\"%s\") не поклапа се ни са једним од имена сервера која стоје у сертификату"
-#: ../src/mn-client-session.c:485
+#: ../src/mn-client-session.c:688
msgid "missing certificate"
msgstr "недостаје сертификат"
-#: ../src/mn-client-session.c:511
+#: ../src/mn-client-session.c:717
#, c-format
msgid ""
"Mail Notification was unable to trust \"%s\" (%s). It is possible that "
@@ -415,120 +454,125 @@ msgstr ""
"са \"%s\". Ако одлучите да се повежете на сервер, ова порука неће поново "
"бити приказана."
-#: ../src/mn-client-session.c:526
+#: ../src/mn-client-session.c:731
+#, c-format
+msgid "Certificate fingerprint: %s."
+msgstr "Отисак сертификата: %s."
+
+#: ../src/mn-client-session.c:738
msgid "Connect to untrusted server?"
msgstr "Да ли да се повежем на непроверени сервер?"
-#: ../src/mn-client-session.c:591
+#: ../src/mn-client-session.c:803
#, c-format
msgid "response \"%s\" is not valid in current context"
msgstr "одговор \"%s\" није исправан у тренутно важећем контексту"
-#: ../src/mn-client-session.c:620
+#: ../src/mn-client-session.c:832
#, c-format
msgid "unable to parse response \"%s\""
msgstr "није могуће обрадити одговор \"%s\""
-#: ../src/mn-client-session.c:670 ../src/mn-client-session.c:677
+#: ../src/mn-client-session.c:882 ../src/mn-client-session.c:889
#, c-format
msgid "unable to read from server: %s"
msgstr "Није могуће читање са сервера: %s"
-#: ../src/mn-client-session.c:675
+#: ../src/mn-client-session.c:887
msgid "unable to read from server: EOF"
msgstr "Није могуће читање са сервера: EOF"
-#: ../src/mn-client-session.c:687
+#: ../src/mn-client-session.c:899
#, c-format
msgid "unable to decode data using SASL: %s"
msgstr "Не могу се декодовати подаци путем SASL: %s"
-#: ../src/mn-client-session.c:832
+#: ../src/mn-client-session.c:1044
#, c-format
msgid "unable to encode data using SASL: %s"
msgstr "није могуће кодирати податке уз помоћ SASL: %s"
-#: ../src/mn-client-session.c:863 ../src/mn-client-session.c:870
+#: ../src/mn-client-session.c:1075 ../src/mn-client-session.c:1082
#, c-format
msgid "unable to write to server: %s"
msgstr "није могућ упис на сервер: %s"
-#: ../src/mn-client-session.c:868
+#: ../src/mn-client-session.c:1080
msgid "unable to write to server: EOF"
msgstr "није могућ упис на сервер: EOF"
-#: ../src/mn-client-session.c:899 ../src/mn-pop3-mailbox.gob:434
+#: ../src/mn-client-session.c:1111 ../src/mn-pop3-mailbox.gob:434
#, c-format
msgid "unable to encode Base64: %s"
msgstr "није могуће кодирати Base64: %s"
-#: ../src/mn-client-session.c:1076
+#: ../src/mn-client-session.c:1288
#, c-format
msgid "unable to initialize the SASL library: %s"
msgstr "не може се покренути SASL библиотека: %s"
-#: ../src/mn-client-session.c:1088
+#: ../src/mn-client-session.c:1300
#, c-format
msgid "unable to retrieve local address of socket: %s"
msgstr "не може да се добави локална адреса утичнице: %s"
-#: ../src/mn-client-session.c:1094
+#: ../src/mn-client-session.c:1306
#, c-format
msgid "unable to retrieve remote address of socket: %s"
msgstr "не може да се добави удаљена адреса утичнице: %s"
-#: ../src/mn-client-session.c:1128
+#: ../src/mn-client-session.c:1340
#, c-format
msgid "unable to set SASL security properties: %s"
msgstr "није могуће поставити SASL сигурносне поставке: %s"
-#: ../src/mn-client-session.c:1152
+#: ../src/mn-client-session.c:1364
msgid ""
"unable to start SASL authentication: SASL asked for something we did not know"
msgstr "не може се покренути SASL пријава: SASL тражи податке које немамо"
-#: ../src/mn-client-session.c:1171
+#: ../src/mn-client-session.c:1383
#, c-format
msgid "unable to start SASL authentication: %s"
msgstr "не може се покренути SASL пријава: %s"
-#: ../src/mn-client-session.c:1175
+#: ../src/mn-client-session.c:1387
#, c-format
msgid "unable to create a SASL connection: %s"
msgstr "није могуће успоставити SASL везу: %s"
-#: ../src/mn-client-session.c:1222
+#: ../src/mn-client-session.c:1434
msgid "SASL asked for something we did not know, aborting SASL authentication"
msgstr "SASL је тражио нама непознате податке, обустављам SASL пријаву"
-#: ../src/mn-client-session.c:1239
+#: ../src/mn-client-session.c:1451
#, c-format
msgid "%s, aborting SASL authentication"
msgstr "%s, обустављам SASL пријаву"
#. compliance error
-#: ../src/mn-client-session.c:1244
+#: ../src/mn-client-session.c:1456
#, c-format
msgid "unable to decode Base64 input from server: %s"
msgstr "није могуће декодовати Base64 улаз са сервера: %s"
-#: ../src/mn-client-session.c:1280
+#: ../src/mn-client-session.c:1492
#, c-format
msgid "a SASL security layer of strength factor %i is now active"
msgstr "SASL сигурносни слој нивоа снаге %i је успостављен"
#. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1285
+#: ../src/mn-client-session.c:1497
#, c-format
msgid "unable to get SASL_MAXOUTBUF property: %s"
msgstr "не могу да прочитам поставку SASL_MAXOUTBUF: %s"
-#: ../src/mn-client-session.c:1291
+#: ../src/mn-client-session.c:1503
#, c-format
msgid "warning: unable to get SASL_SSF property: %s"
msgstr "упозорење: не могу да прочитам поставку SASL_SSF: %s"
-#: ../src/mn-client-session.c:1450
+#: ../src/mn-client-session.c:1662
msgid "unknown server error"
msgstr "непозната грешка на серверу"
@@ -548,25 +592,25 @@ msgstr "Тема"
msgid "Sent"
msgstr "Послато"
-#: ../src/mn-conf.c:281
+#: ../src/mn-conf.c:282
msgid "A directory creation error has occurred"
msgstr "Дошло је до грешке при прављењу директоријума"
-#: ../src/mn-conf.c:282
+#: ../src/mn-conf.c:283
#, c-format
msgid "Unable to create directory \"%s\": %s."
msgstr "Није могуће направити директоријум ?%s?: %s."
-#: ../src/mn-conf.c:406
+#: ../src/mn-conf.c:407
#, c-format
msgid "recursively unsetting %s"
msgstr "рекурзивно поништавам %s"
-#: ../src/mn-conf.c:410
+#: ../src/mn-conf.c:411
msgid "syncing the GConf database"
msgstr "усклађујем GConf базу података"
-#: ../src/mn-conf.c:413
+#: ../src/mn-conf.c:414
msgid "completed"
msgstr "урађено"
@@ -574,7 +618,7 @@ msgstr "урађено"
msgid "invalid location"
msgstr "неважеће место"
-#: mn-evolution-folder-tree-control.gob:69
+#: ../src/mn-evolution-folder-tree-control.gob:69
msgid "The currently selected URI"
msgstr "Тренутно изабран URI"
@@ -586,10 +630,9 @@ msgstr "Фасцикла"
#: ../src/mn-evolution-mailbox-properties.gob:204
msgid ""
"Mail Notification can not contact Evolution. Make sure that Evolution is "
-"running and that the Evolution Mail Notification plugin is loaded."
-msgstr ""
-"Дојава поште не може да се повеже са Еволуцијом. Покрените Еволуцију и "
-"укључите додатак за повезивање са Дојавом поште."
+"running and that the Evolution Jean-Yves Lefort's Mail Notification plugin "
+"is loaded."
+msgstr "Дојава поште не може да се повеже са Еволуцијом. Покрените Еволуцију и укључите додатак Жан-Ива Лефорта (Jean-Yves Lefort) за повезивање Еволуције са Дојавом поште."
#: ../src/mn-evolution-mailbox.gob:78
msgid "folder not found"
@@ -616,7 +659,7 @@ msgstr ""
"Бонобо није успео да пронађе %s сервер. Молим проверите инсталацију Дојаве "
"поште."
-#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:518
+#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:523
#, c-format
msgid ""
"Bonobo was unable to register the %s server. Please check your Mail "
@@ -664,7 +707,7 @@ msgstr "Није могуће пронаћи у %s: %s"
msgid "unable to tell position of %s: %s"
msgstr "није могуће сазнати положај за %s: %s"
-#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:167
+#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:174
#, c-format
msgid "unable to close %s: %s"
msgstr "није могуће затворити %s: %s"
@@ -700,28 +743,23 @@ msgstr "А_утодетекција"
msgid "Al_ways"
msgstr "_Увек"
-#: ../src/mn-imap-mailbox.gob:385
+#: ../src/mn-imap-mailbox.gob:381
msgid "server did not send capabilities"
msgstr "сервер није обавестио о својим могућностима"
-#: ../src/mn-imap-mailbox.gob:552
+#: ../src/mn-imap-mailbox.gob:548
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr "сервер је дојавио LOGINDISABLED, LOGIN пријавa неће бити коришћена"
-#: ../src/mn-imap-mailbox.gob:553
+#: ../src/mn-imap-mailbox.gob:549
msgid "unable to login"
msgstr "пријава није могућа"
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:753
-msgid "server did not send all the messages we requested"
-msgstr "сервер није послао све тражене поруке"
-
-#: ../src/mn-imap-mailbox.gob:823
+#: ../src/mn-imap-mailbox.gob:822
msgid "unable to fetch message"
msgstr "није могуће добавити поруку"
-#: ../src/mn-imap-mailbox.gob:848
+#: ../src/mn-imap-mailbox.gob:838
msgid ""
"\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
"logging out"
@@ -729,26 +767,26 @@ msgstr ""
"„Користи IDLE проширење“ је постављено на „никад“ у поставкама сандучића, "
"одјављујем се"
-#: ../src/mn-imap-mailbox.gob:859
+#: ../src/mn-imap-mailbox.gob:849
#, c-format
msgid "the remote server runs %s, not using the IDLE extension"
msgstr "удаљени сервер користи %s, не користим IDLE продужетак"
-#: ../src/mn-imap-mailbox.gob:864
+#: ../src/mn-imap-mailbox.gob:854
#, c-format
msgid ""
"the remote server runs %s, the IDLE extension might not function properly"
msgstr "удаљени сервер користи %s, IDLE проширење можда неће исправно радити"
-#: ../src/mn-imap-mailbox.gob:873
+#: ../src/mn-imap-mailbox.gob:863
msgid "the remote server does not support the IDLE extension, logging out"
msgstr "удаљени сервер не подржава IDLE проширење, одјављујем се"
-#: ../src/mn-imap-mailbox.gob:1378 ../src/mn-pop3-mailbox.gob:297
+#: ../src/mn-imap-mailbox.gob:1368 ../src/mn-pop3-mailbox.gob:297
msgid "server does not support in-band SSL/TLS"
msgstr "сервер не подржава заштиту путем SSL/TLS"
-#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:954
+#: ../src/mn-imap-mailbox.gob:1392 ../src/mn-pop3-mailbox.gob:956
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
@@ -756,30 +794,24 @@ msgstr ""
"изабран је механизам за пријаву који користи SASL али подршка за SASL није "
"уграђена у програм"
-#: ../src/mn-imap-mailbox.gob:1412 ../src/mn-pop3-mailbox.gob:974
+#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:976
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "непознат механизам за пријаву \"%s\""
-#: ../src/mn-imap-mailbox.gob:1444 ../src/mn-pop3-mailbox.gob:1010
+#: ../src/mn-imap-mailbox.gob:1434 ../src/mn-pop3-mailbox.gob:1012
#, c-format
msgid "disabling mechanism \"%s\" and retrying SASL authentication"
msgstr "искључујем механизам „%s“ и покушавам SASL пријаву"
-#: ../src/mn-imap-mailbox.gob:1456
+#: ../src/mn-imap-mailbox.gob:1446
msgid "falling back to IMAP LOGIN authentication"
msgstr "повратак на IMAP LOGIN пријаву"
-#: ../src/mn-imap-mailbox.gob:1468 ../src/mn-pop3-mailbox.gob:1039
+#: ../src/mn-imap-mailbox.gob:1458 ../src/mn-pop3-mailbox.gob:1041
msgid "authentication failed"
msgstr "пријава није успела"
-#. success; caller must switch state itself
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:1529
-msgid "server did not send search results"
-msgstr "сервер није послао резултате претраге"
-
#. translators: header capitalization
#: ../src/mn-mail-icon.gob:93
msgid "_Mail Reader"
@@ -829,16 +861,16 @@ msgstr "%s сандуче"
msgid "detecting mailbox type..."
msgstr "препознајем врсту сандучета..."
-#: ../src/mn-mailbox.gob:504
+#: ../src/mn-mailbox.gob:507
msgid "\"type\" attribute missing"
msgstr "недостаје атрибут „врста“"
-#: ../src/mn-mailbox.gob:511
+#: ../src/mn-mailbox.gob:514
#, c-format
msgid "unknown mailbox type \"%s\""
msgstr "непозната врста сандучета „%s“"
-#: ../src/mn-mailbox.gob:907
+#: ../src/mn-mailbox.gob:910
#, c-format
msgid "property \"%s\" has no value"
msgstr "особина „%s“ нема постављену вредност"
@@ -949,71 +981,71 @@ msgstr "није могуће затворити фасциклу „%s?: %s"
msgid "error while reading folder \"%s\": %s"
msgstr "грешка при читању фасцикле „%s?: %s"
-#: ../src/mn-main.c:109
+#: ../src/mn-main.c:110
msgid "yes"
msgstr "да"
-#: ../src/mn-main.c:109
+#: ../src/mn-main.c:110
msgid "no"
msgstr "не"
-#: ../src/mn-main.c:142
+#: ../src/mn-main.c:143
#, c-format
msgid "%s version %s\n"
msgstr "%s издање %s\n"
-#: ../src/mn-main.c:147
+#: ../src/mn-main.c:148
msgid "Mailbox backends:\n"
msgstr "Подржани сандучићи:\n"
-#: ../src/mn-main.c:152
+#: ../src/mn-main.c:153
msgid "POP3 and IMAP features:\n"
msgstr "Могућности за POP3 и IMAP:\n"
# FIXME: избаци латинични назив када буде време
-#: ../src/mn-main.c:157
+#: ../src/mn-main.c:158
msgid "Sylpheed features:\n"
msgstr "Особине Силфида (Sylpheed):\n"
-#: ../src/mn-main.c:205
+#: ../src/mn-main.c:206
#, c-format
msgid "A Bonobo exception (%s) has occurred in %s()."
msgstr "Десио се Бонобов изузетак (%s) у %s()."
-#: ../src/mn-main.c:247
+#: ../src/mn-main.c:248
#, c-format
msgid "%s option ignored since Mail Notification is not already running"
msgstr "Опција %s је занемарена јер Дојава поште још увек није покренута"
-#: ../src/mn-main.c:267
+#: ../src/mn-main.c:268
msgid "Show version information"
msgstr "Прикажи податке о издању"
-#: ../src/mn-main.c:276
+#: ../src/mn-main.c:277
msgid "Enable informational output"
msgstr "Дозволи речитији излаз"
-#: ../src/mn-main.c:285
+#: ../src/mn-main.c:286
msgid "Display the properties dialog"
msgstr "Прикажи прозор са поставкама"
-#: ../src/mn-main.c:294
+#: ../src/mn-main.c:295
msgid "Display the about dialog"
msgstr "Прикажи податке о програму"
-#: ../src/mn-main.c:303
+#: ../src/mn-main.c:304
msgid "Update the mail status"
msgstr "Освежи податке о пошти"
-#: ../src/mn-main.c:312
+#: ../src/mn-main.c:313
msgid "Print a XML mail summary"
msgstr "Испиши сажетак порука у XML формату"
-#: ../src/mn-main.c:321
+#: ../src/mn-main.c:322
msgid "Unset obsolete GConf configuration"
msgstr "Поништи застарела GConf подешавања"
-#: ../src/mn-main.c:330
+#: ../src/mn-main.c:331
msgid "Quit Mail Notification"
msgstr "Угаси дојаву поште"
@@ -1021,11 +1053,11 @@ msgstr "Угаси дојаву поште"
#. * We cannot use mn_fatal_error_dialog() because gtk_init() has
#. * not been called yet.
#.
-#: ../src/mn-main.c:356
+#: ../src/mn-main.c:358
msgid "multi-threading is not available"
msgstr "вишенитни рад није подржан"
-#: ../src/mn-main.c:407
+#: ../src/mn-main.c:412
msgid ""
"Bonobo could not locate the automation object. Please check your Mail "
"Notification installation."
@@ -1035,37 +1067,39 @@ msgstr ""
"Бонобо у Гному 2.6, када инсталирате програм за обавештења, треба да се "
"одјавите и поново пријавите на систем да би све почело да ради)"
-#: ../src/mn-main.c:413
+#: ../src/mn-main.c:418
msgid "quitting Mail Notification"
msgstr "Гасим дојаву поште"
-#: ../src/mn-main.c:417
+#: ../src/mn-main.c:422
msgid "Mail Notification is not running"
msgstr "Програм за дојаву поште није покренут."
-#: ../src/mn-main.c:432
+#: ../src/mn-main.c:437
msgid "Unable to initialize the GnomeVFS library."
msgstr "Није могуће покренути библиотеку GnomeVFS."
-#: ../src/mn-main.c:442
+#: ../src/mn-main.c:447
msgid "An initialization error has occurred in Mail Notification"
msgstr "Дошло је до грешке при покретању програма за дојаву поште"
-#: ../src/mn-main.c:443
+#: ../src/mn-main.c:448
msgid ""
"Unable to initialize the notification library. Message popups will not be "
"displayed."
-msgstr "Библиотека за дојаву не може да се покрене. Искачући прозори са порукама неће бити приказивани."
+msgstr ""
+"Библиотека за дојаву не може да се покрене. Искачући прозори са порукама "
+"неће бити приказивани."
-#: ../src/mn-main.c:481
+#: ../src/mn-main.c:486
msgid "updating the mail status"
msgstr "Проверавам пошту"
-#: ../src/mn-main.c:497
+#: ../src/mn-main.c:502
msgid "Mail Notification is already running"
msgstr "Програм за дојаву поште је већ покренут."
-#: ../src/mn-main.c:514
+#: ../src/mn-main.c:519
#, c-format
msgid ""
"Bonobo could not locate the %s file. Please check your Mail Notification "
@@ -1074,38 +1108,38 @@ msgstr ""
"Бонобо није могао да пронађе датотеку %s. Молимо проверите подешавања Дојаве "
"поште."
-#: ../src/mn-message-mime.c:168
+#: ../src/mn-message-mime.c:193
msgid "unable to parse MIME message"
msgstr "није могуће обрадити MIME поруку"
-#: ../src/mn-message.gob:144
+#: ../src/mn-message.gob:145
msgid "Unknown"
msgstr "Непознато"
-#: ../src/mn-message.gob:207
+#: ../src/mn-message.gob:208
msgid "unterminated substitution"
msgstr "замена нема крај"
-#: ../src/mn-message.gob:246
+#: ../src/mn-message.gob:247
#, c-format
msgid "unknown substitution \"%s\""
msgstr "непозната замена „%s?"
-#: ../src/mn-message.gob:249
+#: ../src/mn-message.gob:250
msgid "empty substitution"
msgstr "празна замена"
-#: ../src/mn-message.gob:312 ../src/mn-util.c:1372
+#: ../src/mn-message.gob:313 ../src/mn-util.c:1427
#, c-format
msgid "Unable to execute \"%s\": %s."
msgstr "Није могуће извршити „%s?: %s."
-#: ../src/mn-mh-mailbox-backend.gob:170
+#: ../src/mn-mh-mailbox-backend.gob:177
#, c-format
msgid "error while reading %s: %s"
msgstr "грешка при читању %s: %s"
-#: ../src/mn-mh-mailbox-backend.gob:183
+#: ../src/mn-mh-mailbox-backend.gob:190
#, c-format
msgid "unable to open %s: %s"
msgstr "није могуће отворити %s: %s"
@@ -1148,11 +1182,11 @@ msgstr "_Механизам:"
msgid "Connection"
msgstr "Веза"
-#: ../src/mn-pi-mailbox.gob:153
+#: ../src/mn-pi-mailbox.gob:154
msgid "SSL/TLS support has not been compiled in"
msgstr "Подршка за SSL/TLS није уграђена"
-#: ../src/mn-pi-mailbox.gob:319
+#: ../src/mn-pi-mailbox.gob:320
#, c-format
msgid ""
"Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -1165,14 +1199,14 @@ msgstr ""
"\n"
"Молим унесите поново лозинку."
-#: ../src/mn-pi-mailbox.gob:320
+#: ../src/mn-pi-mailbox.gob:321
#, c-format
msgid "Enter your credentials for %s mailbox %s."
msgstr "Унесите лозинку за %s сандуче %s."
#. keep the title in sync with gnome-authentication-manager
#. translators: header capitalization
-#: ../src/mn-pi-mailbox.gob:363
+#: ../src/mn-pi-mailbox.gob:364
msgid "Authentication Required"
msgstr "Потребна је пријава"
@@ -1206,74 +1240,88 @@ msgstr[0] "тражен је застој при пријави, паузира
msgstr[1] "тражен је застој при пријави, паузирам %i секундe"
msgstr[2] "тражен је застој при пријави, паузирам %i секунди"
-#: ../src/mn-pop3-mailbox.gob:966
+#: ../src/mn-pop3-mailbox.gob:968
msgid "server does not support APOP authentication"
msgstr "сервер не подржава пријаву коришћењем механизма APOP"
-#: ../src/mn-pop3-mailbox.gob:1022
+#: ../src/mn-pop3-mailbox.gob:1024
msgid "falling back to APOP authentication"
msgstr "прелазим на APOP пријаву"
-#: ../src/mn-pop3-mailbox.gob:1027
+#: ../src/mn-pop3-mailbox.gob:1029
msgid "falling back to USER/PASS authentication"
msgstr "прелазим на пријаву помоћу имена и лозинке"
-#: ../src/mn-popup.gob:52 ../src/mn-standard-message-view.gob:63
+#: ../src/mn-popup.gob:60 ../src/mn-standard-message-view.gob:63
msgid "Mailbox:"
msgstr "Сандуче:"
-#: ../src/mn-popup.gob:54 ../src/mn-standard-message-view.gob:65
+#: ../src/mn-popup.gob:62 ../src/mn-standard-message-view.gob:65
msgid "Unreadable message:"
msgstr "Нечитљива порука:"
-#: ../src/mn-popup.gob:57 ../src/mn-standard-message-view.gob:68
+#: ../src/mn-popup.gob:65 ../src/mn-standard-message-view.gob:68
msgid "From:"
msgstr "Шаље:"
-#: ../src/mn-popup.gob:58 ../src/mn-standard-message-view.gob:69
+#: ../src/mn-popup.gob:66 ../src/mn-standard-message-view.gob:69
msgid "Subject:"
msgstr "Тема:"
+#: ../src/mn-popup.gob:128
+#, c-format
+msgid "configuration key %s: there is no action named `%s'"
+msgstr "кључ за подешавања %s: не постоји дејство које се зове „%s?"
+
#. translators: header capitalization
-#: ../src/mn-popup.gob:79
+#: ../src/mn-popup.gob:141
msgid "Open"
msgstr "Отвори"
#. translators: header capitalization
-#: ../src/mn-popup.gob:87
+#: ../src/mn-popup.gob:154
msgid "Mark as Read"
msgstr "Означи као прочитано"
#. translators: header capitalization
-#: ../src/mn-popup.gob:95
+#: ../src/mn-popup.gob:167
msgid "Mark as Spam"
msgstr "Означи као непожељно"
-#: ../src/mn-popup.gob:117
+#. translators: header capitalization
+#: ../src/mn-popup.gob:180
+msgid "Delete"
+msgstr "Уклони"
+
+#: ../src/mn-popup.gob:196
msgid "Unable to open message"
msgstr "Није могуће отворити поруку"
-#: ../src/mn-popup.gob:134
+#: ../src/mn-popup.gob:213
msgid "Unable to mark message as read"
msgstr "Није могуће поруку означити као прочитану"
-#: ../src/mn-popup.gob:151
+#: ../src/mn-popup.gob:230
msgid "Unable to mark message as spam"
msgstr "Није могуће означити поруку као нежељену"
-#: ../src/mn-popup.gob:210
+#: ../src/mn-popup.gob:247
+msgid "Unable to delete message"
+msgstr "Није могуће уклонити поруку"
+
+#: ../src/mn-popup.gob:306
#, c-format
msgid "unable to show popup: %s"
msgstr "није могуће приказати искачући прозор: %s"
-#: ../src/mn-popup.gob:227
+#: ../src/mn-popup.gob:323
#, c-format
msgid "unable to close popup: %s"
msgstr "није могуће затворити искачући прозор: %s"
#. we set the summary here because libnotify requires it
#. translators: header capitalization
-#: ../src/mn-popup.gob:238
+#: ../src/mn-popup.gob:334
msgid "New Message"
msgstr "Нова порука"
@@ -1307,7 +1355,9 @@ msgstr "Читач поште није подешен"
msgid ""
"You can configure a mail reader by choosing <b>System → Preferences → "
"Preferred Applications</b>."
-msgstr "Можете да подесите читач поште избором <b>Систем → Поставке → Омиљени програми</b>."
+msgstr ""
+"Можете да подесите читач поште избором <b>Систем → Поставке → Омиљени "
+"програми</b>."
#: ../src/mn-shell.gob:236 ../src/mn-shell.gob:242 ../src/mn-shell.gob:534
msgid "Unable to open the latest message"
@@ -1337,7 +1387,7 @@ msgstr "Грешке"
msgid "Mail Summary"
msgstr "Сажетак порука"
-#: ../src/mn-ssl.c:77
+#: ../src/mn-ssl.c:159
msgid "unknown SSL/TLS error"
msgstr "непозната грешка са ССЛ/ТЛС"
@@ -1351,8 +1401,7 @@ msgid "Select _All"
msgstr "Изабери _све"
#. translators: header capitalization
-#. translators: header capitalization
-#: ../src/mn-stock.c:33
+#: ../src/mn-stock.c:32
msgid "Co_nnect"
msgstr "_Повежи се"
@@ -1424,12 +1473,12 @@ msgstr "Текст поруке #%i"
msgid "Mail Notification Properties Dialog"
msgstr "Дијалог за поставке Дојаве поште"
-#: ../src/mn-util.c:350
+#: ../src/mn-util.c:351
#, c-format
msgid "error loading image: %s"
msgstr "грешка при учитавању слике: %s"
-#: ../src/mn-util.c:366
+#: ../src/mn-util.c:367
#, c-format
msgid ""
"Unable to load interface \"%s\". Please check your Mail Notification "
@@ -1437,7 +1486,7 @@ msgid ""
msgstr ""
"Није могуће учитати сучеље „%s?. Молимо проверите инсталацију Дојаве поште."
-#: ../src/mn-util.c:381
+#: ../src/mn-util.c:382
#, c-format
msgid ""
"Widget \"%s\" not found in interface \"%s\". Please check your Mail "
@@ -1446,12 +1495,12 @@ msgstr ""
"Компонента „%s? није пронађена у сучељу „%s?. Молимо проверите инсталацију "
"Дојаве поште."
-#: ../src/mn-util.c:450
+#: ../src/mn-util.c:451
#, c-format
msgid "Unable to open self as a module (%s)."
msgstr "није могуће отворити себе као модул (%s)."
-#: ../src/mn-util.c:455
+#: ../src/mn-util.c:456
#, c-format
msgid ""
"Signal handler \"%s\" not found. Please check your Mail Notification "
@@ -1460,33 +1509,33 @@ msgstr ""
"Обрађивач сигнала „%s? није пронађен. Молимо проверите инсталацију Дојаве "
"поште."
-#: ../src/mn-util.c:606 ../src/mn-util.c:629 ../src/mn-util.c:649
-#: ../src/mn-util.c:671
+#: ../src/mn-util.c:607 ../src/mn-util.c:630 ../src/mn-util.c:650
+#: ../src/mn-util.c:672
msgid "A drag and drop error has occurred"
msgstr "Дошло је до грешке при превлачењу/пуштању"
-#: ../src/mn-util.c:607
+#: ../src/mn-util.c:608
msgid "An invalid location list has been received."
msgstr "Примљен је неважећи списак места."
-#: ../src/mn-util.c:650
+#: ../src/mn-util.c:651
msgid "An invalid Mozilla location has been received."
msgstr "Примљен је неважећи Мозилин списак места."
-#: ../src/mn-util.c:726
+#: ../src/mn-util.c:727
msgid "Unable to display help"
msgstr "Није могуће приказати помоћ"
-#: ../src/mn-util.c:738
+#: ../src/mn-util.c:739
msgid "Unable to open link"
msgstr "није могуће отворити везу"
-#: ../src/mn-util.c:752
+#: ../src/mn-util.c:753
#, c-format
msgid "Unable to create a thread: %s."
msgstr "Није могуће покренути нит: %s."
-#: ../src/mn-util.c:929
+#: ../src/mn-util.c:930
#, c-format
msgid ""
"The following location is invalid:\n"
@@ -1509,16 +1558,16 @@ msgstr[2] ""
"\n"
"%s"
-#: ../src/mn-util.c:945
+#: ../src/mn-util.c:946
msgid "A fatal error has occurred in Mail Notification"
msgstr "Дошло је до кобне грешке у програму за дојаву поште"
-#: ../src/mn-util.c:989
+#: ../src/mn-util.c:990
#, c-format
msgid "unable to get current time: %s"
msgstr "није могуће добавити тренутно време: %s"
-#: ../src/mn-util.c:1304
+#: ../src/mn-util.c:1359
#, c-format
msgid "%i second ago"
msgid_plural "%i seconds ago"
@@ -1526,7 +1575,7 @@ msgstr[0] "пре %i секунду"
msgstr[1] "пре %i секунде"
msgstr[2] "пре %i секунди"
-#: ../src/mn-util.c:1308
+#: ../src/mn-util.c:1363
#, c-format
msgid "about %i minute ago"
msgid_plural "about %i minutes ago"
@@ -1534,7 +1583,7 @@ msgstr[0] "пре око %i минут"
msgstr[1] "пре око %i минута"
msgstr[2] "пре око %i минута"
-#: ../src/mn-util.c:1313
+#: ../src/mn-util.c:1368
#, c-format
msgid "about %i hour ago"
msgid_plural "about %i hours ago"
@@ -1542,7 +1591,7 @@ msgstr[0] "пре око %i сат"
msgstr[1] "пре око %i сата"
msgstr[2] "пре око %i сати"
-#: ../src/mn-util.c:1318
+#: ../src/mn-util.c:1373
#, c-format
msgid "about %i day ago"
msgid_plural "about %i days ago"
@@ -1550,7 +1599,7 @@ msgstr[0] "пре око %i дан"
msgstr[1] "пре око %i дана"
msgstr[2] "пре око %i дана"
-#: ../src/mn-util.c:1323
+#: ../src/mn-util.c:1378
#, c-format
msgid "about %i week ago"
msgid_plural "about %i weeks ago"
@@ -1558,24 +1607,24 @@ msgstr[0] "пре око %i недељу"
msgstr[1] "пре око %i недеље"
msgstr[2] "пре око %i недеља"
-#: ../src/mn-util.c:1336
+#: ../src/mn-util.c:1391
msgid "unknown date"
msgstr "непознат датум"
-#: ../src/mn-util.c:1371
+#: ../src/mn-util.c:1426
msgid "A command error has occurred in Mail Notification"
msgstr "Дошло је до грешке у командама"
-#: ../src/mn-vfs-mailbox.gob:228
+#: ../src/mn-vfs-mailbox.gob:249
#, c-format
msgid "unable to monitor %s (%s), poll mode activated"
msgstr "није могуће надгледати %s (%s), упити су активирани"
-#: ../src/mn-vfs-mailbox.gob:392
+#: ../src/mn-vfs-mailbox.gob:421
msgid "unknown mailbox format"
msgstr "формат сандучета није препознат"
-#: ../src/mn-vfs-mailbox.gob:392
+#: ../src/mn-vfs-mailbox.gob:421
msgid "does not exist"
msgstr "не постоји"
@@ -1742,6 +1791,12 @@ msgstr "_Скраћен"
msgid "icon tooltip's mail summary layout|_Standard"
msgstr "_Обичан"
+#~ msgid "server did not send all the messages we requested"
+#~ msgstr "сервер није послао све тражене поруке"
+
+#~ msgid "server did not send search results"
+#~ msgstr "сервер није послао резултате претраге"
+
#~ msgid "Automatically close the mail summary popup"
#~ msgstr "Аутоматски затвори прозор са сажетком порука"
@@ -2644,4 +2699,3 @@ msgstr "_Обичан"
#~ msgid "Whether to run a command when the icon is double-clicked or not"
#~ msgstr "Да ли се покреће команда при двоструком клику или не"
-
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
@@ -11,10 +11,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 4.0\n"
+"Project-Id-Version: mail-notification 4.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-28 00:14+0100\n"
-"PO-Revision-Date: 2007-01-17 16:03+0100\n"
+"POT-Creation-Date: 2007-06-19 08:42+0200\n"
+"PO-Revision-Date: 2007-06-26 12:10+0200\n"
"Last-Translator: Filip Miletić <filmil@gmail.com>\n"
"Language-Team: Serbian (sr) <gnu@prevod.org>\n"
"MIME-Version: 1.0\n"
@@ -52,8 +52,8 @@ msgstr "Podesi dojavu prispeća pošte"
#: ../data/mail-notification-properties.desktop.in.h:2
#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:234
-#: ../src/mn-main.c:142 ../src/mn-main.c:348 ../src/mn-main.c:364
-#: ../src/mn-main.c:440
+#: ../src/mn-main.c:143 ../src/mn-main.c:350 ../src/mn-main.c:371
+#: ../src/mn-main.c:445
msgid "Mail Notification"
msgstr "Dojava pošte"
@@ -97,13 +97,19 @@ msgstr "Visina prozora sa postavkama"
msgid ""
"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
"amount of time to wait before expiring message popups (minutes part)."
-msgstr "Ako je podešavanje /apps/mail-notification/popups/expiration/enabled postavljeno na „true?, predstavlja vreme koje treba da protekne pre nego što iskačući prozor istekne (minuti)."
+msgstr ""
+"Ako je podešavanje /apps/mail-notification/popups/expiration/enabled "
+"postavljeno na „true?, predstavlja vreme koje treba da protekne pre nego što "
+"iskačući prozor istekne (minuti)."
#: ../data/mail-notification.schemas.in.in.h:10
msgid ""
"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
"amount of time to wait before expiring message popups (seconds part)."
-msgstr "Ako je podešavanje /apps/mail-notification/popups/expiration/enabled postavljeno na \"true\", vreme koje treba da protekne pre nego što iskačući prozor istekne (sekunde)."
+msgstr ""
+"Ako je podešavanje /apps/mail-notification/popups/expiration/enabled "
+"postavljeno na \"true\", vreme koje treba da protekne pre nego što iskačući "
+"prozor istekne (sekunde)."
#: ../data/mail-notification.schemas.in.in.h:11
msgid "Mail changed command"
@@ -114,73 +120,90 @@ msgid "Mail read command"
msgstr "Komanda za čitanje pošte"
#: ../data/mail-notification.schemas.in.in.h:13
+msgid "Message popups actions"
+msgstr "Dejstva u iskačućim porukama"
+
+#: ../data/mail-notification.schemas.in.in.h:14
msgid "Message popups position"
msgstr "Mesto iskačućeg prozora sa porukama"
-#: ../data/mail-notification.schemas.in.in.h:14
+#: ../data/mail-notification.schemas.in.in.h:15
msgid "Minutes to wait before expiring message popups"
-msgstr "Broj minuta koji treba da protekne pre zatvaranja iskačućeg prozora sa porukom"
+msgstr ""
+"Broj minuta koji treba da protekne pre zatvaranja iskačućeg prozora sa porukom"
-#: ../data/mail-notification.schemas.in.in.h:15
+#: ../data/mail-notification.schemas.in.in.h:16
msgid "New mail command"
msgstr "Izvrši kada pošta stigne"
-#: ../data/mail-notification.schemas.in.in.h:16
+#: ../data/mail-notification.schemas.in.in.h:17
msgid "Run a command when all mail is read"
msgstr "Pokreni komandu kada je sva pošta pročitana"
-#: ../data/mail-notification.schemas.in.in.h:17
+#: ../data/mail-notification.schemas.in.in.h:18
msgid "Run a command when new mail arrives"
msgstr "Pokreni komandu kada stigne nova pošta"
-#: ../data/mail-notification.schemas.in.in.h:18
+#: ../data/mail-notification.schemas.in.in.h:19
msgid "Run a command when the message list changes"
msgstr "Pokreni komandu kada se spisak poruka promeni"
-#: ../data/mail-notification.schemas.in.in.h:19
+#: ../data/mail-notification.schemas.in.in.h:20
msgid "Seconds to wait before expiring message popups"
-msgstr "Broj sekundi koji treba da protekne pre zatvaranja iskačućeg prozora sa porukama"
+msgstr ""
+"Broj sekundi koji treba da protekne pre zatvaranja iskačućeg prozora sa "
+"porukama"
-#: ../data/mail-notification.schemas.in.in.h:20
+#: ../data/mail-notification.schemas.in.in.h:21
msgid ""
"The action to perform when the icon is clicked. Must be \"display-properties-"
"dialog\", \"launch-mail-reader\", \"open-latest-message\" or \"update-mail-"
"status\"."
-msgstr "Naredba koja se izvršava pri pritisku na sličicu. Mogu da budu: „prikaži-prozor-sa-postavkama?, „pokreni-čitač-pošte?, „otvori-poslednju-poruku? ili „osveži-status-pošte?."
+msgstr ""
+"Naredba koja se izvršava pri pritisku na sličicu. Mogu da budu: „prikaži-"
+"prozor-sa-postavkama?, „pokreni-čitač-pošte?, „otvori-poslednju-poruku? ili "
+"„osveži-status-pošte?."
-#: ../data/mail-notification.schemas.in.in.h:21
+#: ../data/mail-notification.schemas.in.in.h:22
msgid "The command to run when all mail is read."
msgstr "Komanda koju treba pokrenuti kada je sva pošta pročitana."
-#: ../data/mail-notification.schemas.in.in.h:22
+#: ../data/mail-notification.schemas.in.in.h:23
msgid "The command to run when new mail arrives."
msgstr "Pokreni ovu komandu kada stigne nova pošta."
-#: ../data/mail-notification.schemas.in.in.h:23
+#: ../data/mail-notification.schemas.in.in.h:24
msgid "The command to run when the message list changes."
msgstr "Komanda koja se pokreće kada se promeni spisak poruka."
-#: ../data/mail-notification.schemas.in.in.h:24
+#: ../data/mail-notification.schemas.in.in.h:25
msgid "The height of the properties dialog in pixels."
msgstr "Visina prozora sa postavkama izražena u tačkama."
-#: ../data/mail-notification.schemas.in.in.h:25
+#: ../data/mail-notification.schemas.in.in.h:26
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
msgstr ""
"Spisak proverenih SSL/TLS servera (računar:port) koji nemaju X509 sertifikat."
-#: ../data/mail-notification.schemas.in.in.h:26
+#: ../data/mail-notification.schemas.in.in.h:27
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr "Spisak proverenih X509 sertifikata, predstavljenih MD5 otiskom."
-#: ../data/mail-notification.schemas.in.in.h:27
+#: ../data/mail-notification.schemas.in.in.h:28
+msgid ""
+"The ordered list of actions to include in the message popups. Each element "
+"must be \"open\", \"mark-as-read\", \"mark-as-spam\" or \"delete\"."
+msgstr "Uređeni spisak radnji koje će biti uključene u iskačuće prozore. Elementi moraju da budu jedni od „open?, „mark-as-read?, „mark-as-spam? ili \"delete\"."
+
+#: ../data/mail-notification.schemas.in.in.h:29
msgid "The position of the message popups. Must be \"attached\" or \"free\"."
-msgstr "Mesto iskačućeg prozora sa porukama. Može biti „zakačen? ili „slobodan?."
+msgstr ""
+"Mesto iskačućeg prozora sa porukama. Može biti „zakačen? ili „slobodan?."
-#: ../data/mail-notification.schemas.in.in.h:28
+#: ../data/mail-notification.schemas.in.in.h:30
msgid ""
"The type of mail summary to display in the icon's tooltip. Must be \"standard"
"\", \"compact\" or \"none\"."
@@ -188,54 +211,57 @@ msgstr ""
"Vrsta sažetka pošte koji se prikazuje u oblačiću. Može biti „običan?, "
"„kratak? ili „nijedan?."
-#: ../data/mail-notification.schemas.in.in.h:29
+#: ../data/mail-notification.schemas.in.in.h:31
msgid "The width of the properties dialog in pixels."
msgstr "Širina prozora sa postavkama izražena u tačkama."
-#: ../data/mail-notification.schemas.in.in.h:30
+#: ../data/mail-notification.schemas.in.in.h:32
msgid "Tooltip mail summary"
msgstr "Oblačić sa sažetkom poruka"
-#: ../data/mail-notification.schemas.in.in.h:31
+#: ../data/mail-notification.schemas.in.in.h:33
msgid "Trusted servers list"
msgstr "Spisak proverenih servera"
-#: ../data/mail-notification.schemas.in.in.h:32
+#: ../data/mail-notification.schemas.in.in.h:34
msgid "Whether the status icon should blink on errors or not."
msgstr "Da li sličica treba da treperi ako dođe do greške ili ne."
-#: ../data/mail-notification.schemas.in.in.h:33
+#: ../data/mail-notification.schemas.in.in.h:35
msgid "Whether to display an icon when there is no new mail or not."
msgstr "Da li se prikazuje sličica kada nema nove pošte."
-#: ../data/mail-notification.schemas.in.in.h:34
+#: ../data/mail-notification.schemas.in.in.h:36
msgid "Whether to display seen mail or not."
msgstr "Da li treba prikazivati pregledanu poštu ili ne."
-#: ../data/mail-notification.schemas.in.in.h:35
+#: ../data/mail-notification.schemas.in.in.h:37
msgid "Whether to enable message popups or not."
msgstr "Da li se koriste iskačući prozori sa porukama ili ne."
-#: ../data/mail-notification.schemas.in.in.h:36
+#: ../data/mail-notification.schemas.in.in.h:38
msgid ""
"Whether to expire message popups or not. Must be \"default\", \"false\" or "
"\"true\"."
-msgstr "Da li iskačući prozori ističu ili ne. Mora biti „default?, „false? ili „true?."
+msgstr ""
+"Da li iskačući prozori ističu ili ne. Mora biti „default?, „false? ili "
+"„true?."
-#: ../data/mail-notification.schemas.in.in.h:37
+#: ../data/mail-notification.schemas.in.in.h:39
msgid "Whether to run a command when all mail is read or not."
msgstr ""
"Da li treba ili ne treba pokrenuti neku komandu kada je sva pošta pročitana."
-#: ../data/mail-notification.schemas.in.in.h:38
+#: ../data/mail-notification.schemas.in.in.h:40
msgid "Whether to run a command when new mail arrives or not."
msgstr "Da li treba pokrenuti neku komandu kada stigne nova pošta."
-#: ../data/mail-notification.schemas.in.in.h:39
+#: ../data/mail-notification.schemas.in.in.h:41
msgid "Whether to run a command when the message list changes or not."
-msgstr "Da li treba pokrenuti neku komandu kada se spisak poruka promeni ili ne."
+msgstr ""
+"Da li treba pokrenuti neku komandu kada se spisak poruka promeni ili ne."
-#: ../data/mail-notification.schemas.in.in.h:40
+#: ../data/mail-notification.schemas.in.in.h:42
msgid "Width of properties dialog"
msgstr "Širina prozora sa postavkama"
@@ -260,7 +286,7 @@ msgstr "Sličica za dojavu prispeća pošte"
msgid "translator-credits"
msgstr "Filip Miletić <filmil@gmail.com>"
-#: ../src/mn-auth-combo-box.gob:104
+#: ../src/mn-auth-combo-box.gob:101
#: ../src/mn-autodetect-mailbox-properties.gob:110
msgid "Autodetect"
msgstr "A_utodetekcija"
@@ -308,95 +334,108 @@ msgstr "nije moguće zatvoriti datoteku: %s"
msgid "unable to open mailbox: %s"
msgstr "nije moguće otvoriti sanduče: %s"
-#: ../src/mn-client-session.c:248
+#: ../src/mn-client-session.c:257
#, c-format
msgid "resolving %s"
msgstr "pronalazim %s"
-#: ../src/mn-client-session.c:264
+#: ../src/mn-client-session.c:273
#, c-format
msgid "unable to resolve %s: %s"
msgstr "Nije moguće pronaći %s: %s"
-#: ../src/mn-client-session.c:305
+#: ../src/mn-client-session.c:314
#, c-format
msgid "network address #%i"
msgstr "mrežna adresa #%i"
-#: ../src/mn-client-session.c:308
+#: ../src/mn-client-session.c:317
#, c-format
msgid "unable to convert network address #%i into textual form: %s"
msgstr "mrežna adresa #%i se ne može prebaciti u tekstualni oblik: %s"
-#: ../src/mn-client-session.c:319
+#: ../src/mn-client-session.c:328
#, c-format
msgid "%s: unsupported address family"
msgstr "%s: ova vrsta adrese nije podržana"
-#: ../src/mn-client-session.c:326
+#: ../src/mn-client-session.c:335
#, c-format
msgid "%s: unable to create socket: %s"
msgstr "%s: nije moguće napraviti utičnicu: %s"
-#: ../src/mn-client-session.c:330
+#: ../src/mn-client-session.c:339
#, c-format
msgid "connecting to %s (%s) port %i"
msgstr "povezujem se sa %s (%s) port %i"
-#: ../src/mn-client-session.c:333
+#: ../src/mn-client-session.c:342
#, c-format
msgid "unable to connect: %s"
msgstr "nije moguće povezati se sa: %s"
-#: ../src/mn-client-session.c:338
+#: ../src/mn-client-session.c:347
msgid "connected successfully"
msgstr "povezivanje je uspelo"
#. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:352
+#: ../src/mn-client-session.c:361
#, c-format
msgid "unable to connect to %s"
msgstr "nije moguće povezati se sa %s"
-#: ../src/mn-client-session.c:379
+#: ../src/mn-client-session.c:388
#, c-format
msgid "unable to initialize the OpenSSL library: %s"
msgstr "nije moguće pokrenuti OpenSSL biblioteku: %s"
-#: ../src/mn-client-session.c:387
+#: ../src/mn-client-session.c:396
#, c-format
msgid "unable to create a SSL/TLS object: %s"
msgstr "nije moguće napraviti SSL/TLS objekat: %s"
-#: ../src/mn-client-session.c:393
+#: ../src/mn-client-session.c:402
#, c-format
msgid "unable to set the SSL/TLS file descriptor: %s"
msgstr "nije moguće postaviti SSL/TLS opis za datoteku: %s"
-#: ../src/mn-client-session.c:399
+#: ../src/mn-client-session.c:408
#, c-format
msgid "unable to perform the SSL/TLS handshake: %s"
msgstr "nije moguće obaviti SSL/TLS kontakt: %s"
-#: ../src/mn-client-session.c:405
+#: ../src/mn-client-session.c:414
msgid "untrusted server"
msgstr "neproveren server"
-#: ../src/mn-client-session.c:409
+#: ../src/mn-client-session.c:418
#, c-format
msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
msgstr "SSL/TLS sloj je pokrenut (%s, %s %i-bit)"
-#: ../src/mn-client-session.c:456
+#: ../src/mn-client-session.c:589
+msgid "server name not found in certificate"
+msgstr "ime servera nije pronađeno u sertifikatu"
+
+#: ../src/mn-client-session.c:594
+#, c-format
+msgid ""
+"user-provided server name \"%s\" does not match certificate-provided server "
+"name \"%s\""
+msgstr "ime servera koje je zadao korisnik („%s?) se ne poklapa sa imenom servera koje stoji u sertifikatu („%s?)"
+
+#: ../src/mn-client-session.c:612
#, c-format
-msgid "%s, fingerprint: %s"
-msgstr "%s, otisak: %s"
+msgid ""
+"user-provided server name \"%s\" matches none of the certificate-provided "
+"server names %s"
+msgstr "ime servera koje je zadao korisnik (\"%s\") ne poklapa se ni sa jednim od imena servera koja stoje u sertifikatu"
-#: ../src/mn-client-session.c:485
+#: ../src/mn-client-session.c:688
msgid "missing certificate"
msgstr "nedostaje sertifikat"
-#: ../src/mn-client-session.c:511
+#: ../src/mn-client-session.c:717
#, c-format
msgid ""
"Mail Notification was unable to trust \"%s\" (%s). It is possible that "
@@ -415,120 +454,125 @@ msgstr ""
"sa \"%s\". Ako odlučite da se povežete na server, ova poruka neće ponovo "
"biti prikazana."
-#: ../src/mn-client-session.c:526
+#: ../src/mn-client-session.c:731
+#, c-format
+msgid "Certificate fingerprint: %s."
+msgstr "Otisak sertifikata: %s."
+
+#: ../src/mn-client-session.c:738
msgid "Connect to untrusted server?"
msgstr "Da li da se povežem na neprovereni server?"
-#: ../src/mn-client-session.c:591
+#: ../src/mn-client-session.c:803
#, c-format
msgid "response \"%s\" is not valid in current context"
msgstr "odgovor \"%s\" nije ispravan u trenutno važećem kontekstu"
-#: ../src/mn-client-session.c:620
+#: ../src/mn-client-session.c:832
#, c-format
msgid "unable to parse response \"%s\""
msgstr "nije moguće obraditi odgovor \"%s\""
-#: ../src/mn-client-session.c:670 ../src/mn-client-session.c:677
+#: ../src/mn-client-session.c:882 ../src/mn-client-session.c:889
#, c-format
msgid "unable to read from server: %s"
msgstr "Nije moguće čitanje sa servera: %s"
-#: ../src/mn-client-session.c:675
+#: ../src/mn-client-session.c:887
msgid "unable to read from server: EOF"
msgstr "Nije moguće čitanje sa servera: EOF"
-#: ../src/mn-client-session.c:687
+#: ../src/mn-client-session.c:899
#, c-format
msgid "unable to decode data using SASL: %s"
msgstr "Ne mogu se dekodovati podaci putem SASL: %s"
-#: ../src/mn-client-session.c:832
+#: ../src/mn-client-session.c:1044
#, c-format
msgid "unable to encode data using SASL: %s"
msgstr "nije moguće kodirati podatke uz pomoć SASL: %s"
-#: ../src/mn-client-session.c:863 ../src/mn-client-session.c:870
+#: ../src/mn-client-session.c:1075 ../src/mn-client-session.c:1082
#, c-format
msgid "unable to write to server: %s"
msgstr "nije moguć upis na server: %s"
-#: ../src/mn-client-session.c:868
+#: ../src/mn-client-session.c:1080
msgid "unable to write to server: EOF"
msgstr "nije moguć upis na server: EOF"
-#: ../src/mn-client-session.c:899 ../src/mn-pop3-mailbox.gob:434
+#: ../src/mn-client-session.c:1111 ../src/mn-pop3-mailbox.gob:434
#, c-format
msgid "unable to encode Base64: %s"
msgstr "nije moguće kodirati Base64: %s"
-#: ../src/mn-client-session.c:1076
+#: ../src/mn-client-session.c:1288
#, c-format
msgid "unable to initialize the SASL library: %s"
msgstr "ne može se pokrenuti SASL biblioteka: %s"
-#: ../src/mn-client-session.c:1088
+#: ../src/mn-client-session.c:1300
#, c-format
msgid "unable to retrieve local address of socket: %s"
msgstr "ne može da se dobavi lokalna adresa utičnice: %s"
-#: ../src/mn-client-session.c:1094
+#: ../src/mn-client-session.c:1306
#, c-format
msgid "unable to retrieve remote address of socket: %s"
msgstr "ne može da se dobavi udaljena adresa utičnice: %s"
-#: ../src/mn-client-session.c:1128
+#: ../src/mn-client-session.c:1340
#, c-format
msgid "unable to set SASL security properties: %s"
msgstr "nije moguće postaviti SASL sigurnosne postavke: %s"
-#: ../src/mn-client-session.c:1152
+#: ../src/mn-client-session.c:1364
msgid ""
"unable to start SASL authentication: SASL asked for something we did not know"
msgstr "ne može se pokrenuti SASL prijava: SASL traži podatke koje nemamo"
-#: ../src/mn-client-session.c:1171
+#: ../src/mn-client-session.c:1383
#, c-format
msgid "unable to start SASL authentication: %s"
msgstr "ne može se pokrenuti SASL prijava: %s"
-#: ../src/mn-client-session.c:1175
+#: ../src/mn-client-session.c:1387
#, c-format
msgid "unable to create a SASL connection: %s"
msgstr "nije moguće uspostaviti SASL vezu: %s"
-#: ../src/mn-client-session.c:1222
+#: ../src/mn-client-session.c:1434
msgid "SASL asked for something we did not know, aborting SASL authentication"
msgstr "SASL je tražio nama nepoznate podatke, obustavljam SASL prijavu"
-#: ../src/mn-client-session.c:1239
+#: ../src/mn-client-session.c:1451
#, c-format
msgid "%s, aborting SASL authentication"
msgstr "%s, obustavljam SASL prijavu"
#. compliance error
-#: ../src/mn-client-session.c:1244
+#: ../src/mn-client-session.c:1456
#, c-format
msgid "unable to decode Base64 input from server: %s"
msgstr "nije moguće dekodovati Base64 ulaz sa servera: %s"
-#: ../src/mn-client-session.c:1280
+#: ../src/mn-client-session.c:1492
#, c-format
msgid "a SASL security layer of strength factor %i is now active"
msgstr "SASL sigurnosni sloj nivoa snage %i je uspostavljen"
#. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1285
+#: ../src/mn-client-session.c:1497
#, c-format
msgid "unable to get SASL_MAXOUTBUF property: %s"
msgstr "ne mogu da pročitam postavku SASL_MAXOUTBUF: %s"
-#: ../src/mn-client-session.c:1291
+#: ../src/mn-client-session.c:1503
#, c-format
msgid "warning: unable to get SASL_SSF property: %s"
msgstr "upozorenje: ne mogu da pročitam postavku SASL_SSF: %s"
-#: ../src/mn-client-session.c:1450
+#: ../src/mn-client-session.c:1662
msgid "unknown server error"
msgstr "nepoznata greška na serveru"
@@ -548,25 +592,25 @@ msgstr "Tema"
msgid "Sent"
msgstr "Poslato"
-#: ../src/mn-conf.c:281
+#: ../src/mn-conf.c:282
msgid "A directory creation error has occurred"
msgstr "Došlo je do greške pri pravljenju direktorijuma"
-#: ../src/mn-conf.c:282
+#: ../src/mn-conf.c:283
#, c-format
msgid "Unable to create directory \"%s\": %s."
msgstr "Nije moguće napraviti direktorijum ?%s?: %s."
-#: ../src/mn-conf.c:406
+#: ../src/mn-conf.c:407
#, c-format
msgid "recursively unsetting %s"
msgstr "rekurzivno poništavam %s"
-#: ../src/mn-conf.c:410
+#: ../src/mn-conf.c:411
msgid "syncing the GConf database"
msgstr "usklađujem GConf bazu podataka"
-#: ../src/mn-conf.c:413
+#: ../src/mn-conf.c:414
msgid "completed"
msgstr "urađeno"
@@ -574,7 +618,7 @@ msgstr "urađeno"
msgid "invalid location"
msgstr "nevažeće mesto"
-#: mn-evolution-folder-tree-control.gob:69
+#: ../src/mn-evolution-folder-tree-control.gob:69
msgid "The currently selected URI"
msgstr "Trenutno izabran URI"
@@ -586,10 +630,9 @@ msgstr "Fascikla"
#: ../src/mn-evolution-mailbox-properties.gob:204
msgid ""
"Mail Notification can not contact Evolution. Make sure that Evolution is "
-"running and that the Evolution Mail Notification plugin is loaded."
-msgstr ""
-"Dojava pošte ne može da se poveže sa Evolucijom. Pokrenite Evoluciju i "
-"uključite dodatak za povezivanje sa Dojavom pošte."
+"running and that the Evolution Jean-Yves Lefort's Mail Notification plugin "
+"is loaded."
+msgstr "Dojava pošte ne može da se poveže sa Evolucijom. Pokrenite Evoluciju i uključite dodatak Žan-Iva Leforta (Jean-Yves Lefort) za povezivanje Evolucije sa Dojavom pošte."
#: ../src/mn-evolution-mailbox.gob:78
msgid "folder not found"
@@ -616,7 +659,7 @@ msgstr ""
"Bonobo nije uspeo da pronađe %s server. Molim proverite instalaciju Dojave "
"pošte."
-#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:518
+#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:523
#, c-format
msgid ""
"Bonobo was unable to register the %s server. Please check your Mail "
@@ -664,7 +707,7 @@ msgstr "Nije moguće pronaći u %s: %s"
msgid "unable to tell position of %s: %s"
msgstr "nije moguće saznati položaj za %s: %s"
-#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:167
+#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:174
#, c-format
msgid "unable to close %s: %s"
msgstr "nije moguće zatvoriti %s: %s"
@@ -700,28 +743,23 @@ msgstr "A_utodetekcija"
msgid "Al_ways"
msgstr "_Uvek"
-#: ../src/mn-imap-mailbox.gob:385
+#: ../src/mn-imap-mailbox.gob:381
msgid "server did not send capabilities"
msgstr "server nije obavestio o svojim mogućnostima"
-#: ../src/mn-imap-mailbox.gob:552
+#: ../src/mn-imap-mailbox.gob:548
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr "server je dojavio LOGINDISABLED, LOGIN prijava neće biti korišćena"
-#: ../src/mn-imap-mailbox.gob:553
+#: ../src/mn-imap-mailbox.gob:549
msgid "unable to login"
msgstr "prijava nije moguća"
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:753
-msgid "server did not send all the messages we requested"
-msgstr "server nije poslao sve tražene poruke"
-
-#: ../src/mn-imap-mailbox.gob:823
+#: ../src/mn-imap-mailbox.gob:822
msgid "unable to fetch message"
msgstr "nije moguće dobaviti poruku"
-#: ../src/mn-imap-mailbox.gob:848
+#: ../src/mn-imap-mailbox.gob:838
msgid ""
"\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
"logging out"
@@ -729,26 +767,26 @@ msgstr ""
"„Koristi IDLE proširenje“ je postavljeno na „nikad“ u postavkama sandučića, "
"odjavljujem se"
-#: ../src/mn-imap-mailbox.gob:859
+#: ../src/mn-imap-mailbox.gob:849
#, c-format
msgid "the remote server runs %s, not using the IDLE extension"
msgstr "udaljeni server koristi %s, ne koristim IDLE produžetak"
-#: ../src/mn-imap-mailbox.gob:864
+#: ../src/mn-imap-mailbox.gob:854
#, c-format
msgid ""
"the remote server runs %s, the IDLE extension might not function properly"
msgstr "udaljeni server koristi %s, IDLE proširenje možda neće ispravno raditi"
-#: ../src/mn-imap-mailbox.gob:873
+#: ../src/mn-imap-mailbox.gob:863
msgid "the remote server does not support the IDLE extension, logging out"
msgstr "udaljeni server ne podržava IDLE proširenje, odjavljujem se"
-#: ../src/mn-imap-mailbox.gob:1378 ../src/mn-pop3-mailbox.gob:297
+#: ../src/mn-imap-mailbox.gob:1368 ../src/mn-pop3-mailbox.gob:297
msgid "server does not support in-band SSL/TLS"
msgstr "server ne podržava zaštitu putem SSL/TLS"
-#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:954
+#: ../src/mn-imap-mailbox.gob:1392 ../src/mn-pop3-mailbox.gob:956
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
@@ -756,30 +794,24 @@ msgstr ""
"izabran je mehanizam za prijavu koji koristi SASL ali podrška za SASL nije "
"ugrađena u program"
-#: ../src/mn-imap-mailbox.gob:1412 ../src/mn-pop3-mailbox.gob:974
+#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:976
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "nepoznat mehanizam za prijavu \"%s\""
-#: ../src/mn-imap-mailbox.gob:1444 ../src/mn-pop3-mailbox.gob:1010
+#: ../src/mn-imap-mailbox.gob:1434 ../src/mn-pop3-mailbox.gob:1012
#, c-format
msgid "disabling mechanism \"%s\" and retrying SASL authentication"
msgstr "isključujem mehanizam „%s“ i pokušavam SASL prijavu"
-#: ../src/mn-imap-mailbox.gob:1456
+#: ../src/mn-imap-mailbox.gob:1446
msgid "falling back to IMAP LOGIN authentication"
msgstr "povratak na IMAP LOGIN prijavu"
-#: ../src/mn-imap-mailbox.gob:1468 ../src/mn-pop3-mailbox.gob:1039
+#: ../src/mn-imap-mailbox.gob:1458 ../src/mn-pop3-mailbox.gob:1041
msgid "authentication failed"
msgstr "prijava nije uspela"
-#. success; caller must switch state itself
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:1529
-msgid "server did not send search results"
-msgstr "server nije poslao rezultate pretrage"
-
#. translators: header capitalization
#: ../src/mn-mail-icon.gob:93
msgid "_Mail Reader"
@@ -829,16 +861,16 @@ msgstr "%s sanduče"
msgid "detecting mailbox type..."
msgstr "prepoznajem vrstu sandučeta..."
-#: ../src/mn-mailbox.gob:504
+#: ../src/mn-mailbox.gob:507
msgid "\"type\" attribute missing"
msgstr "nedostaje atribut „vrsta“"
-#: ../src/mn-mailbox.gob:511
+#: ../src/mn-mailbox.gob:514
#, c-format
msgid "unknown mailbox type \"%s\""
msgstr "nepoznata vrsta sandučeta „%s“"
-#: ../src/mn-mailbox.gob:907
+#: ../src/mn-mailbox.gob:910
#, c-format
msgid "property \"%s\" has no value"
msgstr "osobina „%s“ nema postavljenu vrednost"
@@ -949,71 +981,71 @@ msgstr "nije moguće zatvoriti fasciklu „%s?: %s"
msgid "error while reading folder \"%s\": %s"
msgstr "greška pri čitanju fascikle „%s?: %s"
-#: ../src/mn-main.c:109
+#: ../src/mn-main.c:110
msgid "yes"
msgstr "da"
-#: ../src/mn-main.c:109
+#: ../src/mn-main.c:110
msgid "no"
msgstr "ne"
-#: ../src/mn-main.c:142
+#: ../src/mn-main.c:143
#, c-format
msgid "%s version %s\n"
msgstr "%s izdanje %s\n"
-#: ../src/mn-main.c:147
+#: ../src/mn-main.c:148
msgid "Mailbox backends:\n"
msgstr "Podržani sandučići:\n"
-#: ../src/mn-main.c:152
+#: ../src/mn-main.c:153
msgid "POP3 and IMAP features:\n"
msgstr "Mogućnosti za POP3 i IMAP:\n"
# FIXME: izbaci latinični naziv kada bude vreme
-#: ../src/mn-main.c:157
+#: ../src/mn-main.c:158
msgid "Sylpheed features:\n"
msgstr "Osobine Silfida (Sylpheed):\n"
-#: ../src/mn-main.c:205
+#: ../src/mn-main.c:206
#, c-format
msgid "A Bonobo exception (%s) has occurred in %s()."
msgstr "Desio se Bonobov izuzetak (%s) u %s()."
-#: ../src/mn-main.c:247
+#: ../src/mn-main.c:248
#, c-format
msgid "%s option ignored since Mail Notification is not already running"
msgstr "Opcija %s je zanemarena jer Dojava pošte još uvek nije pokrenuta"
-#: ../src/mn-main.c:267
+#: ../src/mn-main.c:268
msgid "Show version information"
msgstr "Prikaži podatke o izdanju"
-#: ../src/mn-main.c:276
+#: ../src/mn-main.c:277
msgid "Enable informational output"
msgstr "Dozvoli rečitiji izlaz"
-#: ../src/mn-main.c:285
+#: ../src/mn-main.c:286
msgid "Display the properties dialog"
msgstr "Prikaži prozor sa postavkama"
-#: ../src/mn-main.c:294
+#: ../src/mn-main.c:295
msgid "Display the about dialog"
msgstr "Prikaži podatke o programu"
-#: ../src/mn-main.c:303
+#: ../src/mn-main.c:304
msgid "Update the mail status"
msgstr "Osveži podatke o pošti"
-#: ../src/mn-main.c:312
+#: ../src/mn-main.c:313
msgid "Print a XML mail summary"
msgstr "Ispiši sažetak poruka u XML formatu"
-#: ../src/mn-main.c:321
+#: ../src/mn-main.c:322
msgid "Unset obsolete GConf configuration"
msgstr "Poništi zastarela GConf podešavanja"
-#: ../src/mn-main.c:330
+#: ../src/mn-main.c:331
msgid "Quit Mail Notification"
msgstr "Ugasi dojavu pošte"
@@ -1021,11 +1053,11 @@ msgstr "Ugasi dojavu pošte"
#. * We cannot use mn_fatal_error_dialog() because gtk_init() has
#. * not been called yet.
#.
-#: ../src/mn-main.c:356
+#: ../src/mn-main.c:358
msgid "multi-threading is not available"
msgstr "višenitni rad nije podržan"
-#: ../src/mn-main.c:407
+#: ../src/mn-main.c:412
msgid ""
"Bonobo could not locate the automation object. Please check your Mail "
"Notification installation."
@@ -1035,37 +1067,39 @@ msgstr ""
"Bonobo u Gnomu 2.6, kada instalirate program za obaveštenja, treba da se "
"odjavite i ponovo prijavite na sistem da bi sve počelo da radi)"
-#: ../src/mn-main.c:413
+#: ../src/mn-main.c:418
msgid "quitting Mail Notification"
msgstr "Gasim dojavu pošte"
-#: ../src/mn-main.c:417
+#: ../src/mn-main.c:422
msgid "Mail Notification is not running"
msgstr "Program za dojavu pošte nije pokrenut."
-#: ../src/mn-main.c:432
+#: ../src/mn-main.c:437
msgid "Unable to initialize the GnomeVFS library."
msgstr "Nije moguće pokrenuti biblioteku GnomeVFS."
-#: ../src/mn-main.c:442
+#: ../src/mn-main.c:447
msgid "An initialization error has occurred in Mail Notification"
msgstr "Došlo je do greške pri pokretanju programa za dojavu pošte"
-#: ../src/mn-main.c:443
+#: ../src/mn-main.c:448
msgid ""
"Unable to initialize the notification library. Message popups will not be "
"displayed."
-msgstr "Biblioteka za dojavu ne može da se pokrene. Iskačući prozori sa porukama neće biti prikazivani."
+msgstr ""
+"Biblioteka za dojavu ne može da se pokrene. Iskačući prozori sa porukama "
+"neće biti prikazivani."
-#: ../src/mn-main.c:481
+#: ../src/mn-main.c:486
msgid "updating the mail status"
msgstr "Proveravam poštu"
-#: ../src/mn-main.c:497
+#: ../src/mn-main.c:502
msgid "Mail Notification is already running"
msgstr "Program za dojavu pošte je već pokrenut."
-#: ../src/mn-main.c:514
+#: ../src/mn-main.c:519
#, c-format
msgid ""
"Bonobo could not locate the %s file. Please check your Mail Notification "
@@ -1074,38 +1108,38 @@ msgstr ""
"Bonobo nije mogao da pronađe datoteku %s. Molimo proverite podešavanja Dojave "
"pošte."
-#: ../src/mn-message-mime.c:168
+#: ../src/mn-message-mime.c:193
msgid "unable to parse MIME message"
msgstr "nije moguće obraditi MIME poruku"
-#: ../src/mn-message.gob:144
+#: ../src/mn-message.gob:145
msgid "Unknown"
msgstr "Nepoznato"
-#: ../src/mn-message.gob:207
+#: ../src/mn-message.gob:208
msgid "unterminated substitution"
msgstr "zamena nema kraj"
-#: ../src/mn-message.gob:246
+#: ../src/mn-message.gob:247
#, c-format
msgid "unknown substitution \"%s\""
msgstr "nepoznata zamena „%s?"
-#: ../src/mn-message.gob:249
+#: ../src/mn-message.gob:250
msgid "empty substitution"
msgstr "prazna zamena"
-#: ../src/mn-message.gob:312 ../src/mn-util.c:1372
+#: ../src/mn-message.gob:313 ../src/mn-util.c:1427
#, c-format
msgid "Unable to execute \"%s\": %s."
msgstr "Nije moguće izvršiti „%s?: %s."
-#: ../src/mn-mh-mailbox-backend.gob:170
+#: ../src/mn-mh-mailbox-backend.gob:177
#, c-format
msgid "error while reading %s: %s"
msgstr "greška pri čitanju %s: %s"
-#: ../src/mn-mh-mailbox-backend.gob:183
+#: ../src/mn-mh-mailbox-backend.gob:190
#, c-format
msgid "unable to open %s: %s"
msgstr "nije moguće otvoriti %s: %s"
@@ -1148,11 +1182,11 @@ msgstr "_Mehanizam:"
msgid "Connection"
msgstr "Veza"
-#: ../src/mn-pi-mailbox.gob:153
+#: ../src/mn-pi-mailbox.gob:154
msgid "SSL/TLS support has not been compiled in"
msgstr "Podrška za SSL/TLS nije ugrađena"
-#: ../src/mn-pi-mailbox.gob:319
+#: ../src/mn-pi-mailbox.gob:320
#, c-format
msgid ""
"Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -1165,14 +1199,14 @@ msgstr ""
"\n"
"Molim unesite ponovo lozinku."
-#: ../src/mn-pi-mailbox.gob:320
+#: ../src/mn-pi-mailbox.gob:321
#, c-format
msgid "Enter your credentials for %s mailbox %s."
msgstr "Unesite lozinku za %s sanduče %s."
#. keep the title in sync with gnome-authentication-manager
#. translators: header capitalization
-#: ../src/mn-pi-mailbox.gob:363
+#: ../src/mn-pi-mailbox.gob:364
msgid "Authentication Required"
msgstr "Potrebna je prijava"
@@ -1206,74 +1240,88 @@ msgstr[0] "tražen je zastoj pri prijavi, pauziram %i sekundu"
msgstr[1] "tražen je zastoj pri prijavi, pauziram %i sekunde"
msgstr[2] "tražen je zastoj pri prijavi, pauziram %i sekundi"
-#: ../src/mn-pop3-mailbox.gob:966
+#: ../src/mn-pop3-mailbox.gob:968
msgid "server does not support APOP authentication"
msgstr "server ne podržava prijavu korišćenjem mehanizma APOP"
-#: ../src/mn-pop3-mailbox.gob:1022
+#: ../src/mn-pop3-mailbox.gob:1024
msgid "falling back to APOP authentication"
msgstr "prelazim na APOP prijavu"
-#: ../src/mn-pop3-mailbox.gob:1027
+#: ../src/mn-pop3-mailbox.gob:1029
msgid "falling back to USER/PASS authentication"
msgstr "prelazim na prijavu pomoću imena i lozinke"
-#: ../src/mn-popup.gob:52 ../src/mn-standard-message-view.gob:63
+#: ../src/mn-popup.gob:60 ../src/mn-standard-message-view.gob:63
msgid "Mailbox:"
msgstr "Sanduče:"
-#: ../src/mn-popup.gob:54 ../src/mn-standard-message-view.gob:65
+#: ../src/mn-popup.gob:62 ../src/mn-standard-message-view.gob:65
msgid "Unreadable message:"
msgstr "Nečitljiva poruka:"
-#: ../src/mn-popup.gob:57 ../src/mn-standard-message-view.gob:68
+#: ../src/mn-popup.gob:65 ../src/mn-standard-message-view.gob:68
msgid "From:"
msgstr "Šalje:"
-#: ../src/mn-popup.gob:58 ../src/mn-standard-message-view.gob:69
+#: ../src/mn-popup.gob:66 ../src/mn-standard-message-view.gob:69
msgid "Subject:"
msgstr "Tema:"
+#: ../src/mn-popup.gob:128
+#, c-format
+msgid "configuration key %s: there is no action named `%s'"
+msgstr "ključ za podešavanja %s: ne postoji dejstvo koje se zove „%s?"
+
#. translators: header capitalization
-#: ../src/mn-popup.gob:79
+#: ../src/mn-popup.gob:141
msgid "Open"
msgstr "Otvori"
#. translators: header capitalization
-#: ../src/mn-popup.gob:87
+#: ../src/mn-popup.gob:154
msgid "Mark as Read"
msgstr "Označi kao pročitano"
#. translators: header capitalization
-#: ../src/mn-popup.gob:95
+#: ../src/mn-popup.gob:167
msgid "Mark as Spam"
msgstr "Označi kao nepoželjno"
-#: ../src/mn-popup.gob:117
+#. translators: header capitalization
+#: ../src/mn-popup.gob:180
+msgid "Delete"
+msgstr "Ukloni"
+
+#: ../src/mn-popup.gob:196
msgid "Unable to open message"
msgstr "Nije moguće otvoriti poruku"
-#: ../src/mn-popup.gob:134
+#: ../src/mn-popup.gob:213
msgid "Unable to mark message as read"
msgstr "Nije moguće poruku označiti kao pročitanu"
-#: ../src/mn-popup.gob:151
+#: ../src/mn-popup.gob:230
msgid "Unable to mark message as spam"
msgstr "Nije moguće označiti poruku kao neželjenu"
-#: ../src/mn-popup.gob:210
+#: ../src/mn-popup.gob:247
+msgid "Unable to delete message"
+msgstr "Nije moguće ukloniti poruku"
+
+#: ../src/mn-popup.gob:306
#, c-format
msgid "unable to show popup: %s"
msgstr "nije moguće prikazati iskačući prozor: %s"
-#: ../src/mn-popup.gob:227
+#: ../src/mn-popup.gob:323
#, c-format
msgid "unable to close popup: %s"
msgstr "nije moguće zatvoriti iskačući prozor: %s"
#. we set the summary here because libnotify requires it
#. translators: header capitalization
-#: ../src/mn-popup.gob:238
+#: ../src/mn-popup.gob:334
msgid "New Message"
msgstr "Nova poruka"
@@ -1307,7 +1355,9 @@ msgstr "Čitač pošte nije podešen"
msgid ""
"You can configure a mail reader by choosing <b>System → Preferences → "
"Preferred Applications</b>."
-msgstr "Možete da podesite čitač pošte izborom <b>Sistem → Postavke → Omiljeni programi</b>."
+msgstr ""
+"Možete da podesite čitač pošte izborom <b>Sistem → Postavke → Omiljeni "
+"programi</b>."
#: ../src/mn-shell.gob:236 ../src/mn-shell.gob:242 ../src/mn-shell.gob:534
msgid "Unable to open the latest message"
@@ -1337,7 +1387,7 @@ msgstr "Greške"
msgid "Mail Summary"
msgstr "Sažetak poruka"
-#: ../src/mn-ssl.c:77
+#: ../src/mn-ssl.c:159
msgid "unknown SSL/TLS error"
msgstr "nepoznata greška sa SSL/TLS"
@@ -1351,8 +1401,7 @@ msgid "Select _All"
msgstr "Izaberi _sve"
#. translators: header capitalization
-#. translators: header capitalization
-#: ../src/mn-stock.c:33
+#: ../src/mn-stock.c:32
msgid "Co_nnect"
msgstr "_Poveži se"
@@ -1424,12 +1473,12 @@ msgstr "Tekst poruke #%i"
msgid "Mail Notification Properties Dialog"
msgstr "Dijalog za postavke Dojave pošte"
-#: ../src/mn-util.c:350
+#: ../src/mn-util.c:351
#, c-format
msgid "error loading image: %s"
msgstr "greška pri učitavanju slike: %s"
-#: ../src/mn-util.c:366
+#: ../src/mn-util.c:367
#, c-format
msgid ""
"Unable to load interface \"%s\". Please check your Mail Notification "
@@ -1437,7 +1486,7 @@ msgid ""
msgstr ""
"Nije moguće učitati sučelje „%s?. Molimo proverite instalaciju Dojave pošte."
-#: ../src/mn-util.c:381
+#: ../src/mn-util.c:382
#, c-format
msgid ""
"Widget \"%s\" not found in interface \"%s\". Please check your Mail "
@@ -1446,12 +1495,12 @@ msgstr ""
"Komponenta „%s? nije pronađena u sučelju „%s?. Molimo proverite instalaciju "
"Dojave pošte."
-#: ../src/mn-util.c:450
+#: ../src/mn-util.c:451
#, c-format
msgid "Unable to open self as a module (%s)."
msgstr "nije moguće otvoriti sebe kao modul (%s)."
-#: ../src/mn-util.c:455
+#: ../src/mn-util.c:456
#, c-format
msgid ""
"Signal handler \"%s\" not found. Please check your Mail Notification "
@@ -1460,33 +1509,33 @@ msgstr ""
"Obrađivač signala „%s? nije pronađen. Molimo proverite instalaciju Dojave "
"pošte."
-#: ../src/mn-util.c:606 ../src/mn-util.c:629 ../src/mn-util.c:649
-#: ../src/mn-util.c:671
+#: ../src/mn-util.c:607 ../src/mn-util.c:630 ../src/mn-util.c:650
+#: ../src/mn-util.c:672
msgid "A drag and drop error has occurred"
msgstr "Došlo je do greške pri prevlačenju/puštanju"
-#: ../src/mn-util.c:607
+#: ../src/mn-util.c:608
msgid "An invalid location list has been received."
msgstr "Primljen je nevažeći spisak mesta."
-#: ../src/mn-util.c:650
+#: ../src/mn-util.c:651
msgid "An invalid Mozilla location has been received."
msgstr "Primljen je nevažeći Mozilin spisak mesta."
-#: ../src/mn-util.c:726
+#: ../src/mn-util.c:727
msgid "Unable to display help"
msgstr "Nije moguće prikazati pomoć"
-#: ../src/mn-util.c:738
+#: ../src/mn-util.c:739
msgid "Unable to open link"
msgstr "nije moguće otvoriti vezu"
-#: ../src/mn-util.c:752
+#: ../src/mn-util.c:753
#, c-format
msgid "Unable to create a thread: %s."
msgstr "Nije moguće pokrenuti nit: %s."
-#: ../src/mn-util.c:929
+#: ../src/mn-util.c:930
#, c-format
msgid ""
"The following location is invalid:\n"
@@ -1509,16 +1558,16 @@ msgstr[2] ""
"\n"
"%s"
-#: ../src/mn-util.c:945
+#: ../src/mn-util.c:946
msgid "A fatal error has occurred in Mail Notification"
msgstr "Došlo je do kobne greške u programu za dojavu pošte"
-#: ../src/mn-util.c:989
+#: ../src/mn-util.c:990
#, c-format
msgid "unable to get current time: %s"
msgstr "nije moguće dobaviti trenutno vreme: %s"
-#: ../src/mn-util.c:1304
+#: ../src/mn-util.c:1359
#, c-format
msgid "%i second ago"
msgid_plural "%i seconds ago"
@@ -1526,7 +1575,7 @@ msgstr[0] "pre %i sekundu"
msgstr[1] "pre %i sekunde"
msgstr[2] "pre %i sekundi"
-#: ../src/mn-util.c:1308
+#: ../src/mn-util.c:1363
#, c-format
msgid "about %i minute ago"
msgid_plural "about %i minutes ago"
@@ -1534,7 +1583,7 @@ msgstr[0] "pre oko %i minut"
msgstr[1] "pre oko %i minuta"
msgstr[2] "pre oko %i minuta"
-#: ../src/mn-util.c:1313
+#: ../src/mn-util.c:1368
#, c-format
msgid "about %i hour ago"
msgid_plural "about %i hours ago"
@@ -1542,7 +1591,7 @@ msgstr[0] "pre oko %i sat"
msgstr[1] "pre oko %i sata"
msgstr[2] "pre oko %i sati"
-#: ../src/mn-util.c:1318
+#: ../src/mn-util.c:1373
#, c-format
msgid "about %i day ago"
msgid_plural "about %i days ago"
@@ -1550,7 +1599,7 @@ msgstr[0] "pre oko %i dan"
msgstr[1] "pre oko %i dana"
msgstr[2] "pre oko %i dana"
-#: ../src/mn-util.c:1323
+#: ../src/mn-util.c:1378
#, c-format
msgid "about %i week ago"
msgid_plural "about %i weeks ago"
@@ -1558,24 +1607,24 @@ msgstr[0] "pre oko %i nedelju"
msgstr[1] "pre oko %i nedelje"
msgstr[2] "pre oko %i nedelja"
-#: ../src/mn-util.c:1336
+#: ../src/mn-util.c:1391
msgid "unknown date"
msgstr "nepoznat datum"
-#: ../src/mn-util.c:1371
+#: ../src/mn-util.c:1426
msgid "A command error has occurred in Mail Notification"
msgstr "Došlo je do greške u komandama"
-#: ../src/mn-vfs-mailbox.gob:228
+#: ../src/mn-vfs-mailbox.gob:249
#, c-format
msgid "unable to monitor %s (%s), poll mode activated"
msgstr "nije moguće nadgledati %s (%s), upiti su aktivirani"
-#: ../src/mn-vfs-mailbox.gob:392
+#: ../src/mn-vfs-mailbox.gob:421
msgid "unknown mailbox format"
msgstr "format sandučeta nije prepoznat"
-#: ../src/mn-vfs-mailbox.gob:392
+#: ../src/mn-vfs-mailbox.gob:421
msgid "does not exist"
msgstr "ne postoji"
@@ -1742,6 +1791,12 @@ msgstr "_Skraćen"
msgid "icon tooltip's mail summary layout|_Standard"
msgstr "_Običan"
+#~ msgid "server did not send all the messages we requested"
+#~ msgstr "server nije poslao sve tražene poruke"
+
+#~ msgid "server did not send search results"
+#~ msgstr "server nije poslao rezultate pretrage"
+
#~ msgid "Automatically close the mail summary popup"
#~ msgstr "Automatski zatvori prozor sa sažetkom poruka"
@@ -1857,7 +1912,7 @@ msgstr "_Običan"
#~ msgstr "dole-desno"
#~ msgid "Use De_fault"
-#~ msgstr "_Koristi podrazumevano"
+#~ msgstr "_Kori�ti podrazumevano"
#~ msgid "<span weight=\"bold\">Fonts</span>"
#~ msgstr "<span weight=\"bold\">Pisma</span>"
@@ -2644,4 +2699,3 @@ msgstr "_Običan"
#~ msgid "Whether to run a command when the icon is double-clicked or not"
#~ msgstr "Da li se pokreće komanda pri dvostrukom kliku ili ne"
-
diff --git a/po/sv.po b/po/sv.po
@@ -4,20 +4,21 @@
# This file is distributed under the same license as the
# mail-notification package.
#
-# Daniel Nylander <po@danielnylander.se>, 2006.
+# Daniel Nylander <po@danielnylander.se>, 2006, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 3.0\n"
+"Project-Id-Version: mail-notification 4.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-15 16:36+0200\n"
-"PO-Revision-Date: 2006-06-14 09:23+0200\n"
+"POT-Creation-Date: 2007-06-19 08:44+0200\n"
+"PO-Revision-Date: 2007-06-26 12:08+0200\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n !=1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
#: ../data/GNOME_MailNotification.server.in.in.h:1
msgid "Mail Notification automation"
@@ -48,11 +49,9 @@ msgid "Configure Mail Notification"
msgstr "Konfigurera E-postnotifieraren"
#: ../data/mail-notification-properties.desktop.in.h:2
-#: ../data/mail-notification.desktop.in.h:2
-#: ../src/mn-mail-icon.gob:227
-#: ../src/mn-main.c:132
-#: ../src/mn-main.c:302
-#: ../src/mn-main.c:318
+#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:234
+#: ../src/mn-main.c:143 ../src/mn-main.c:350 ../src/mn-main.c:371
+#: ../src/mn-main.c:445
msgid "Mail Notification"
msgstr "E-postnotifieraren"
@@ -60,195 +59,203 @@ msgstr "E-postnotifieraren"
msgid "Get notified when new mail arrives"
msgstr "Bli notifierad när nya brev anländer"
-#: ../data/mail-notification.schemas.in.h:1
+#: ../data/mail-notification.schemas.in.in.h:1
msgid "Always display an icon"
msgstr "Visa alltid en ikon"
-#: ../data/mail-notification.schemas.in.h:2
-msgid "Automatically close the mail summary popup"
-msgstr "Stäng automatiskt popupruta för e-postsammandrag"
-
-#: ../data/mail-notification.schemas.in.h:3
+#: ../data/mail-notification.schemas.in.in.h:2
msgid "Blink on errors"
msgstr "Blinka vid fel"
-#: ../data/mail-notification.schemas.in.h:4
+#: ../data/mail-notification.schemas.in.in.h:3
msgid "Click action"
msgstr "Klickåtgärd"
-#: ../data/mail-notification.schemas.in.h:5
+#: ../data/mail-notification.schemas.in.in.h:4
msgid "Display seen mail"
msgstr "Visa sedda brev"
-#: ../data/mail-notification.schemas.in.h:6
-msgid "Enable mail summary popup"
-msgstr "Aktivera popupruta för e-postsammandrag"
+#: ../data/mail-notification.schemas.in.in.h:5
+msgid "Enable message popups"
+msgstr "Aktivera meddelandepopuprutor"
+
+#: ../data/mail-notification.schemas.in.in.h:6
+msgid "Expire message popups"
+msgstr "Låt meddelandepopuprutor försvinna"
-#: ../data/mail-notification.schemas.in.h:7
+#: ../data/mail-notification.schemas.in.in.h:7
msgid "Fingerprints of trusted X509 certificates"
msgstr "Fingeravtryck för pålitliga X509-certifikat"
-#: ../data/mail-notification.schemas.in.h:8
+#: ../data/mail-notification.schemas.in.in.h:8
msgid "Height of properties dialog"
msgstr "Höjd på egenskapsdialogrutan"
-#: ../data/mail-notification.schemas.in.h:9
-msgid "Mail read command"
-msgstr "Kommando för att läsa e-post"
-
-#: ../data/mail-notification.schemas.in.h:10
-msgid "Mail summary popup contents font"
-msgstr "Typsnitt för innehållet i e-postsammandragets popupruta"
+#: ../data/mail-notification.schemas.in.in.h:9
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (minutes part)."
+msgstr ""
+"Om /apps/mail-notification/popups/expiration/enabled är inställd till \"true\", är detta "
+"tidsperioden att vänta innan meddelandepopuprutor försvinner (minutdelen)."
-#: ../data/mail-notification.schemas.in.h:11
-msgid "Mail summary popup fonts aspect source"
-msgstr "Källa för typsnitt i popuprutan för e-postsammandrag"
+#: ../data/mail-notification.schemas.in.in.h:10
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (seconds part)."
+msgstr ""
+"Om /apps/mail-notification/popups/expiration/enabled är inställd till \"true\", är detta "
+"tidsperioden att vänta innan meddelandepopuprutor försvinner (sekunddelen)."
-#: ../data/mail-notification.schemas.in.h:12
-msgid "Mail summary popup horizontal offset"
-msgstr "Horisontal position för popupruta för e-postsammandrag"
+#: ../data/mail-notification.schemas.in.in.h:11
+msgid "Mail changed command"
+msgstr "Kommando för ändrade brev"
-#: ../data/mail-notification.schemas.in.h:13
-msgid "Mail summary popup position"
-msgstr "Position för popupruta för e-postsammandrag"
+#: ../data/mail-notification.schemas.in.in.h:12
+msgid "Mail read command"
+msgstr "Kommando för att läsa e-post"
-#: ../data/mail-notification.schemas.in.h:14
-msgid "Mail summary popup title font"
-msgstr "Typsnitt för e-postsammandragets titel"
+#: ../data/mail-notification.schemas.in.in.h:13
+msgid "Message popups actions"
+msgstr "Åtgärder för meddelandepopuprutor"
-#: ../data/mail-notification.schemas.in.h:15
-msgid "Mail summary popup vertical offset"
-msgstr "Vertikal position för popupruta för e-postsammandrag"
+#: ../data/mail-notification.schemas.in.in.h:14
+msgid "Message popups position"
+msgstr "Position för meddelandepopuprutor"
-#: ../data/mail-notification.schemas.in.h:16
-msgid "Minutes to wait before closing the mail summary popup"
-msgstr "Minuter att vänta innan popuprutan för e-postsammandrag stängs"
+#: ../data/mail-notification.schemas.in.in.h:15
+msgid "Minutes to wait before expiring message popups"
+msgstr "Minuter att vänta innan meddelandepopuprutor försvinner"
-#: ../data/mail-notification.schemas.in.h:17
+#: ../data/mail-notification.schemas.in.in.h:16
msgid "New mail command"
msgstr "Kommando för ny e-post"
-#: ../data/mail-notification.schemas.in.h:18
-msgid "Only display recent mail in mail summary popup"
-msgstr "Visa endast nyligen anlända brev i popupruta för e-postsammandrag"
-
-#: ../data/mail-notification.schemas.in.h:19
+#: ../data/mail-notification.schemas.in.in.h:17
msgid "Run a command when all mail is read"
msgstr "Kör ett kommando när alla brev har lästs"
-#: ../data/mail-notification.schemas.in.h:20
+#: ../data/mail-notification.schemas.in.in.h:18
msgid "Run a command when new mail arrives"
msgstr "Kör ett kommando när nya brev anländer"
-#: ../data/mail-notification.schemas.in.h:21
-msgid "Seconds to wait before closing the mail summary popup"
-msgstr "Sekunder att vänta innan popuprutan för e-postsammandrag stängs"
-
-#: ../data/mail-notification.schemas.in.h:22
-msgid "The action to perform when the icon is clicked. Must be \"display-properties-dialog\", \"launch-mail-reader\" or \"update-mail-status\"."
-msgstr "Åtgärden att genomföra när ikonen blir klickad. Måste vara \"display-properties-dialog\", \"launch-mail-reader\" eller \"update-mail-status\"."
-
-#: ../data/mail-notification.schemas.in.h:23
-msgid "The amount of time to wait before closing the mail summary popup (minutes part)."
-msgstr "Antal minuter att vänta innan popuprutan för e-postsammandrag stängs."
+#: ../data/mail-notification.schemas.in.in.h:19
+msgid "Run a command when the message list changes"
+msgstr "Kör ett kommando när meddelandelistan ändras"
-#: ../data/mail-notification.schemas.in.h:24
-msgid "The amount of time to wait before closing the mail summary popup (seconds part)."
-msgstr "Antal sekunder att vänta innan popuprutan för e-postsammandrag stängs."
+#: ../data/mail-notification.schemas.in.in.h:20
+msgid "Seconds to wait before expiring message popups"
+msgstr "Sekunder att vänta innan meddelandepopuprutor försvinner"
-#: ../data/mail-notification.schemas.in.h:25
-msgid "The aspect source of the mail summary popup fonts. Must be \"theme\" or \"custom\"."
-msgstr "Källan för typsnitt i popuprutan för e-postsammandrag. Måste vara \"theme\" eller \"custom\"."
+#: ../data/mail-notification.schemas.in.in.h:21
+msgid ""
+"The action to perform when the icon is clicked. Must be \"display-properties-"
+"dialog\", \"launch-mail-reader\", \"open-latest-message\" or \"update-mail-"
+"status\"."
+msgstr ""
+"Åtgärden att genomföra när ikonen blir klickad. Måste vara \"display-properties-"
+"dialog\", \"launch-mail-reader\", \"open-latest-message\" eller \"update-mail-"
+"status\"."
-#: ../data/mail-notification.schemas.in.h:26
+#: ../data/mail-notification.schemas.in.in.h:22
msgid "The command to run when all mail is read."
msgstr "Kommandot att köra när alla brev har lästs."
-#: ../data/mail-notification.schemas.in.h:27
+#: ../data/mail-notification.schemas.in.in.h:23
msgid "The command to run when new mail arrives."
msgstr "Kommandot att köra när nya brev anländer."
-#: ../data/mail-notification.schemas.in.h:28
-msgid "The custom font to use for the contents of the mail summary popup."
-msgstr "Det anpassade typsnittet att använda för innehållet i popuprutan för e-postsammandrag."
+#: ../data/mail-notification.schemas.in.in.h:24
+msgid "The command to run when the message list changes."
+msgstr "Kommandot att köra när meddelandelistan ändras."
-#: ../data/mail-notification.schemas.in.h:29
-msgid "The custom font to use for the title of the mail summary popup."
-msgstr "Det anpassade typsnittet att använda för titelraden på popuprutan för e-postsammandrag."
-
-#: ../data/mail-notification.schemas.in.h:30
+#: ../data/mail-notification.schemas.in.in.h:25
msgid "The height of the properties dialog in pixels."
msgstr "Höjden på egenskapsdialogrutan i antal bildpunkter."
-#: ../data/mail-notification.schemas.in.h:31
-msgid "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 certificate."
-msgstr "Listan på pålitliga SSL/TLS-servrar (värdnamn:port) som saknar ett X509-certifikat."
+#: ../data/mail-notification.schemas.in.in.h:26
+msgid ""
+"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
+"certificate."
+msgstr ""
+"Listan på pålitliga SSL/TLS-servrar (värdnamn:port) som saknar ett X509-"
+"certifikat."
-#: ../data/mail-notification.schemas.in.h:32
+#: ../data/mail-notification.schemas.in.in.h:27
msgid "The list of trusted X509 certificates, represented by their MD5 fingerprint."
-msgstr "Listan av pålitliga X509-certifikat, representerade av deras MD5-fingeravtryck."
-
-#: ../data/mail-notification.schemas.in.h:33
-msgid "The number of pixels to leave between the left or right side of the screen and the mail summary popup."
-msgstr "Antalet bildpunkter att lämna kvar mellan vänstra och högra sidan av skärmen och popuprutan för e-postsammandrag."
+msgstr ""
+"Listan av pålitliga X509-certifikat, representerade av deras MD5-"
+"fingeravtryck."
-#: ../data/mail-notification.schemas.in.h:34
-msgid "The number of pixels to leave between the top or bottom side of the screen and the mail summary popup."
-msgstr "Antalet bildpunkter att lämna kvar mellan övre och nedre sidan av skärmen och popuprutan för e-postsammandrag."
+#: ../data/mail-notification.schemas.in.in.h:28
+msgid ""
+"The ordered list of actions to include in the message popups. Each element "
+"must be \"open\", \"mark-as-read\", \"mark-as-spam\" or \"delete\"."
+msgstr ""
+"Den sorterade listan över åtgärder att inkludera i meddelandepopuprutor. Varje element "
+"måste vara antingen \"open\", \"mark-as-read\", \"mark-as-spam\" eller \"delete\"."
-#: ../data/mail-notification.schemas.in.h:35
-msgid "The position of the mail summary popup. Must be \"top-left\", \"top-right\", \"bottom-left\" or \"bottom-right\"."
-msgstr "Positionen för popuprutan för e-postsammandrag. Måste vara \"top-left\", \"top-right\", \"bottom-left\" eller \"bottom-right\"."
+#: ../data/mail-notification.schemas.in.in.h:29
+msgid "The position of the message popups. Must be \"attached\" or \"free\"."
+msgstr "Positionen för meddelandepopuprutor. Måste vara \"attached\" eller \"free\"."
-#: ../data/mail-notification.schemas.in.h:36
-msgid "The type of mail summary to display in the icon's tooltip. Must be \"standard\", \"compact\" or \"none\"."
-msgstr "Typen av e-postsammandrag att visa i ikonens verktygstips. Måste vara \"standard\", \"compact\" eller \"none\"."
+#: ../data/mail-notification.schemas.in.in.h:30
+msgid ""
+"The type of mail summary to display in the icon's tooltip. Must be \"standard"
+"\", \"compact\" or \"none\"."
+msgstr ""
+"Typen av e-postsammandrag att visa i ikonens verktygstips. Måste vara "
+"\"standard\", \"compact\" eller \"none\"."
-#: ../data/mail-notification.schemas.in.h:37
+#: ../data/mail-notification.schemas.in.in.h:31
msgid "The width of the properties dialog in pixels."
msgstr "Bredden på egenskapsdialogrutan i antal bildpunkter."
-#: ../data/mail-notification.schemas.in.h:38
+#: ../data/mail-notification.schemas.in.in.h:32
msgid "Tooltip mail summary"
msgstr "Verktygstips för e-postsammandrag"
-#: ../data/mail-notification.schemas.in.h:39
+#: ../data/mail-notification.schemas.in.in.h:33
msgid "Trusted servers list"
msgstr "Lista på pålitliga servrar"
-#: ../data/mail-notification.schemas.in.h:40
+#: ../data/mail-notification.schemas.in.in.h:34
msgid "Whether the status icon should blink on errors or not."
msgstr "Huruvida statusikonen ska blinka vid fel eller inte."
-#: ../data/mail-notification.schemas.in.h:41
-msgid "Whether to automatically close the mail summary popup or not."
-msgstr "Huruvida popuprutan för e-postsammandrag ska stängas automatiskt eller inte."
-
-#: ../data/mail-notification.schemas.in.h:42
+#: ../data/mail-notification.schemas.in.in.h:35
msgid "Whether to display an icon when there is no new mail or not."
msgstr "Huruvida en ikon ska visas när det inte finns några nya brev eller inte."
-#: ../data/mail-notification.schemas.in.h:43
+#: ../data/mail-notification.schemas.in.in.h:36
msgid "Whether to display seen mail or not."
msgstr "Huruvida sedda brev ska visas eller inte."
-#: ../data/mail-notification.schemas.in.h:44
-msgid "Whether to display the mail summary popup when new mail arrives or not."
-msgstr "Huruvida popuprutan för e-postsammandraget ska visas när nya brev anländer eller inte."
+#: ../data/mail-notification.schemas.in.in.h:37
+msgid "Whether to enable message popups or not."
+msgstr "Huruvida meddelandepopuprutor ska aktiveras eller inte."
-#: ../data/mail-notification.schemas.in.h:45
-msgid "Whether to hide previously displayed mail in the mail summary popup or not."
-msgstr "Huruvida tidigare visade brev i popuprutan för e-postsammandrag ska döljas eller inte."
+#: ../data/mail-notification.schemas.in.in.h:38
+msgid ""
+"Whether to expire message popups or not. Must be \"default\", \"false\" or "
+"\"true\"."
+msgstr ""
+"Huruvida meddelandepopuprutor ska försvinna eller inte. Måste vara \"default\", \"false\" eller "
+"\"true\"."
-#: ../data/mail-notification.schemas.in.h:46
+#: ../data/mail-notification.schemas.in.in.h:39
msgid "Whether to run a command when all mail is read or not."
msgstr "Huruvida ett kommando ska köras när alla brev har lästs eller inte."
-#: ../data/mail-notification.schemas.in.h:47
+#: ../data/mail-notification.schemas.in.in.h:40
msgid "Whether to run a command when new mail arrives or not."
msgstr "Huruvida ett kommando ska köras när nya brev anländer eller inte."
-#: ../data/mail-notification.schemas.in.h:48
+#: ../data/mail-notification.schemas.in.in.h:41
+msgid "Whether to run a command when the message list changes or not."
+msgstr "Huruvida ett kommando ska köras när meddelandelistan ändras eller inte."
+
+#: ../data/mail-notification.schemas.in.in.h:42
msgid "Width of properties dialog"
msgstr "Bredd på egenskapsdialogrutan"
@@ -261,7 +268,7 @@ msgid "The orientation of the tray."
msgstr "Lådans orientering."
#. translators: header capitalization
-#: ../src/mn-about-dialog.gob:49
+#: ../src/mn-about-dialog.gob:50
msgid "A Mail Notification Icon"
msgstr "En e-postnotifieringsikon"
@@ -269,739 +276,770 @@ msgstr "En e-postnotifieringsikon"
#. * translators: Your Name <your-email>
#. * optionally followed by one or more: \nOther Contributor's Name <his-email>
#.
-#: ../src/mn-about-dialog.gob:57
+#: ../src/mn-about-dialog.gob:58
msgid "translator-credits"
-msgstr "Daniel Nylander <po@danielnylander.se>"
+msgstr ""
+"Daniel Nylander <po@danielnylander.se>\n"
+"\n"
+"Skicka synpunkter på översättningen till\n"
+"tp-sv@listor.tp-sv.se"
-#: ../src/mn-about-dialog.gob:79
-msgid "Unable to open link"
-msgstr "Kunde inte öppna länk"
+#: ../src/mn-auth-combo-box.gob:101
+#: ../src/mn-autodetect-mailbox-properties.gob:110
+msgid "Autodetect"
+msgstr "Identifiera automatiskt"
-#: ../src/mn-auth-combo-box.gob:103
-#: ../src/mn-autodetect-mailbox-properties.gob:109
-msgid "<span style=\"italic\">autodetect</span>"
-msgstr "<span style=\"italic\">identifiera automatiskt</span>"
+#. translators: header capitalization
+#: ../src/mn-authenticated-mailbox-properties.gob:50
+msgid "Account"
+msgstr "Konto"
-#: ../src/mn-authenticated-mailbox-properties.gob:46
+#: ../src/mn-authenticated-mailbox-properties.gob:53
msgid "_Username:"
msgstr "_Användarnamn:"
-#: ../src/mn-authenticated-mailbox-properties.gob:50
+#: ../src/mn-authenticated-mailbox-properties.gob:57
msgid "_Password:"
msgstr "_Lösenord:"
-#: ../src/mn-autodetect-mailbox-properties.gob:110
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:124
+#: ../src/mn-system-vfs-mailbox-properties.gob:60
msgid "Location"
msgstr "Plats"
-#: ../src/mn-autodetect-mailbox-properties.gob:122
+#: ../src/mn-autodetect-mailbox-properties.gob:126
msgid "_Location:"
msgstr "_Plats:"
#. translators: header capitalization
-#: ../src/mn-autodetect-mailbox-properties.gob:130
+#: ../src/mn-autodetect-mailbox-properties.gob:134
msgid "_Browse..."
msgstr "_Bläddra..."
#. translators: header capitalization
-#: ../src/mn-autodetect-mailbox-properties.gob:172
+#: ../src/mn-autodetect-mailbox-properties.gob:176
msgid "Select a File or Folder"
msgstr "Välj en fil eller mapp"
-#: ../src/mn-client-session.c:247
+#: ../src/mn-base-mbox-mailbox-backend.gob:345
+#, c-format
+msgid "unable to close file: %s"
+msgstr "kunde inte stänga fil: %s"
+
+#: ../src/mn-base-mbox-mailbox-backend.gob:359
+#, c-format
+msgid "unable to open mailbox: %s"
+msgstr "kunde inte öppna postlåda: %s"
+
+#: ../src/mn-client-session.c:257
#, c-format
msgid "resolving %s"
msgstr "slår upp %s"
-#: ../src/mn-client-session.c:263
+#: ../src/mn-client-session.c:273
#, c-format
msgid "unable to resolve %s: %s"
msgstr "kunde inte slå upp %s: %s"
-#: ../src/mn-client-session.c:304
+#: ../src/mn-client-session.c:314
#, c-format
msgid "network address #%i"
msgstr "nätverksadress #%i"
-#: ../src/mn-client-session.c:307
+#: ../src/mn-client-session.c:317
#, c-format
msgid "unable to convert network address #%i into textual form: %s"
msgstr "kunde inte konvertera nätverksadress #%i till textformat: %s"
-#: ../src/mn-client-session.c:318
+#: ../src/mn-client-session.c:328
#, c-format
msgid "%s: unsupported address family"
msgstr "%s: adressfamiljen stöds inte"
-#: ../src/mn-client-session.c:325
+#: ../src/mn-client-session.c:335
#, c-format
msgid "%s: unable to create socket: %s"
msgstr "%s: kunde inte skapa uttag: %s"
-#: ../src/mn-client-session.c:329
+#: ../src/mn-client-session.c:339
#, c-format
msgid "connecting to %s (%s) port %i"
msgstr "ansluter till %s (%s) port %i"
-#: ../src/mn-client-session.c:332
+#: ../src/mn-client-session.c:342
#, c-format
msgid "unable to connect: %s"
msgstr "kunde inte ansluta: %s"
-#: ../src/mn-client-session.c:337
+#: ../src/mn-client-session.c:347
msgid "connected successfully"
msgstr "anslutning lyckades"
#. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:351
+#: ../src/mn-client-session.c:361
#, c-format
msgid "unable to connect to %s"
msgstr "kunde inte ansluta till %s"
-#: ../src/mn-client-session.c:378
+#: ../src/mn-client-session.c:388
#, c-format
msgid "unable to initialize the OpenSSL library: %s"
msgstr "kunde inte initera OpenSSL-biblioteket: %s"
-#: ../src/mn-client-session.c:386
+#: ../src/mn-client-session.c:396
#, c-format
msgid "unable to create a SSL/TLS object: %s"
msgstr "kunde inte skapa ett SSL/TLS-objekt: %s"
-#: ../src/mn-client-session.c:392
+#: ../src/mn-client-session.c:402
#, c-format
msgid "unable to set the SSL/TLS file descriptor: %s"
msgstr "kunde inte ställa in SSL/TLS-filidentifieraren: %s"
-#: ../src/mn-client-session.c:398
+#: ../src/mn-client-session.c:408
#, c-format
msgid "unable to perform the SSL/TLS handshake: %s"
msgstr "kunde inte genomföra SSL/TLS-handskakning: %s"
-#: ../src/mn-client-session.c:404
+#: ../src/mn-client-session.c:414
msgid "untrusted server"
msgstr "opålitlig server"
-#: ../src/mn-client-session.c:408
+#: ../src/mn-client-session.c:418
#, c-format
msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
msgstr "ett SSL/TLS-lager är nu aktivt (%s, %s %i-bitars)"
-#: ../src/mn-client-session.c:455
+#: ../src/mn-client-session.c:589
+msgid "server name not found in certificate"
+msgstr "servernamnet hittades inte i certifikatet"
+
+#: ../src/mn-client-session.c:594
#, c-format
-msgid "%s, fingerprint: %s"
-msgstr "%s, fingeravtryck: %s"
+msgid ""
+"user-provided server name \"%s\" does not match certificate-provided server "
+"name \"%s\""
+msgstr "användarangivna servernamnet \"%s\" matchar inte servernamnet i certifikatet \"%s\""
+
+#: ../src/mn-client-session.c:612
+#, c-format
+msgid ""
+"user-provided server name \"%s\" matches none of the certificate-provided "
+"server names %s"
+msgstr "användarangivna servernamnet \"%s\" matchar inget av de servernamn i certifikatet %s"
-#: ../src/mn-client-session.c:484
+#: ../src/mn-client-session.c:688
msgid "missing certificate"
msgstr "saknar certifikat"
-#: ../src/mn-client-session.c:510
+#: ../src/mn-client-session.c:717
#, c-format
msgid ""
-"Mail Notification was unable to trust \"%s\" (%s). It is possible that someone is intercepting your communication to obtain your confidential information.\n"
+"Mail Notification was unable to trust \"%s\" (%s). It is possible that "
+"someone is intercepting your communication to obtain your confidential "
+"information.\n"
"\n"
-"You should only connect to the server if you are certain you are connected to \"%s\". If you choose to connect to the server, this message will not be shown again."
+"You should only connect to the server if you are certain you are connected "
+"to \"%s\". If you choose to connect to the server, this message will not be "
+"shown again."
msgstr ""
-"E-postnotifieraren kunde inte lita på \"%s\" (%s). Det är möjligt att någon fångar upp din kommunikation för att få tag på din hemliga information.\n"
+"E-postnotifieraren kunde inte lita på \"%s\" (%s). Det är möjligt att någon "
+"fångar upp din kommunikation för att få tag på din hemliga information.\n"
"\n"
-"Du bör endast ansluta till servern om du är säker på att du ansluter till \"%s\". Om du väljer att ansluta till servern kommer detta meddelande inte att visas igen."
+"Du bör endast ansluta till servern om du är säker på att du ansluter till \"%"
+"s\". Om du väljer att ansluta till servern kommer detta meddelande inte att "
+"visas igen."
-#: ../src/mn-client-session.c:525
+#: ../src/mn-client-session.c:731
+#, c-format
+msgid "Certificate fingerprint: %s."
+msgstr "Certifikatets fingeravtryck: %s."
+
+#: ../src/mn-client-session.c:738
msgid "Connect to untrusted server?"
msgstr "Anslut till opålitlig server?"
-#: ../src/mn-client-session.c:590
+#: ../src/mn-client-session.c:803
#, c-format
msgid "response \"%s\" is not valid in current context"
msgstr "svaret \"%s\" är inte giltigt i aktuellt sammanhang"
-#: ../src/mn-client-session.c:619
+#: ../src/mn-client-session.c:832
#, c-format
msgid "unable to parse response \"%s\""
msgstr "kunde inte tolka svaret \"%s\""
-#: ../src/mn-client-session.c:669
-#: ../src/mn-client-session.c:676
+#: ../src/mn-client-session.c:882 ../src/mn-client-session.c:889
#, c-format
msgid "unable to read from server: %s"
msgstr "kunde inte läsa från servern: %s"
-#: ../src/mn-client-session.c:674
+#: ../src/mn-client-session.c:887
msgid "unable to read from server: EOF"
msgstr "kunde inte läsa från servern: Slut på fil"
-#: ../src/mn-client-session.c:686
+#: ../src/mn-client-session.c:899
#, c-format
msgid "unable to decode data using SASL: %s"
msgstr "kunde inte avkoda data med SASL: %s"
-#: ../src/mn-client-session.c:831
+#: ../src/mn-client-session.c:1044
#, c-format
msgid "unable to encode data using SASL: %s"
msgstr "kunde inte koda data med SASL: %s"
-#: ../src/mn-client-session.c:862
-#: ../src/mn-client-session.c:869
+#: ../src/mn-client-session.c:1075 ../src/mn-client-session.c:1082
#, c-format
msgid "unable to write to server: %s"
msgstr "kunde inte skriva till servern: %s"
-#: ../src/mn-client-session.c:867
+#: ../src/mn-client-session.c:1080
msgid "unable to write to server: EOF"
msgstr "kunde inte skriva till servern: Slut på fil"
-#: ../src/mn-client-session.c:898
-#: ../src/mn-pop3-mailbox.gob:433
+#: ../src/mn-client-session.c:1111 ../src/mn-pop3-mailbox.gob:434
#, c-format
msgid "unable to encode Base64: %s"
msgstr "kunde inte Base64-koda: %s"
-#: ../src/mn-client-session.c:1075
+#: ../src/mn-client-session.c:1288
#, c-format
msgid "unable to initialize the SASL library: %s"
msgstr "kunde inte initiera SASL-biblioteket: %s"
-#: ../src/mn-client-session.c:1087
+#: ../src/mn-client-session.c:1300
#, c-format
msgid "unable to retrieve local address of socket: %s"
msgstr "kunde inte hämta lokal adress för uttag: %s"
-#: ../src/mn-client-session.c:1093
+#: ../src/mn-client-session.c:1306
#, c-format
msgid "unable to retrieve remote address of socket: %s"
msgstr "kunde inte hämta fjärradress för uttag: %s"
-#: ../src/mn-client-session.c:1127
+#: ../src/mn-client-session.c:1340
#, c-format
msgid "unable to set SASL security properties: %s"
msgstr "kunde inte ställa in SASL-säkerhetsegenskaper: %s"
-#: ../src/mn-client-session.c:1151
+#: ../src/mn-client-session.c:1364
msgid "unable to start SASL authentication: SASL asked for something we did not know"
-msgstr "kunde inte starta SASL-autentisering: SASL frågade efter någonting som vi inte vet"
+msgstr ""
+"kunde inte starta SASL-autentisering: SASL frågade efter någonting som vi "
+"inte vet"
-#: ../src/mn-client-session.c:1170
+#: ../src/mn-client-session.c:1383
#, c-format
msgid "unable to start SASL authentication: %s"
msgstr "kunde inte starta SASL-autentisering: %s"
-#: ../src/mn-client-session.c:1174
+#: ../src/mn-client-session.c:1387
#, c-format
msgid "unable to create a SASL connection: %s"
msgstr "kunde inte skapa en SASL-anslutning: %s"
-#: ../src/mn-client-session.c:1221
+#: ../src/mn-client-session.c:1434
msgid "SASL asked for something we did not know, aborting SASL authentication"
msgstr "SASL frågade efter någonting vi inte vet, avbryter SASL-autentisering"
-#: ../src/mn-client-session.c:1238
+#: ../src/mn-client-session.c:1451
#, c-format
msgid "%s, aborting SASL authentication"
msgstr "%s, avbryter SASL-autentisering"
#. compliance error
-#: ../src/mn-client-session.c:1243
+#: ../src/mn-client-session.c:1456
#, c-format
msgid "unable to decode Base64 input from server: %s"
msgstr "kunde inte avkoda Base64-inmatning från servern: %s"
-#: ../src/mn-client-session.c:1279
+#: ../src/mn-client-session.c:1492
#, c-format
msgid "a SASL security layer of strength factor %i is now active"
msgstr "ett SASL-säkerhetslager med stark faktor %i är nu aktiv"
#. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1284
+#: ../src/mn-client-session.c:1497
#, c-format
msgid "unable to get SASL_MAXOUTBUF property: %s"
msgstr "kunde inte få SASL_MAXOUTBUF-egenskap: %s"
-#: ../src/mn-client-session.c:1290
+#: ../src/mn-client-session.c:1503
#, c-format
msgid "warning: unable to get SASL_SSF property: %s"
msgstr "varning: kunde inte få SASL_SSF-egenskap: %s"
-#: ../src/mn-client-session.c:1449
+#: ../src/mn-client-session.c:1662
msgid "unknown server error"
msgstr "okänt serverfel"
-#: ../src/mn-compact-message-view.gob:45
+#: ../src/mn-compact-message-view.gob:46
msgid "Mailbox"
msgstr "Postlåda"
-#: ../src/mn-compact-message-view.gob:46
+#: ../src/mn-compact-message-view.gob:47
msgid "From"
msgstr "Från"
-#: ../src/mn-compact-message-view.gob:47
+#: ../src/mn-compact-message-view.gob:48
msgid "Subject"
msgstr "Ämne"
-#: ../src/mn-compact-message-view.gob:48
+#: ../src/mn-compact-message-view.gob:49
msgid "Sent"
msgstr "Skickat"
-#: ../src/mn-conf.c:262
+#: ../src/mn-conf.c:282
msgid "A directory creation error has occurred"
msgstr "Ett fel vid skapandet av katalog inträffade"
-#: ../src/mn-conf.c:263
+#: ../src/mn-conf.c:283
#, c-format
msgid "Unable to create directory \"%s\": %s."
msgstr "Kunde inte skapa katalogen \"%s\": %s."
-#: ../src/mn-conf.c:402
+#: ../src/mn-conf.c:407
#, c-format
msgid "recursively unsetting %s"
msgstr "avmarkerar %s rekursivt"
-#: ../src/mn-conf.c:406
+#: ../src/mn-conf.c:411
msgid "syncing the GConf database"
msgstr "synkroniserar GConf-databasen"
-#: ../src/mn-conf.c:409
+#: ../src/mn-conf.c:414
msgid "completed"
msgstr "färdig"
-#: ../src/mn-conf.c:1137
-msgid "A command error has occurred in Mail Notification"
-msgstr "Ett kommandofel har inträffat i E-postnotifieraren"
-
-#: ../src/mn-conf.c:1138
-#, c-format
-msgid "Unable to execute \"%s\": %s."
-msgstr "Kunde inte starta \"%s\": %s."
-
-#: ../src/mn-custom-vfs-mailbox.gob:76
+#: ../src/mn-custom-vfs-mailbox.gob:77
msgid "invalid location"
msgstr "ogiltig plats"
-#: ../src/mn-evolution-folder-tree-control.c:91
+#: ../src/mn-evolution-folder-tree-control.gob:69
msgid "The currently selected URI"
msgstr "Aktuellt markerad URI"
#. translators: header capitalization
-#: ../src/mn-evolution-mailbox-properties.gob:68
+#: ../src/mn-evolution-mailbox-properties.gob:79
msgid "Folder"
msgstr "Mapp"
-#: ../src/mn-evolution-mailbox-properties.gob:159
-msgid "Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded."
-msgstr "E-postnotifieraren kan inte kontakta Evolution. Kontrollera att Evolution körs och att insticksmodulen för E-postnotifieraren i Evolution är inläst."
+#: ../src/mn-evolution-mailbox-properties.gob:204
+msgid ""
+"Mail Notification can not contact Evolution. Make sure that Evolution is "
+"running and that the Evolution Jean-Yves Lefort's Mail Notification plugin "
+"is loaded."
+msgstr ""
+"E-postnotifieraren kan inte kontakta Evolution. Försäkra dig om att Evolution "
+"kör och att insticksmodulen för E-postnotifieraren i Evolution är inläst."
-#: ../src/mn-evolution-mailbox.gob:75
+#: ../src/mn-evolution-mailbox.gob:78
msgid "folder not found"
msgstr "mappen hittades inte"
-#: ../src/mn-evolution-mailbox.gob:216
+#: ../src/mn-evolution-mailbox.gob:79
+msgid "message not found"
+msgstr "meddelandet hittades inte"
+
+#: ../src/mn-evolution-mailbox.gob:220
msgid "unable to contact Evolution"
msgstr "kunde inte kontakta Evolution"
-#: ../src/mn-evolution-plugin.c:136
-#: ../src/mn-evolution-plugin.c:140
+#: ../src/mn-evolution-plugin.c:102 ../src/mn-evolution-plugin.c:106
msgid "Unable to activate the Mail Notification plugin"
msgstr "Kunde inte aktivera insticksmodulen för E-postnotifieraren"
-#: ../src/mn-evolution-plugin.c:136
+#: ../src/mn-evolution-plugin.c:102
#, c-format
-msgid "Bonobo could not locate the %s server. Please check your Mail Notification installation."
-msgstr "Bonobo kunde inte hitta server %s. Kontrollera din installation av E-postnotifieraren."
+msgid ""
+"Bonobo could not locate the %s server. Please check your Mail Notification "
+"installation."
+msgstr ""
+"Bonobo kunde inte hitta server %s. Kontrollera din installation av E-"
+"postnotifieraren."
-#: ../src/mn-evolution-plugin.c:140
-#: ../src/mn-main.c:460
+#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:523
#, c-format
-msgid "Bonobo was unable to register the %s server. Please check your Mail Notification installation."
-msgstr "Bonobo kunde inte registrera servern %s. Kontrollera din installation av E-postnotifieraren."
+msgid ""
+"Bonobo was unable to register the %s server. Please check your Mail "
+"Notification installation."
+msgstr ""
+"Bonobo kunde inte registrera servern %s. Kontrollera din installation av E-"
+"postnotifieraren."
-#: ../src/mn-gmail-mailbox.gob:103
+#: ../src/mn-gmail-mailbox.gob:104
msgid "invalid feed location"
msgstr "ogiltig kanalplats"
-#: ../src/mn-gmail-mailbox.gob:117
+#: ../src/mn-gmail-mailbox.gob:118
#, c-format
msgid "retrieving feed from %s"
msgstr "hämtar kanal från %s"
-#: ../src/mn-gmail-mailbox.gob:124
+#: ../src/mn-gmail-mailbox.gob:125
#, c-format
msgid "unable to retrieve feed: %s"
msgstr "kunde inte hämta kanal: %s"
-#: ../src/mn-gmail-mailbox.gob:139
-#: ../src/mn-gmail-mailbox.gob:187
+#: ../src/mn-gmail-mailbox.gob:140 ../src/mn-gmail-mailbox.gob:191
msgid "unable to parse feed"
msgstr "kunde inte tolka kanal"
-#: ../src/mn-gmime-stream-vfs.gob:50
-#: ../src/mn-sylpheed-mailbox-backend.gob:205
+#: ../src/mn-gmime-stream-vfs.gob:51
+#: ../src/mn-sylpheed-mailbox-backend.gob:209
#, c-format
msgid "unable to read %s: %s"
msgstr "kunde inte läsa %s: %s"
-#: ../src/mn-gmime-stream-vfs.gob:52
+#: ../src/mn-gmime-stream-vfs.gob:53
#, c-format
msgid "unable to write to %s: %s"
msgstr "kunde inte skriva till %s: %s"
-#: ../src/mn-gmime-stream-vfs.gob:54
+#: ../src/mn-gmime-stream-vfs.gob:55
#, c-format
msgid "unable to seek in %s: %s"
msgstr "kunde inte spola i %s: %s"
-#: ../src/mn-gmime-stream-vfs.gob:56
+#: ../src/mn-gmime-stream-vfs.gob:57
#, c-format
msgid "unable to tell position of %s: %s"
msgstr "kunde inte ta reda på position för %s: %s"
-#: ../src/mn-gmime-stream-vfs.gob:58
-#: ../src/mn-mh-mailbox-backend.gob:164
+#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:174
#, c-format
msgid "unable to close %s: %s"
msgstr "kunde inte stänga %s: %s"
-#: ../src/mn-imap-mailbox-properties.gob:114
-#: ../src/mn-standard-message-view.gob:62
-msgid "Mailbox:"
-msgstr "Postlåda:"
-
+#. translators: header capitalization
#: ../src/mn-imap-mailbox-properties.gob:118
-msgid "in_box"
-msgstr "in_korg"
+msgid "IMAP Mailbox"
+msgstr "IMAP-postlåda"
-#: ../src/mn-imap-mailbox-properties.gob:129
-msgid "oth_er:"
-msgstr "anna_n:"
+#: ../src/mn-imap-mailbox-properties.gob:120
+msgid "In_box"
+msgstr "In_korg"
-#: ../src/mn-imap-mailbox-properties.gob:140
-msgid "ne_ver"
-msgstr "al_drig"
+#: ../src/mn-imap-mailbox-properties.gob:125
+msgid "_Other:"
+msgstr "Anna_n:"
-#: ../src/mn-imap-mailbox-properties.gob:141
-msgid "au_todetect"
-msgstr "identifiera automatisk_t"
+#. translators: header capitalization
+#: ../src/mn-imap-mailbox-properties.gob:138
+msgid "Use the IDLE Extension"
+msgstr "Använd IDLE-utökningen"
#: ../src/mn-imap-mailbox-properties.gob:142
-msgid "al_ways"
-msgstr "a_lltid"
+#: ../ui/properties-dialog.glade.h:35
+msgid "_Never"
+msgstr "Al_drig"
+
+#: ../src/mn-imap-mailbox-properties.gob:143
+msgid "A_utodetect"
+msgstr "Identifiera automatisk_t"
-#: ../src/mn-imap-mailbox-properties.gob:174
-msgid "Use the <span style=\"italic\">IDLE</span> extension:"
-msgstr "Använd <span style=\"italic\">IDLE</span>-utökningen:"
+#: ../src/mn-imap-mailbox-properties.gob:144
+msgid "Al_ways"
+msgstr "A_lltid"
-#: ../src/mn-imap-mailbox.gob:384
+#: ../src/mn-imap-mailbox.gob:381
msgid "server did not send capabilities"
msgstr "servern skickade inga färdigheter"
-#: ../src/mn-imap-mailbox.gob:551
+#: ../src/mn-imap-mailbox.gob:548
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr "servern annonserade LOGINDISABLED, använder inte LOGIN-autentisering"
-#: ../src/mn-imap-mailbox.gob:552
+#: ../src/mn-imap-mailbox.gob:549
msgid "unable to login"
msgstr "kunde inte logga in"
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:752
-msgid "server did not send all the messages we requested"
-msgstr "servern skickades inte alla meddelanden som vi begärde"
-
#: ../src/mn-imap-mailbox.gob:822
msgid "unable to fetch message"
msgstr "kunde inte hämta meddelande"
-#: ../src/mn-imap-mailbox.gob:847
-msgid "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, logging out"
-msgstr "\"Använd IDLE-utökningen\" inställd till \"aldrig\" i postlådans egenskaper, loggar ut"
+#: ../src/mn-imap-mailbox.gob:838
+msgid ""
+"\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
+"logging out"
+msgstr ""
+"\"Använd IDLE-utökningen\" inställd till \"aldrig\" i postlådans egenskaper, "
+"loggar ut"
-#: ../src/mn-imap-mailbox.gob:858
+#: ../src/mn-imap-mailbox.gob:849
#, c-format
msgid "the remote server runs %s, not using the IDLE extension"
msgstr "fjärrservern kör %s, använder inte IDLE-utökningen"
-#: ../src/mn-imap-mailbox.gob:863
+#: ../src/mn-imap-mailbox.gob:854
#, c-format
msgid "the remote server runs %s, the IDLE extension might not function properly"
msgstr "fjärrservern kör %s, IDLE-utökningen kanske inte fungerar korrekt"
-#: ../src/mn-imap-mailbox.gob:872
+#: ../src/mn-imap-mailbox.gob:863
msgid "the remote server does not support the IDLE extension, logging out"
msgstr "fjärrservern saknar stöd för IDLE-utökningen, loggar ut"
-#: ../src/mn-imap-mailbox.gob:1377
-#: ../src/mn-pop3-mailbox.gob:296
+#: ../src/mn-imap-mailbox.gob:1368 ../src/mn-pop3-mailbox.gob:297
msgid "server does not support in-band SSL/TLS"
msgstr "servern saknar stöd för in-band SSL/TLS"
-#: ../src/mn-imap-mailbox.gob:1401
-#: ../src/mn-pop3-mailbox.gob:947
-msgid "a SASL authentication mechanism was selected but SASL support has not been compiled in"
+#: ../src/mn-imap-mailbox.gob:1392 ../src/mn-pop3-mailbox.gob:956
+msgid ""
+"a SASL authentication mechanism was selected but SASL support has not been "
+"compiled in"
msgstr "en SASL-autentiseringsmekanism valdes men SASL-stöd har inte byggts in"
-#: ../src/mn-imap-mailbox.gob:1411
-#: ../src/mn-pop3-mailbox.gob:967
+#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:976
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "okänd autentiseringsmekanism \"%s\""
-#: ../src/mn-imap-mailbox.gob:1443
-#: ../src/mn-pop3-mailbox.gob:1003
+#: ../src/mn-imap-mailbox.gob:1434 ../src/mn-pop3-mailbox.gob:1012
#, c-format
msgid "disabling mechanism \"%s\" and retrying SASL authentication"
msgstr "inaktiverar mekanismen \"%s\" och försöker med SASL-autentisering igen"
-#: ../src/mn-imap-mailbox.gob:1455
+#: ../src/mn-imap-mailbox.gob:1446
msgid "falling back to IMAP LOGIN authentication"
msgstr "faller tillbaka på IMAP LOGIN-autentisering"
-#: ../src/mn-imap-mailbox.gob:1467
-#: ../src/mn-pop3-mailbox.gob:1032
+#: ../src/mn-imap-mailbox.gob:1458 ../src/mn-pop3-mailbox.gob:1041
msgid "authentication failed"
msgstr "autentisering misslyckades"
-#. success; caller must switch state itself
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:1528
-msgid "server did not send search results"
-msgstr "servern skickade inga sökresultat"
-
#. translators: header capitalization
-#: ../src/mn-mail-icon.gob:89
+#: ../src/mn-mail-icon.gob:93
msgid "_Mail Reader"
-msgstr "_E-postläsare"
+msgstr "E-_postprogram"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:95
+msgid "_Open Latest Message"
+msgstr "_Öppna senaste meddelandet"
#. translators: header capitalization
-#: ../src/mn-mail-icon.gob:91
-#: ../src/mn-mailbox-view.gob:312
+#: ../src/mn-mail-icon.gob:97 ../src/mn-mailbox-view.gob:314
msgid "_Update"
msgstr "_Uppdatera"
#. translators: header capitalization
-#: ../src/mn-mail-icon.gob:98
+#: ../src/mn-mail-icon.gob:104
msgid "R_emove From Notification Area"
msgstr "Ta _bort från notifieringsyta"
#. translators: header capitalization
-#: ../src/mn-mail-summary-popup.gob:270
-msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">E-postsammandrag</span>"
-
-#. translators: header capitalization
-#: ../src/mn-mail-summary-popup.gob:277
-msgid "<span weight=\"bold\">Mail Summary</span>"
-msgstr "<span weight=\"bold\">E-postsammandrag</span>"
-
-#. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:89
+#: ../src/mn-mailbox-properties-dialog.gob:95
#, c-format
msgid "%s Properties"
msgstr "Egenskaper för %s"
#. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:232
+#: ../src/mn-mailbox-properties-dialog.gob:244
msgid "Add a Mailbox"
msgstr "Lägg till en postlåda"
-#: ../src/mn-mailbox-view.gob:248
+#: ../src/mn-mailbox-view.gob:250
msgid "A paste error has occurred"
msgstr "Ett fel vid inklistring har inträffat"
-#: ../src/mn-mailbox-view.gob:557
+#: ../src/mn-mailbox-view.gob:566
#, c-format
msgid "unhandled %s mailbox (%s)"
msgstr "ohanterad %s postlåda (%s)"
-#: ../src/mn-mailbox-view.gob:562
+#: ../src/mn-mailbox-view.gob:571
#, c-format
msgid "%s mailbox"
msgstr "%s-postlåda"
-#: ../src/mn-mailbox-view.gob:577
+#: ../src/mn-mailbox-view.gob:586
msgid "detecting mailbox type..."
msgstr "identifierar postlådetyp..."
-#: ../src/mn-mailbox.gob:472
+#: ../src/mn-mailbox.gob:507
msgid "\"type\" attribute missing"
msgstr "attributet \"type\" saknas"
-#: ../src/mn-mailbox.gob:479
+#: ../src/mn-mailbox.gob:514
#, c-format
msgid "unknown mailbox type \"%s\""
msgstr "okänd postlådetyp \"%s\""
-#: ../src/mn-mailbox.gob:499
-#, c-format
-msgid "property \"%s\": unable to transform string \"%s\" into a value of type \"%s\""
-msgstr "egenskap \"%s\": kunde inte transformera strängen \"%s\" till ett värde av typen \"%s\""
-
-#: ../src/mn-mailbox.gob:948
+#: ../src/mn-mailbox.gob:910
#, c-format
msgid "property \"%s\" has no value"
msgstr "egenskapen \"%s\" har inget värde"
-#: ../src/mn-mailboxes.gob:239
+#: ../src/mn-mailboxes.gob:241
msgid "An error has occurred while importing old mailboxes"
msgstr "Ett fel inträffade vid importering av gamla postlådor"
-#: ../src/mn-mailboxes.gob:265
+#: ../src/mn-mailboxes.gob:267
msgid "Unable to load the mailboxes configuration"
msgstr "Kunde inte läsa in konfiguration om postlådorna"
-#: ../src/mn-mailboxes.gob:311
+#: ../src/mn-mailboxes.gob:313
msgid "Unable to parse the XML document."
msgstr "Kunde inte tolka XML-dokumentet."
-#: ../src/mn-mailboxes.gob:318
+#: ../src/mn-mailboxes.gob:320
msgid "The root element is missing."
msgstr "Rotelementet saknas."
-#: ../src/mn-mailboxes.gob:324
+#: ../src/mn-mailboxes.gob:326
#, c-format
msgid "The root element \"%s\" is invalid."
msgstr "Rotelementet \"%s\" är ogiltigt."
-#: ../src/mn-mailboxes.gob:347
+#: ../src/mn-mailboxes.gob:349
#, c-format
msgid "On line %i: %s."
msgstr "På rad %i: %s."
-#: ../src/mn-mailboxes.gob:352
+#: ../src/mn-mailboxes.gob:354
#, c-format
msgid "On line %i: unknown element \"%s\"."
msgstr "På rad %i: okänt element \"%s\"."
-#: ../src/mn-mailboxes.gob:361
+#: ../src/mn-mailboxes.gob:363
msgid "An error has occurred while loading the mailboxes configuration"
msgid_plural "Errors have occurred while loading the mailboxes configuration"
msgstr[0] "Ett fel inträffade vid inläsning av konfiguration om postlådorna"
msgstr[1] "Fel inträffade vid inläsning av konfiguration om postlådorna"
-#: ../src/mn-mailboxes.gob:386
+#: ../src/mn-mailboxes.gob:388
msgid "Unable to save the mailboxes configuration"
msgstr "Kunde inte spara konfiguration om postlådorna"
-#: ../src/mn-mailboxes.gob:428
+#: ../src/mn-mailboxes.gob:430 ../src/mn-vfs.c:240
#, c-format
msgid "Unable to remove %s: %s."
msgstr "Kunde inte ta bort %s: %s."
-#: ../src/mn-mailboxes.gob:436
+#: ../src/mn-mailboxes.gob:438
#, c-format
msgid "Unable to create %s: %s."
msgstr "Kunde inte skapa %s: %s."
-#: ../src/mn-mailboxes.gob:443
+#: ../src/mn-mailboxes.gob:445
#, c-format
msgid "Unable to open %s for writing: %s."
msgstr "Kunde inte öppna %s för skrivning: %s."
-#: ../src/mn-mailboxes.gob:450
+#: ../src/mn-mailboxes.gob:452
msgid "Unable to write the XML document."
msgstr "Kunde inte skriva XML-dokumentet."
-#: ../src/mn-mailboxes.gob:456
+#: ../src/mn-mailboxes.gob:458
#, c-format
msgid "Unable to close %s: %s."
msgstr "Kunde inte stänga %s: %s."
-#: ../src/mn-mailboxes.gob:466
-#: ../src/mn-mailboxes.gob:473
+#: ../src/mn-mailboxes.gob:468 ../src/mn-mailboxes.gob:475 ../src/mn-vfs.c:258
+#: ../src/mn-vfs.c:266
#, c-format
msgid "Unable to rename %s to %s: %s."
msgstr "Kunde inte byta namn på %s till %s: %s."
#. non fatal
-#: ../src/mn-mailboxes.gob:479
+#: ../src/mn-mailboxes.gob:481 ../src/mn-vfs.c:276
#, c-format
msgid "unable to delete %s: %s"
msgstr "kunde inte ta bort %s: %s"
-#: ../src/mn-mailboxes.gob:509
+#: ../src/mn-mailboxes.gob:511
#, c-format
msgid "%s has %i new message"
msgid_plural "%s has %i new messages"
msgstr[0] "%s har %i nytt meddelande"
msgstr[1] "%s har %i nya meddelanden"
-#: ../src/mn-mailboxes.gob:535
+#: ../src/mn-mailboxes.gob:537
#, c-format
msgid "%s reported an error: %s"
msgstr "%s rapporterade att fel: %s"
-#: ../src/mn-maildir-mailbox-backend.gob:125
+#: ../src/mn-maildir-mailbox-backend.gob:129
#, c-format
msgid "unable to open folder \"%s\": %s"
msgstr "kunde inte öppna mappen \"%s\": %s"
-#: ../src/mn-maildir-mailbox-backend.gob:173
+#: ../src/mn-maildir-mailbox-backend.gob:178
#, c-format
msgid "unable to close folder \"%s\": %s"
msgstr "kunde inte stänga mappen \"%s\": %s"
-#: ../src/mn-maildir-mailbox-backend.gob:176
+#: ../src/mn-maildir-mailbox-backend.gob:181
#, c-format
msgid "error while reading folder \"%s\": %s"
msgstr "fel vid läsning av mappen \"%s\": %s"
-#: ../src/mn-main.c:100
+#: ../src/mn-main.c:110
msgid "yes"
msgstr "ja"
-#: ../src/mn-main.c:100
+#: ../src/mn-main.c:110
msgid "no"
msgstr "nej"
-#: ../src/mn-main.c:132
+#: ../src/mn-main.c:143
#, c-format
msgid "%s version %s\n"
msgstr "%s version %s\n"
-#: ../src/mn-main.c:137
+#: ../src/mn-main.c:148
msgid "Mailbox backends:\n"
msgstr "Bakändor för postlådor:\n"
-#: ../src/mn-main.c:142
+#: ../src/mn-main.c:153
msgid "POP3 and IMAP features:\n"
msgstr "POP3 och IMAP erbjuder:\n"
-#: ../src/mn-main.c:147
+#: ../src/mn-main.c:158
msgid "Sylpheed features:\n"
msgstr "Sylpheed erbjuder:\n"
-#: ../src/mn-main.c:198
+#: ../src/mn-main.c:206
#, c-format
msgid "A Bonobo exception (%s) has occurred in %s()."
msgstr "Ett undantag i Bonobo (%s) har inträffat i %s()."
-#: ../src/mn-main.c:220
+#: ../src/mn-main.c:248
+#, c-format
+msgid "%s option ignored since Mail Notification is not already running"
+msgstr "Flaggan %s ignoreras eftersom E-postnotifieraren inte körs"
+
+#: ../src/mn-main.c:268
msgid "Show version information"
msgstr "Visa versionsinformation"
-#: ../src/mn-main.c:229
+#: ../src/mn-main.c:277
msgid "Enable informational output"
msgstr "Aktivera informativ utskrift"
-#: ../src/mn-main.c:238
+#: ../src/mn-main.c:286
msgid "Display the properties dialog"
msgstr "Visa egenskapsdialogrutan"
-#: ../src/mn-main.c:247
+#: ../src/mn-main.c:295
msgid "Display the about dialog"
msgstr "Visa Om-dialogrutan"
-#: ../src/mn-main.c:256
-msgid "Close the mail summary popup"
-msgstr "Stäng popuprutan för e-postsammandrag"
-
-#: ../src/mn-main.c:265
+#: ../src/mn-main.c:304
msgid "Update the mail status"
msgstr "Uppdatera e-poststatus"
-#: ../src/mn-main.c:274
+#: ../src/mn-main.c:313
+msgid "Print a XML mail summary"
+msgstr "Skriv ut ett e-postsammandrag i XML"
+
+#: ../src/mn-main.c:322
msgid "Unset obsolete GConf configuration"
msgstr "Inaktivera föråldrad GConf-konfiguration"
-#: ../src/mn-main.c:283
+#: ../src/mn-main.c:331
msgid "Quit Mail Notification"
msgstr "Avsluta E-postnotifieraren"
@@ -1009,132 +1047,160 @@ msgstr "Avsluta E-postnotifieraren"
#. * We cannot use mn_fatal_error_dialog() because gtk_init() has
#. * not been called yet.
#.
-#: ../src/mn-main.c:310
+#: ../src/mn-main.c:358
msgid "multi-threading is not available"
msgstr "multitrådning är inte tillgängligt"
-#: ../src/mn-main.c:365
-msgid "Bonobo could not locate the automation object. Please check your Mail Notification installation."
-msgstr "Bonobo kunde inte hitta automationsobjektet. Kontrollera din installation av E-postnotifieraren."
+#: ../src/mn-main.c:412
+msgid ""
+"Bonobo could not locate the automation object. Please check your Mail "
+"Notification installation."
+msgstr ""
+"Bonobo kunde inte hitta automationsobjektet. Kontrollera din installation av "
+"E-postnotifieraren."
-#: ../src/mn-main.c:371
+#: ../src/mn-main.c:418
msgid "quitting Mail Notification"
msgstr "avslutar E-postnotifieraren"
-#: ../src/mn-main.c:375
+#: ../src/mn-main.c:422
msgid "Mail Notification is not running"
msgstr "E-postnotifieraren körs inte"
-#: ../src/mn-main.c:390
+#: ../src/mn-main.c:437
msgid "Unable to initialize the GnomeVFS library."
msgstr "Kunde inte initiera GnomeVFS-biblioteket."
-#: ../src/mn-main.c:438
+#: ../src/mn-main.c:447
+msgid "An initialization error has occurred in Mail Notification"
+msgstr "Ett initieringsfel har inträffat i E-postnotifieraren"
+
+#: ../src/mn-main.c:448
+msgid ""
+"Unable to initialize the notification library. Message popups will not be "
+"displayed."
+msgstr "Kunde inte initiera notifieringsbiblioteket. Meddelandepopuprutor kommer inte att visas."
+
+#: ../src/mn-main.c:486
msgid "updating the mail status"
msgstr "uppdaterar e-poststatus"
-#: ../src/mn-main.c:446
+#: ../src/mn-main.c:502
msgid "Mail Notification is already running"
msgstr "E-postnotifieraren körs redan"
-#: ../src/mn-main.c:456
+#: ../src/mn-main.c:519
#, c-format
-msgid "Bonobo could not locate the %s file. Please check your Mail Notification installation."
-msgstr "Bonobo kunde inte hitta filen %s. Kontrollera din installation av E-postnotifieraren."
-
-#: ../src/mn-mbox-mailbox-backend.gob:281
-#, c-format
-msgid "unable to close file: %s"
-msgstr "kunde inte stänga fil: %s"
-
-#: ../src/mn-mbox-mailbox-backend.gob:298
-#, c-format
-msgid "unable to open mailbox: %s"
-msgstr "kunde inte öppna postlåda: %s"
+msgid ""
+"Bonobo could not locate the %s file. Please check your Mail Notification "
+"installation."
+msgstr ""
+"Bonobo kunde inte hitta filen %s. Kontrollera din installation av E-"
+"postnotifieraren."
-#: ../src/mn-message-mime.c:121
+#: ../src/mn-message-mime.c:193
msgid "unable to parse MIME message"
msgstr "kunde inte tolka MIME-meddelande"
-#: ../src/mn-message.gob:111
+#: ../src/mn-message.gob:145
msgid "Unknown"
msgstr "Okänt"
-#. translators: "none" is used like "Mailbox: none"
-#: ../src/mn-message.gob:130
-msgid "none"
-msgstr "ingen"
+#: ../src/mn-message.gob:208
+msgid "unterminated substitution"
+msgstr "oavslutad ersättning"
+
+#: ../src/mn-message.gob:247
+#, c-format
+msgid "unknown substitution \"%s\""
+msgstr "okänd ersättning \"%s\""
+
+#: ../src/mn-message.gob:250
+msgid "empty substitution"
+msgstr "tom ersättning"
+
+#: ../src/mn-message.gob:313 ../src/mn-util.c:1427
+#, c-format
+msgid "Unable to execute \"%s\": %s."
+msgstr "Kunde inte starta \"%s\": %s."
-#: ../src/mn-mh-mailbox-backend.gob:167
+#: ../src/mn-mh-mailbox-backend.gob:177
#, c-format
msgid "error while reading %s: %s"
msgstr "vid vid läsning av %s: %s"
-#: ../src/mn-mh-mailbox-backend.gob:180
+#: ../src/mn-mh-mailbox-backend.gob:190
#, c-format
msgid "unable to open %s: %s"
msgstr "kunde inte öppna %s: %s"
-#: ../src/mn-pi-mailbox-properties.gob:67
-msgid "sta_ndard"
-msgstr "sta_ndard"
+#: ../src/mn-pi-mailbox-properties.gob:70
+msgid "_Standard"
+msgstr "Sta_ndard"
-#: ../src/mn-pi-mailbox-properties.gob:68
-msgid "in-band SS_L/TLS"
-msgstr "in-band SS_L/TLS"
+#: ../src/mn-pi-mailbox-properties.gob:71
+msgid "In-_band SSL/TLS"
+msgstr "In-_band SSL/TLS"
-#: ../src/mn-pi-mailbox-properties.gob:69
-msgid "SSL/TLS on sepa_rate port"
-msgstr "SSL/TLS på sepa_rat port"
+#: ../src/mn-pi-mailbox-properties.gob:72
+msgid "SSL/TLS on s_eparate port"
+msgstr "SSL/TLS på s_eparat port"
-#: ../src/mn-pi-mailbox-properties.gob:73
-msgid "Ho_stname:"
-msgstr "_Värdnamn:"
+#: ../src/mn-pi-mailbox-properties.gob:76
+msgid "_Server:"
+msgstr "_Server:"
#. translators: header capitalization
-#: ../src/mn-pi-mailbox-properties.gob:94
-msgid "_Details"
-msgstr "_Detaljer"
-
-#: ../src/mn-pi-mailbox-properties.gob:149
-msgid "Connection type:"
-msgstr "Anslutningstyp:"
+#: ../src/mn-pi-mailbox-properties.gob:96
+msgid "Connection Type"
+msgstr "Anslutningstyp"
-#: ../src/mn-pi-mailbox-properties.gob:156
+#: ../src/mn-pi-mailbox-properties.gob:140
msgid "Port:"
msgstr "Port:"
-#: ../src/mn-pi-mailbox-properties.gob:179
-msgid "Authent_ication mechanism:"
-msgstr "Autent_iseringsmekanism:"
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:167
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: ../src/mn-pi-mailbox-properties.gob:171
+msgid "_Mechanism:"
+msgstr "_Mekanism:"
+
+#: ../src/mn-pi-mailbox-properties.gob:205
+msgid "Connection"
+msgstr "Anslutning"
-#: ../src/mn-pi-mailbox.gob:151
+#: ../src/mn-pi-mailbox.gob:154
msgid "SSL/TLS support has not been compiled in"
msgstr "SSL/TLS-stöd har inte byggts in"
-#: ../src/mn-pi-mailbox.gob:317
+#: ../src/mn-pi-mailbox.gob:320
#, c-format
msgid ""
-"Mail Notification was unable to log into %s mailbox %s, possibly because the credentials you have entered are invalid.\n"
+"Mail Notification was unable to log into %s mailbox %s, possibly because the "
+"credentials you have entered are invalid.\n"
"\n"
"Please re-enter your credentials."
msgstr ""
-"E-postnotifieraren kunde inte logga in i %s-postlådan %s, möjligen på grund av att de uppgifter du har matat in är felaktiga.\n"
+"E-postnotifieraren kunde inte logga in i %s-postlådan %s, möjligen på grund "
+"av att de uppgifter du har matat in är felaktiga.\n"
"\n"
"Mata in dina uppgifter igen."
-#: ../src/mn-pi-mailbox.gob:318
+#: ../src/mn-pi-mailbox.gob:321
#, c-format
msgid "Enter your credentials for %s mailbox %s."
msgstr "Ange dina uppgifter för %s-postlådan %s."
#. keep the title in sync with gnome-authentication-manager
#. translators: header capitalization
-#: ../src/mn-pi-mailbox.gob:361
+#: ../src/mn-pi-mailbox.gob:364
msgid "Authentication Required"
msgstr "Autentisering krävs"
-#: ../src/mn-pop3-mailbox.gob:344
+#: ../src/mn-pop3-mailbox.gob:345
msgid "invalid arguments for the LOGIN-DELAY capability"
msgstr "ogiltiga argument för färdigheten LOGIN-DELAY"
@@ -1144,223 +1210,323 @@ msgstr "ogiltiga argument för färdigheten LOGIN-DELAY"
#. * servers nevertheless, by retrying without the SASL
#. * initial client response.
#.
-#: ../src/mn-pop3-mailbox.gob:485
-msgid "SASL authentication with initial client response failed, retrying without initial client response"
-msgstr "SASL-autentisering med initalt klientsvar misslyckades, försöker utan initalt klientsvar"
+#: ../src/mn-pop3-mailbox.gob:486
+msgid ""
+"SASL authentication with initial client response failed, retrying without "
+"initial client response"
+msgstr ""
+"SASL-autentisering med initalt klientsvar misslyckades, försöker utan "
+"initalt klientsvar"
-#: ../src/mn-pop3-mailbox.gob:696
+#: ../src/mn-pop3-mailbox.gob:703
msgid "unknown error"
msgstr "okänt fel"
-#: ../src/mn-pop3-mailbox.gob:791
+#: ../src/mn-pop3-mailbox.gob:798
#, c-format
msgid "honouring LOGIN-DELAY, sleeping for %i second"
msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
msgstr[0] "följer LOGIN-DELAY, sover i %i sekund"
msgstr[1] "följer LOGIN-DELAY, sover i %i sekunder"
-#: ../src/mn-pop3-mailbox.gob:959
+#: ../src/mn-pop3-mailbox.gob:968
msgid "server does not support APOP authentication"
msgstr "servern saknar stöd för APOP-autentisering"
-#: ../src/mn-pop3-mailbox.gob:1015
+#: ../src/mn-pop3-mailbox.gob:1024
msgid "falling back to APOP authentication"
msgstr "faller tillbaka på APOP-autentisering"
-#: ../src/mn-pop3-mailbox.gob:1020
+#: ../src/mn-pop3-mailbox.gob:1029
msgid "falling back to USER/PASS authentication"
msgstr "faller tillbaka på USER/PASS-autentisering"
+#: ../src/mn-popup.gob:60 ../src/mn-standard-message-view.gob:63
+msgid "Mailbox:"
+msgstr "Postlåda:"
+
+#: ../src/mn-popup.gob:62 ../src/mn-standard-message-view.gob:65
+msgid "Unreadable message:"
+msgstr "Oläsligt meddelande:"
+
+#: ../src/mn-popup.gob:65 ../src/mn-standard-message-view.gob:68
+msgid "From:"
+msgstr "Från:"
+
+#: ../src/mn-popup.gob:66 ../src/mn-standard-message-view.gob:69
+msgid "Subject:"
+msgstr "Ämne:"
+
+#: ../src/mn-popup.gob:128
+#, c-format
+msgid "configuration key %s: there is no action named `%s'"
+msgstr "konfigurationsnyckel %s: det finns ingen åtgärd med namnet \"%s\""
+
#. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:173
-#: ../ui/properties-dialog.glade.h:23
-msgid "Mail Notification Properties"
-msgstr "Egenskaper för E-postnotifieraren"
+#: ../src/mn-popup.gob:141
+msgid "Open"
+msgstr "Öppna"
+
+#. translators: header capitalization
+#: ../src/mn-popup.gob:154
+msgid "Mark as Read"
+msgstr "Markera som läst"
+
+#. translators: header capitalization
+#: ../src/mn-popup.gob:167
+msgid "Mark as Spam"
+msgstr "Markera som skräppost"
-#: ../src/mn-properties-dialog.gob:207
-msgid "top left"
-msgstr "överst till vänster"
+#. translators: header capitalization
+#: ../src/mn-popup.gob:180
+msgid "Delete"
+msgstr "Ta bort"
+
+#: ../src/mn-popup.gob:196
+msgid "Unable to open message"
+msgstr "Kunde inte öppna meddelandet"
+
+#: ../src/mn-popup.gob:213
+msgid "Unable to mark message as read"
+msgstr "Kunde inte markera meddelandet som läst"
+
+#: ../src/mn-popup.gob:230
+msgid "Unable to mark message as spam"
+msgstr "Kunde inte markera meddelandet som skräppost"
+
+#: ../src/mn-popup.gob:247
+msgid "Unable to delete message"
+msgstr "Kunde inte ta bort meddelandet"
+
+#: ../src/mn-popup.gob:306
+#, c-format
+msgid "unable to show popup: %s"
+msgstr "kunde inte visa popupruta: %s"
+
+#: ../src/mn-popup.gob:323
+#, c-format
+msgid "unable to close popup: %s"
+msgstr "kunde inte stänga popupruta: %s"
-#: ../src/mn-properties-dialog.gob:208
-msgid "top right"
-msgstr "överst till höger"
+#. we set the summary here because libnotify requires it
+#. translators: header capitalization
+#: ../src/mn-popup.gob:334
+msgid "New Message"
+msgstr "Nytt meddelande"
-#: ../src/mn-properties-dialog.gob:209
-msgid "bottom left"
-msgstr "nederst till vänster"
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:131 ../ui/properties-dialog.glade.h:20
+msgid "Mail Notification Properties"
+msgstr "Egenskaper för E-postnotifieraren"
-#: ../src/mn-properties-dialog.gob:210
-msgid "bottom right"
-msgstr "nederst till höger"
+#. translators: "test" is an adjective, not a verb
+#: ../src/mn-properties-dialog.gob:136
+msgid "_Test messages"
+msgstr "_Testmeddelanden"
-#: ../src/mn-properties-dialog.gob:332
+#: ../src/mn-properties-dialog.gob:276
msgid "No mailbox selected."
msgstr "Ingen postlåda markerad."
-#: ../src/mn-properties-dialog.gob:337
+#: ../src/mn-properties-dialog.gob:281
#, c-format
msgid "%i mailbox selected."
msgid_plural "%i mailboxes selected."
msgstr[0] "%i postlåda markerad."
msgstr[1] "%i postlådor markerade."
-#: ../src/mn-properties-dialog.gob:456
+#: ../src/mn-shell.gob:224
+msgid "No mail reader is configured"
+msgstr "Inget e-postprogram har konfigurerats"
+
+#: ../src/mn-shell.gob:225
+msgid ""
+"You can configure a mail reader by choosing <b>System → Preferences → "
+"Preferred Applications</b>."
+msgstr ""
+"Du kan konfigurera ett e-postprogram genom att välja <b>System → Inställningar → "
+"Föredragna program</b>."
+
+#: ../src/mn-shell.gob:236 ../src/mn-shell.gob:242 ../src/mn-shell.gob:534
+msgid "Unable to open the latest message"
+msgstr "Kunde inte öppna senaste meddelandet"
+
+#: ../src/mn-shell.gob:237
#, c-format
-msgid "Test message #%i"
-msgstr "Testmeddelande #%i"
+msgid "Messages of mailbox \"%s\" cannot be opened."
+msgstr "Meddelanden i postlådan \"%s\" kan inte öppnas."
-#. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:462
-msgid "Mail Notification Properties Dialog"
-msgstr "Egenskapsdialogrutan för E-postnotifieraren"
+#: ../src/mn-shell.gob:243 ../src/mn-shell.gob:462
+msgid "You have no new mail."
+msgstr "Du har inga nya brev."
#. translators: header capitalization
-#: ../src/mn-shell.gob:381
+#: ../src/mn-shell.gob:398
msgid "Mailboxes Having New Mail"
msgstr "Postlådor som innehåller nya brev"
#. translators: header capitalization
-#: ../src/mn-shell.gob:400
+#: ../src/mn-shell.gob:417
msgid "Errors"
msgstr "Fel"
#. translators: header capitalization
-#: ../src/mn-shell.gob:416
+#: ../src/mn-shell.gob:433
msgid "Mail Summary"
msgstr "E-postsammandrag"
-#: ../src/mn-shell.gob:445
-msgid "You have no new mail."
-msgstr "Du har inga nya brev."
-
-#: ../src/mn-ssl.c:76
+#: ../src/mn-ssl.c:159
msgid "unknown SSL/TLS error"
msgstr "okänt SSL/TLS-fel"
-#: ../src/mn-standard-message-view.gob:64
-msgid "Unreadable message:"
-msgstr "Oläsligt meddelande:"
-
-#: ../src/mn-standard-message-view.gob:67
-msgid "From:"
-msgstr "Från:"
-
-#: ../src/mn-standard-message-view.gob:68
-msgid "Subject:"
-msgstr "Ämne:"
-
-#: ../src/mn-standard-message-view.gob:72
+#: ../src/mn-standard-message-view.gob:73
msgid "Sent:"
msgstr "Skickat:"
#. translators: header capitalization
-#: ../src/mn-stock.c:29
+#: ../src/mn-stock.c:30
msgid "Select _All"
msgstr "Markera _alla"
#. translators: header capitalization
-#. translators: header capitalization
#: ../src/mn-stock.c:32
msgid "Co_nnect"
msgstr "A_nslut"
-#: ../src/mn-sylpheed-mailbox-backend.gob:223
+#: ../src/mn-sylpheed-mailbox-backend.gob:227
#, c-format
msgid "unable to open folder: %s"
msgstr "kunde inte öppna mapp: %s"
-#: ../src/mn-sylpheed-mailbox-backend.gob:276
+#: ../src/mn-sylpheed-mailbox-backend.gob:277
#, c-format
msgid "unable to close folder: %s"
msgstr "kunde inte stänga mapp: %s"
-#: ../src/mn-sylpheed-mailbox-backend.gob:279
+#: ../src/mn-sylpheed-mailbox-backend.gob:280
#, c-format
msgid "error while reading folder: %s"
msgstr "fel vid läsning av mapp: %s"
-#: ../src/mn-sylpheed-mailbox-backend.gob:420
+#: ../src/mn-sylpheed-mailbox-backend.gob:424
msgid "unexpected end of file"
msgstr "oväntat slut på fil"
-#: ../src/mn-sylpheed-mailbox-backend.gob:438
+#: ../src/mn-sylpheed-mailbox-backend.gob:437
#, c-format
msgid "incompatible file version \"%i\""
msgstr "okompatibel filversion \"%i\""
-#: ../src/mn-sylpheed-mailbox-backend.gob:441
+#: ../src/mn-sylpheed-mailbox-backend.gob:440
msgid "file version missing"
msgstr "filversion saknas"
-#: ../src/mn-system-vfs-mailbox-properties.gob:40
-#: ../src/mn-system-vfs-mailbox-properties.gob:48
-#: ../src/mn-system-vfs-mailbox.gob:45
+#: ../src/mn-sylpheed-mailbox-backend.gob:498
+#, c-format
+msgid "Unable to read %s: %s."
+msgstr "Kunde inte läsa %s: %s."
+
+#: ../src/mn-system-vfs-mailbox-properties.gob:41
+#: ../src/mn-system-vfs-mailbox-properties.gob:49
+#: ../src/mn-system-vfs-mailbox.gob:46
msgid "System mailbox"
msgstr "Systempostlåda"
-#: ../src/mn-system-vfs-mailbox-properties.gob:70
+#: ../src/mn-system-vfs-mailbox-properties.gob:76
#, c-format
msgid "Your system mailbox is <span weight=\"bold\">%s</span>."
msgstr "Din systempostlåda är <span weight=\"bold\">%s</span>."
-#: ../src/mn-system-vfs-mailbox-properties.gob:77
-msgid "The location of your system mailbox could not be detected. Check the MAIL environment variable."
-msgstr "Platsen för din systempostlåda kunde inte identifieras. Kontrollera miljövariabeln MAIL."
+#: ../src/mn-system-vfs-mailbox-properties.gob:83
+msgid ""
+"The location of your system mailbox could not be detected. Check the MAIL "
+"environment variable."
+msgstr ""
+"Platsen för din systempostlåda kunde inte identifieras. Kontrollera "
+"miljövariabeln MAIL."
-#: ../src/mn-system-vfs-mailbox.gob:72
+#: ../src/mn-system-vfs-mailbox.gob:73
msgid "system mailbox not found"
msgstr "systempostlåda hittades inte"
-#: ../src/mn-util.c:349
+#: ../src/mn-test-mailbox.gob:40
+msgid "Test mailbox"
+msgstr "Testpostlåda"
+
+#: ../src/mn-test-mailbox.gob:59
+#, c-format
+msgid "Test message #%i"
+msgstr "Testmeddelande #%i"
+
+#. translators: header capitalization
+#: ../src/mn-test-mailbox.gob:65
+msgid "Mail Notification Properties Dialog"
+msgstr "Egenskapsdialogrutan för E-postnotifieraren"
+
+#: ../src/mn-util.c:351
#, c-format
msgid "error loading image: %s"
msgstr "fel vid inläsning av bild: %s"
-#: ../src/mn-util.c:365
+#: ../src/mn-util.c:367
#, c-format
-msgid "Unable to load interface \"%s\". Please check your Mail Notification installation."
-msgstr "Kunde inte läsa in gränssnittet \"%s\". Kontrollera din installation av E-postnotifieraren."
+msgid ""
+"Unable to load interface \"%s\". Please check your Mail Notification "
+"installation."
+msgstr ""
+"Kunde inte läsa in gränssnittet \"%s\". Kontrollera din installation av E-"
+"postnotifieraren."
-#: ../src/mn-util.c:380
+#: ../src/mn-util.c:382
#, c-format
-msgid "Widget \"%s\" not found in interface \"%s\". Please check your Mail Notification installation."
-msgstr "Widgeten \"%s\" hittades inte i gränssnittet \"%s\". Kontrollera din installation av E-postnotifieraren."
+msgid ""
+"Widget \"%s\" not found in interface \"%s\". Please check your Mail "
+"Notification installation."
+msgstr ""
+"Widgeten \"%s\" hittades inte i gränssnittet \"%s\". Kontrollera din "
+"installation av E-postnotifieraren."
-#: ../src/mn-util.c:449
+#: ../src/mn-util.c:451
#, c-format
msgid "Unable to open self as a module (%s)."
msgstr "Kunde inte öppna själv som en modul (%s)."
-#: ../src/mn-util.c:454
+#: ../src/mn-util.c:456
#, c-format
-msgid "Signal handler \"%s\" not found. Please check your Mail Notification installation."
-msgstr "Signalhanteraren \"%s\" hittades inte. Kontrollera din installation av E-postnotifieraren."
+msgid ""
+"Signal handler \"%s\" not found. Please check your Mail Notification "
+"installation."
+msgstr ""
+"Signalhanteraren \"%s\" hittades inte. Kontrollera din installation av E-"
+"postnotifieraren."
-#: ../src/mn-util.c:605
-#: ../src/mn-util.c:628
-#: ../src/mn-util.c:648
-#: ../src/mn-util.c:670
+#: ../src/mn-util.c:607 ../src/mn-util.c:630 ../src/mn-util.c:650
+#: ../src/mn-util.c:672
msgid "A drag and drop error has occurred"
msgstr "Ett drag-och-släpp-fel har inträffat"
-#: ../src/mn-util.c:606
+#: ../src/mn-util.c:608
msgid "An invalid location list has been received."
msgstr "En ogiltig platslista har tagits emot."
-#: ../src/mn-util.c:649
+#: ../src/mn-util.c:651
msgid "An invalid Mozilla location has been received."
msgstr "En ogiltig Mozilla-plats har tagits emot."
-#: ../src/mn-util.c:725
+#: ../src/mn-util.c:727
msgid "Unable to display help"
msgstr "Kunde inte visa hjälp"
#: ../src/mn-util.c:739
+msgid "Unable to open link"
+msgstr "Kunde inte öppna länk"
+
+#: ../src/mn-util.c:753
#, c-format
msgid "Unable to create a thread: %s."
msgstr "Kunde inte skapa en tråd: %s."
-#: ../src/mn-util.c:899
+#: ../src/mn-util.c:930
#, c-format
msgid ""
"The following location is invalid:\n"
@@ -1379,89 +1545,112 @@ msgstr[1] ""
"\n"
"%s"
-#: ../src/mn-util.c:919
+#: ../src/mn-util.c:946
msgid "A fatal error has occurred in Mail Notification"
msgstr "Ett ödesdigert fel har inträffat i E-postnotifieraren"
-#: ../src/mn-util.c:958
+#: ../src/mn-util.c:990
#, c-format
msgid "unable to get current time: %s"
msgstr "kunde inte hämta aktuell tid: %s"
-#: ../src/mn-util.c:1250
+#: ../src/mn-util.c:1359
#, c-format
msgid "%i second ago"
msgid_plural "%i seconds ago"
msgstr[0] "%i sekund sedan"
msgstr[1] "%i sekunder sedan"
-#: ../src/mn-util.c:1254
+#: ../src/mn-util.c:1363
#, c-format
msgid "about %i minute ago"
msgid_plural "about %i minutes ago"
msgstr[0] "ungefär %i minut sedan"
msgstr[1] "ungefär %i minuter sedan"
-#: ../src/mn-util.c:1259
+#: ../src/mn-util.c:1368
#, c-format
msgid "about %i hour ago"
msgid_plural "about %i hours ago"
msgstr[0] "ungefär %i timme sedan"
msgstr[1] "ungefär %i timmar sedan"
-#: ../src/mn-util.c:1264
+#: ../src/mn-util.c:1373
#, c-format
msgid "about %i day ago"
msgid_plural "about %i days ago"
msgstr[0] "ungefär %i dag sedan"
msgstr[1] "ungefär %i dagar sedan"
-#: ../src/mn-util.c:1269
+#: ../src/mn-util.c:1378
#, c-format
msgid "about %i week ago"
msgid_plural "about %i weeks ago"
msgstr[0] "ungefär %i vecka sedan"
msgstr[1] "ungefär %i veckor sedan"
-#: ../src/mn-util.c:1282
+#: ../src/mn-util.c:1391
msgid "unknown date"
msgstr "okänt datum"
-#: ../src/mn-vfs-mailbox.gob:221
+#: ../src/mn-util.c:1426
+msgid "A command error has occurred in Mail Notification"
+msgstr "Ett kommandofel har inträffat i E-postnotifieraren"
+
+#: ../src/mn-vfs-mailbox.gob:249
#, c-format
msgid "unable to monitor %s (%s), poll mode activated"
msgstr "kunde inte övervaka %s (%s), pollningsläge aktiverat"
-#: ../src/mn-vfs-mailbox.gob:385
+#: ../src/mn-vfs-mailbox.gob:421
msgid "unknown mailbox format"
msgstr "okänt postlådeformat"
-#: ../src/mn-vfs-mailbox.gob:385
+#: ../src/mn-vfs-mailbox.gob:421
msgid "does not exist"
msgstr "finns inte"
+#: ../src/mn-vfs.c:248
+#, c-format
+msgid "Unable to write %s: %s."
+msgstr "Kunde inte skriva till %s: %s."
+
+#: ../src/mn-xml.c:54
+#, c-format
+msgid ""
+"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
+"\""
+msgstr ""
+"egenskap \"%s\": kunde inte transformera strängen \"%s\" till ett värde av "
+"typen \"%s\""
+
#. translators: header capitalization
-#: ../ui/mailbox-properties-dialog.glade.h:2
-#: ../ui/properties-dialog.glade.h:8
+#: ../ui/mailbox-properties-dialog.glade.h:1 ../ui/properties-dialog.glade.h:8
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">Allmänt</span>"
-#: ../ui/mailbox-properties-dialog.glade.h:3
-msgid "Delay between mail chec_ks:"
-msgstr "Tid mellan e-post_kontroller:"
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:2
+#: ../ui/properties-dialog.glade.h:17
+msgid "General"
+msgstr "Allmänt"
-#: ../ui/mailbox-properties-dialog.glade.h:4
+#: ../ui/mailbox-properties-dialog.glade.h:3
msgid "Mailbox _name:"
msgstr "Namn på postlåda:"
+#: ../ui/mailbox-properties-dialog.glade.h:4
+msgid "Mailbox _type:"
+msgstr "_Typ av postlåda:"
+
#. translators: header capitalization
#: ../ui/mailbox-properties-dialog.glade.h:6
-msgid "Use De_fault"
+msgid "Us_e Default"
msgstr "Använd s_tandard"
#: ../ui/mailbox-properties-dialog.glade.h:7
-msgid "_Mailbox type:"
-msgstr "Typ av _postlåda:"
+msgid "_Delay between mail checks:"
+msgstr "Fördröjning mellan brev_kontroller:"
#. translators: header capitalization
#: ../ui/mailbox-properties-dialog.glade.h:9
@@ -1469,12 +1658,12 @@ msgid "_Use Default"
msgstr "_Använd standard"
#: ../ui/mailbox-properties-dialog.glade.h:10
-#: ../ui/properties-dialog.glade.h:48
+#: ../ui/properties-dialog.glade.h:41
msgid "minutes"
msgstr "minuter"
#: ../ui/mailbox-properties-dialog.glade.h:11
-#: ../ui/properties-dialog.glade.h:52
+#: ../ui/properties-dialog.glade.h:42
msgid "seconds"
msgstr "sekunder"
@@ -1490,212 +1679,99 @@ msgstr "<span weight=\"bold\">Kommandon</span>"
#. translators: header capitalization
#: ../ui/properties-dialog.glade.h:6
-msgid "<span weight=\"bold\">Fonts</span>"
-msgstr "<span weight=\"bold\">Typsnitt</span>"
+msgid "<span weight=\"bold\">Expiration</span>"
+msgstr "<span weight=\"bold\">Låt popuprutor försvinna</span>"
#. translators: header capitalization
#: ../ui/properties-dialog.glade.h:10
-msgid "<span weight=\"bold\">Layout</span>"
-msgstr "<span weight=\"bold\">Utseende</span>"
-
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:12
msgid "<span weight=\"bold\">Mailbox List</span>"
msgstr "<span weight=\"bold\">Lista på postlådor</span>"
#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:14
+#: ../ui/properties-dialog.glade.h:12
msgid "<span weight=\"bold\">Position</span>"
msgstr "<span weight=\"bold\">Position</span>"
#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:16
+#: ../ui/properties-dialog.glade.h:14
msgid "<span weight=\"bold\">Tooltip Mail Summary</span>"
msgstr "<span weight=\"bold\">Verktygstips för e-postsammandrag</span>"
-#: ../ui/properties-dialog.glade.h:17
-msgid "Co_ntents:"
-msgstr "In_nehåll:"
-
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:19
-msgid "General"
-msgstr "Allmänt"
+#: ../ui/properties-dialog.glade.h:15
+msgid "A_fter:"
+msgstr "E_fter:"
-#: ../ui/properties-dialog.glade.h:20
-msgid "Hide p_reviously displayed mail"
-msgstr "Dölj fö_regående visat brev"
-
-#: ../ui/properties-dialog.glade.h:21
-msgid "Hori_zontal offset:"
-msgstr "_Horisontal position:"
+#: ../ui/properties-dialog.glade.h:18
+msgid "In the p_opup stack"
+msgstr "I p_opuprutestacken"
#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:25
-msgid "Mail Summary Popup"
-msgstr "Popupruta för e-postsammandrag"
+#: ../ui/properties-dialog.glade.h:22
+msgid "Message Popups"
+msgstr "Meddelandepopuprutor"
#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:27
+#: ../ui/properties-dialog.glade.h:24
msgid "Status Icon"
msgstr "Statusikon"
-#: ../ui/properties-dialog.glade.h:28
-msgid "Use these _fonts:"
-msgstr "Använd dessa _typsnitt:"
-
-#: ../ui/properties-dialog.glade.h:29
+#: ../ui/properties-dialog.glade.h:25
msgid "When _new mail arrives:"
msgstr "När _nya brev anländer:"
-#: ../ui/properties-dialog.glade.h:30
+#: ../ui/properties-dialog.glade.h:26
msgid "When all mail has _been read:"
msgstr "När alla brev har _blivit lästa:"
-#: ../ui/properties-dialog.glade.h:31
+#: ../ui/properties-dialog.glade.h:27
msgid "_Always display"
msgstr "Visa _alltid"
-#: ../ui/properties-dialog.glade.h:32
-msgid "_Automatically close after:"
-msgstr "Stäng _automatiskt efter:"
+#: ../ui/properties-dialog.glade.h:28
+msgid "_Attached to the status icon"
+msgstr "_Fäst till statusikonen"
-#: ../ui/properties-dialog.glade.h:33
+#: ../ui/properties-dialog.glade.h:29
msgid "_Blink on errors"
msgstr "_Blinka vid fel"
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:35
-msgid "_Display a Test Popup"
-msgstr "_Visa test för popupruta"
+#: ../ui/properties-dialog.glade.h:30
+msgid "_Desktop default"
+msgstr "S_krivbordets standard"
-#: ../ui/properties-dialog.glade.h:36
+#: ../ui/properties-dialog.glade.h:31
msgid "_Display seen mail"
msgstr "_Visa sedda brev"
-#: ../ui/properties-dialog.glade.h:37
+#: ../ui/properties-dialog.glade.h:32
msgid "_Display this dialog"
msgstr "_Visa denna dialogruta"
-#: ../ui/properties-dialog.glade.h:38
-msgid "_Enable mail summary popup"
-msgstr "_Aktivera popupruta för e-postsammandrag"
+#: ../ui/properties-dialog.glade.h:33
+msgid "_Enable message popups"
+msgstr "_Aktivera meddelandepopuprutor"
-#: ../ui/properties-dialog.glade.h:39
+#: ../ui/properties-dialog.glade.h:34
msgid "_Launch the mail reader"
-msgstr "_Starta e-postläsaren"
+msgstr "_Starta e-postprogrammet"
-#: ../ui/properties-dialog.glade.h:40
+#: ../ui/properties-dialog.glade.h:36
msgid "_None"
msgstr "_Ingen"
-#: ../ui/properties-dialog.glade.h:41
-msgid "_Position:"
-msgstr "_Position:"
-
-#: ../ui/properties-dialog.glade.h:42
-msgid "_Title:"
-msgstr "_Titel:"
+#: ../ui/properties-dialog.glade.h:37
+msgid "_Open the latest message"
+msgstr "_Öppna senaste meddelandet"
-#: ../ui/properties-dialog.glade.h:43
+#: ../ui/properties-dialog.glade.h:38
msgid "_Update the mail status"
msgstr "_Uppdatera brevstatusen"
-#: ../ui/properties-dialog.glade.h:44
-msgid "_Use fonts from theme"
-msgstr "_Använd typsnitt från tema"
-
-#: ../ui/properties-dialog.glade.h:45
-msgid "_Vertical offset:"
-msgstr "_Vertikal position:"
-
-#: ../ui/properties-dialog.glade.h:46
+#: ../ui/properties-dialog.glade.h:39
msgid "icon tooltip's mail summary layout|Co_mpact"
msgstr "Ko_mpakt"
-#: ../ui/properties-dialog.glade.h:47
+#: ../ui/properties-dialog.glade.h:40
msgid "icon tooltip's mail summary layout|_Standard"
msgstr "_Standard"
-#: ../ui/properties-dialog.glade.h:49
-msgid "pixels"
-msgstr "bildpunkter"
-
-#: ../ui/properties-dialog.glade.h:50
-msgid "popup's mail summary layout|Co_mpact"
-msgstr "Ko_mpakt"
-
-#: ../ui/properties-dialog.glade.h:51
-msgid "popup's mail summary layout|_Standard"
-msgstr "_Standard"
-
-#~ msgid "Set a mail reader"
-#~ msgstr "Ställ in en e-postläsare"
-#~ msgid "New Mail"
-#~ msgstr "Ny e-post"
-#~ msgid "_Remove Toolbar"
-#~ msgstr "_Ta bort verktygsrad"
-#~ msgid "Main _Window"
-#~ msgstr "Huvud_fönster"
-#~ msgid "_Mail"
-#~ msgstr "_E-post"
-#~ msgid "_Edit"
-#~ msgstr "_Redigera"
-#~ msgid "_View"
-#~ msgstr "_Visa"
-#~ msgid "_Help"
-#~ msgstr "_Hjälp"
-#~ msgid "Launch the mail reader"
-#~ msgstr "Starta e-postläsaren"
-#~ msgid "_Close"
-#~ msgstr "_Stäng"
-#~ msgid "Close this window"
-#~ msgstr "Stäng detta fönster"
-#~ msgid "_Quit"
-#~ msgstr "_Avsluta"
-#~ msgid "_Toolbars"
-#~ msgstr "_Verktygsrader"
-#~ msgid "Customize the toolbars"
-#~ msgstr "Anpassa verktygsraderna"
-#~ msgid "_Preferences"
-#~ msgstr "_Inställningar"
-#~ msgid "_Contents"
-#~ msgstr "_Innehåll"
-#~ msgid "_About"
-#~ msgstr "_Om"
-#~ msgid "Display credits"
-#~ msgstr "Visa tack"
-#~ msgid "Show or hide the toolbars"
-#~ msgstr "Visa eller dölj verktygsraderna"
-#~ msgid "_Statusbar"
-#~ msgstr "_Statusrad"
-#~ msgid "Show or hide the statusbar"
-#~ msgstr "Visa eller dölj statusraden"
-#~ msgid "I_cons Only"
-#~ msgstr "Endast i_koner"
-#~ msgid "_Text Only"
-#~ msgstr "Endast _text"
-#~ msgid "Text Belo_w Icons"
-#~ msgstr "Text _under ikoner"
-#~ msgid "Text Be_side Icons"
-#~ msgstr "Text _bredvid ikoner"
-#~ msgid "%i new message"
-#~ msgstr "%i nytt meddelande"
-#~ msgid "You have new mail."
-#~ msgstr "Du har ny e-post."
-#~ msgid "Leave Fullscreen"
-#~ msgstr "Lämna helskärmsläge"
-#~ msgid "A monitoring error has occurred"
-#~ msgstr "Ett övervakningsfel har inträffat"
-#~ msgid "Edit Toolbars"
-#~ msgstr "Redigera verktygsrader"
-#~ msgid "_Add a New Toolbar"
-#~ msgstr "_Lägg till en ny verktygsrad"
-#~ msgid "Mailboxes"
-#~ msgstr "Postlådor"
-#~ msgid "_Mail reader:"
-#~ msgstr "_E-postläsare:"
-#~ msgid "_Start Mail Notification on GNOME login"
-#~ msgstr "_Starta E-postnotifieraren vid inloggning i GNOME"
-
-
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -350,28 +350,28 @@ BUILT_SOURCES += GNOME_MailNotification_Evolution-common.c GNOME_MailNotificatio
CLEANFILES += GNOME_MailNotification_Evolution-common.c GNOME_MailNotification_Evolution-skels.c GNOME_MailNotification_Evolution-stubs.c GNOME_MailNotification_Evolution.h
endif
if WITH_EVOLUTION
-evolution_plugin_LTLIBRARIES = liborg-gnome-mail-notification.la
-liborg_gnome_mail_notification_la_CPPFLAGS = $(WARN_CFLAGS)
-liborg_gnome_mail_notification_la_CPPFLAGS += $(DEBUG_CFLAGS)
-liborg_gnome_mail_notification_la_CPPFLAGS += -I$(top_srcdir)
-liborg_gnome_mail_notification_la_CPPFLAGS += -DG_LOG_DOMAIN="\"$(PACKAGE)\""
-liborg_gnome_mail_notification_la_LDFLAGS = -avoid-version -module
-liborg_gnome_mail_notification_la_CPPFLAGS += $(EVOLUTION_PLUGIN_CFLAGS)
-liborg_gnome_mail_notification_la_LDFLAGS += $(EVOLUTION_PLUGIN_LIBS)
-liborg_gnome_mail_notification_la_SOURCES = mn-evolution-plugin.c
-liborg_gnome_mail_notification_la_SOURCES += mn-evolution.h
-liborg_gnome_mail_notification_la_SOURCES += mn-evolution-folder-tree-control.gob mn-evolution-folder-tree-control.gob.stamp
-liborg_gnome_mail_notification_la_SOURCES += mn-evolution-folder-tree-control-private.h mn-evolution-folder-tree-control.c mn-evolution-folder-tree-control.h
+evolution_plugin_LTLIBRARIES = liborg-jylefort-mail-notification.la
+liborg_jylefort_mail_notification_la_CPPFLAGS = $(WARN_CFLAGS)
+liborg_jylefort_mail_notification_la_CPPFLAGS += $(DEBUG_CFLAGS)
+liborg_jylefort_mail_notification_la_CPPFLAGS += -I$(top_srcdir)
+liborg_jylefort_mail_notification_la_CPPFLAGS += -DG_LOG_DOMAIN="\"$(PACKAGE)\""
+liborg_jylefort_mail_notification_la_LDFLAGS = -avoid-version -module
+liborg_jylefort_mail_notification_la_CPPFLAGS += $(EVOLUTION_PLUGIN_CFLAGS)
+liborg_jylefort_mail_notification_la_LDFLAGS += $(EVOLUTION_PLUGIN_LIBS)
+liborg_jylefort_mail_notification_la_SOURCES = mn-evolution-plugin.c
+liborg_jylefort_mail_notification_la_SOURCES += mn-evolution.h
+liborg_jylefort_mail_notification_la_SOURCES += mn-evolution-folder-tree-control.gob mn-evolution-folder-tree-control.gob.stamp
+liborg_jylefort_mail_notification_la_SOURCES += mn-evolution-folder-tree-control-private.h mn-evolution-folder-tree-control.c mn-evolution-folder-tree-control.h
BUILT_SOURCES += mn-evolution-folder-tree-control.gob.stamp
MAINTAINERCLEANFILES += mn-evolution-folder-tree-control.gob.stamp
MAINTAINERCLEANFILES += mn-evolution-folder-tree-control-private.h mn-evolution-folder-tree-control.c mn-evolution-folder-tree-control.h
-liborg_gnome_mail_notification_la_SOURCES += mn-evolution-glue.gob mn-evolution-glue.gob.stamp
-liborg_gnome_mail_notification_la_SOURCES += mn-evolution-glue-private.h mn-evolution-glue.c mn-evolution-glue.h
+liborg_jylefort_mail_notification_la_SOURCES += mn-evolution-glue.gob mn-evolution-glue.gob.stamp
+liborg_jylefort_mail_notification_la_SOURCES += mn-evolution-glue-private.h mn-evolution-glue.c mn-evolution-glue.h
BUILT_SOURCES += mn-evolution-glue.gob.stamp
MAINTAINERCLEANFILES += mn-evolution-glue.gob.stamp
MAINTAINERCLEANFILES += mn-evolution-glue-private.h mn-evolution-glue.c mn-evolution-glue.h
-liborg_gnome_mail_notification_la_SOURCES += GNOME_MailNotification_Evolution.idl
-nodist_liborg_gnome_mail_notification_la_SOURCES = GNOME_MailNotification_Evolution-common.c GNOME_MailNotification_Evolution-skels.c GNOME_MailNotification_Evolution-stubs.c GNOME_MailNotification_Evolution.h
+liborg_jylefort_mail_notification_la_SOURCES += GNOME_MailNotification_Evolution.idl
+nodist_liborg_jylefort_mail_notification_la_SOURCES = GNOME_MailNotification_Evolution-common.c GNOME_MailNotification_Evolution-skels.c GNOME_MailNotification_Evolution-stubs.c GNOME_MailNotification_Evolution.h
BUILT_SOURCES += GNOME_MailNotification_Evolution-common.c GNOME_MailNotification_Evolution-skels.c GNOME_MailNotification_Evolution-stubs.c GNOME_MailNotification_Evolution.h
CLEANFILES += GNOME_MailNotification_Evolution-common.c GNOME_MailNotification_Evolution-skels.c GNOME_MailNotification_Evolution-stubs.c GNOME_MailNotification_Evolution.h
endif
diff --git a/src/Makefile.in b/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -16,15 +16,11 @@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -368,7 +364,7 @@ subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/evolution-plugin.m4 \
$(top_srcdir)/m4/gnome.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/openssl.m4 \
$(top_srcdir)/m4/reentrant-resolver.m4 \
$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
@@ -387,8 +383,8 @@ am__installdirs = "$(DESTDIR)$(evolution_plugindir)" \
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(evolution_plugindir)"
evolution_pluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(evolution_plugin_LTLIBRARIES)
-liborg_gnome_mail_notification_la_LIBADD =
-am__liborg_gnome_mail_notification_la_SOURCES_DIST = \
+liborg_jylefort_mail_notification_la_LIBADD =
+am__liborg_jylefort_mail_notification_la_SOURCES_DIST = \
mn-evolution-plugin.c mn-evolution.h \
mn-evolution-folder-tree-control.gob \
mn-evolution-folder-tree-control.gob.stamp \
@@ -398,16 +394,21 @@ am__liborg_gnome_mail_notification_la_SOURCES_DIST = \
mn-evolution-glue.gob.stamp mn-evolution-glue-private.h \
mn-evolution-glue.c mn-evolution-glue.h \
GNOME_MailNotification_Evolution.idl
-@WITH_EVOLUTION_TRUE@am_liborg_gnome_mail_notification_la_OBJECTS = liborg_gnome_mail_notification_la-mn-evolution-plugin.lo \
-@WITH_EVOLUTION_TRUE@ liborg_gnome_mail_notification_la-mn-evolution-folder-tree-control.lo \
-@WITH_EVOLUTION_TRUE@ liborg_gnome_mail_notification_la-mn-evolution-glue.lo
-@WITH_EVOLUTION_TRUE@nodist_liborg_gnome_mail_notification_la_OBJECTS = liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-common.lo \
-@WITH_EVOLUTION_TRUE@ liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-skels.lo \
-@WITH_EVOLUTION_TRUE@ liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-stubs.lo
-liborg_gnome_mail_notification_la_OBJECTS = \
- $(am_liborg_gnome_mail_notification_la_OBJECTS) \
- $(nodist_liborg_gnome_mail_notification_la_OBJECTS)
-@WITH_EVOLUTION_TRUE@am_liborg_gnome_mail_notification_la_rpath = \
+@WITH_EVOLUTION_TRUE@am_liborg_jylefort_mail_notification_la_OBJECTS = liborg_jylefort_mail_notification_la-mn-evolution-plugin.lo \
+@WITH_EVOLUTION_TRUE@ liborg_jylefort_mail_notification_la-mn-evolution-folder-tree-control.lo \
+@WITH_EVOLUTION_TRUE@ liborg_jylefort_mail_notification_la-mn-evolution-glue.lo
+@WITH_EVOLUTION_TRUE@nodist_liborg_jylefort_mail_notification_la_OBJECTS = liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-common.lo \
+@WITH_EVOLUTION_TRUE@ liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-skels.lo \
+@WITH_EVOLUTION_TRUE@ liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-stubs.lo
+liborg_jylefort_mail_notification_la_OBJECTS = \
+ $(am_liborg_jylefort_mail_notification_la_OBJECTS) \
+ $(nodist_liborg_jylefort_mail_notification_la_OBJECTS)
+liborg_jylefort_mail_notification_la_LINK = $(LIBTOOL) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) \
+ $(liborg_jylefort_mail_notification_la_LDFLAGS) $(LDFLAGS) -o \
+ $@
+@WITH_EVOLUTION_TRUE@am_liborg_jylefort_mail_notification_la_rpath = \
@WITH_EVOLUTION_TRUE@ -rpath $(evolution_plugindir)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
@@ -642,22 +643,27 @@ nodist_mail_notification_OBJECTS = \
mail_notification_OBJECTS = $(am_mail_notification_OBJECTS) \
$(nodist_mail_notification_OBJECTS)
mail_notification_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+mail_notification_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(mail_notification_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(liborg_gnome_mail_notification_la_SOURCES) \
- $(nodist_liborg_gnome_mail_notification_la_SOURCES) \
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+SOURCES = $(liborg_jylefort_mail_notification_la_SOURCES) \
+ $(nodist_liborg_jylefort_mail_notification_la_SOURCES) \
$(mail_notification_SOURCES) \
$(nodist_mail_notification_SOURCES)
-DIST_SOURCES = $(am__liborg_gnome_mail_notification_la_SOURCES_DIST) \
+DIST_SOURCES = \
+ $(am__liborg_jylefort_mail_notification_la_SOURCES_DIST) \
$(am__mail_notification_SOURCES_DIST)
evolution_pluginDATA_INSTALL = $(INSTALL_DATA)
DATA = $(evolution_plugin_DATA)
@@ -666,8 +672,6 @@ CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
AMTAR = @AMTAR@
AR = @AR@
@@ -703,8 +707,6 @@ EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -715,8 +717,10 @@ GMSGFMT = @GMSGFMT@
GNOME_CFLAGS = @GNOME_CFLAGS@
GNOME_LIBS = @GNOME_LIBS@
GOB2 = @GOB2@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -756,11 +760,11 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
OPENSSL_LIBS = @OPENSSL_LIBS@
@@ -786,55 +790,15 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
-WITH_EVOLUTION_FALSE = @WITH_EVOLUTION_FALSE@
-WITH_EVOLUTION_TRUE = @WITH_EVOLUTION_TRUE@
-WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
-WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
-WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
-WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
-WITH_MAILDIR_FALSE = @WITH_MAILDIR_FALSE@
-WITH_MAILDIR_TRUE = @WITH_MAILDIR_TRUE@
-WITH_MBOX_FALSE = @WITH_MBOX_FALSE@
-WITH_MBOX_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
-WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_TRUE@
-WITH_MBOX_TRUE = @WITH_MBOX_TRUE@
-WITH_MH_FALSE = @WITH_MH_FALSE@
-WITH_MH_TRUE = @WITH_MH_TRUE@
-WITH_MIME_FALSE = @WITH_MIME_FALSE@
-WITH_MIME_TRUE = @WITH_MIME_TRUE@
-WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
-WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@
-WITH_POP3_FALSE = @WITH_POP3_FALSE@
-WITH_POP3_OR_IMAP_FALSE = @WITH_POP3_OR_IMAP_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_FALSE = @WITH_POP3_OR_IMAP_OR_GMAIL_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_TRUE = @WITH_POP3_OR_IMAP_OR_GMAIL_TRUE@
-WITH_POP3_OR_IMAP_TRUE = @WITH_POP3_OR_IMAP_TRUE@
-WITH_POP3_TRUE = @WITH_POP3_TRUE@
-WITH_REGRESSION_TESTS_FALSE = @WITH_REGRESSION_TESTS_FALSE@
-WITH_REGRESSION_TESTS_TRUE = @WITH_REGRESSION_TESTS_TRUE@
-WITH_SASL_FALSE = @WITH_SASL_FALSE@
-WITH_SASL_TRUE = @WITH_SASL_TRUE@
-WITH_SSL_FALSE = @WITH_SSL_FALSE@
-WITH_SSL_TRUE = @WITH_SSL_TRUE@
-WITH_SYLPHEED_FALSE = @WITH_SYLPHEED_FALSE@
-WITH_SYLPHEED_TRUE = @WITH_SYLPHEED_TRUE@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -846,35 +810,45 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
evolution_plugindir = @evolution_plugindir@
exec_prefix = @exec_prefix@
-gnome_cappletdir = @gnome_cappletdir@
gnome_prefix = @gnome_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
GOBFLAGS = --always-private-header --no-touch --exit-on-warn
mail_notification_CPPFLAGS = $(WARN_CFLAGS) $(DEBUG_CFLAGS) \
-I$(top_srcdir) -DG_LOG_DOMAIN="\"$(PACKAGE)\"" \
@@ -1014,16 +988,16 @@ nodist_mail_notification_SOURCES = GNOME_MailNotification-common.c \
CLEANFILES = GNOME_MailNotification-common.c \
GNOME_MailNotification-skels.c GNOME_MailNotification-stubs.c \
GNOME_MailNotification.h $(am__append_56) $(evolution_eplug)
-@WITH_EVOLUTION_TRUE@evolution_plugin_LTLIBRARIES = liborg-gnome-mail-notification.la
-@WITH_EVOLUTION_TRUE@liborg_gnome_mail_notification_la_CPPFLAGS = \
+@WITH_EVOLUTION_TRUE@evolution_plugin_LTLIBRARIES = liborg-jylefort-mail-notification.la
+@WITH_EVOLUTION_TRUE@liborg_jylefort_mail_notification_la_CPPFLAGS = \
@WITH_EVOLUTION_TRUE@ $(WARN_CFLAGS) $(DEBUG_CFLAGS) \
@WITH_EVOLUTION_TRUE@ -I$(top_srcdir) \
@WITH_EVOLUTION_TRUE@ -DG_LOG_DOMAIN="\"$(PACKAGE)\"" \
@WITH_EVOLUTION_TRUE@ $(EVOLUTION_PLUGIN_CFLAGS)
-@WITH_EVOLUTION_TRUE@liborg_gnome_mail_notification_la_LDFLAGS = \
+@WITH_EVOLUTION_TRUE@liborg_jylefort_mail_notification_la_LDFLAGS = \
@WITH_EVOLUTION_TRUE@ -avoid-version -module \
@WITH_EVOLUTION_TRUE@ $(EVOLUTION_PLUGIN_LIBS)
-@WITH_EVOLUTION_TRUE@liborg_gnome_mail_notification_la_SOURCES = \
+@WITH_EVOLUTION_TRUE@liborg_jylefort_mail_notification_la_SOURCES = \
@WITH_EVOLUTION_TRUE@ mn-evolution-plugin.c mn-evolution.h \
@WITH_EVOLUTION_TRUE@ mn-evolution-folder-tree-control.gob \
@WITH_EVOLUTION_TRUE@ mn-evolution-folder-tree-control.gob.stamp \
@@ -1035,11 +1009,11 @@ CLEANFILES = GNOME_MailNotification-common.c \
@WITH_EVOLUTION_TRUE@ mn-evolution-glue-private.h \
@WITH_EVOLUTION_TRUE@ mn-evolution-glue.c mn-evolution-glue.h \
@WITH_EVOLUTION_TRUE@ GNOME_MailNotification_Evolution.idl
-@WITH_EVOLUTION_TRUE@nodist_liborg_gnome_mail_notification_la_SOURCES = GNOME_MailNotification_Evolution-common.c GNOME_MailNotification_Evolution-skels.c GNOME_MailNotification_Evolution-stubs.c GNOME_MailNotification_Evolution.h
-@WITH_EVOLUTION_TRUE@evolution_eplug = org-gnome-mail-notification.eplug
+@WITH_EVOLUTION_TRUE@nodist_liborg_jylefort_mail_notification_la_SOURCES = GNOME_MailNotification_Evolution-common.c GNOME_MailNotification_Evolution-skels.c GNOME_MailNotification_Evolution-stubs.c GNOME_MailNotification_Evolution.h
+@WITH_EVOLUTION_TRUE@evolution_eplug = org-jylefort-mail-notification.eplug
@WITH_EVOLUTION_TRUE@evolution_plugin_DATA = $(evolution_eplug)
IDLFLAGS = $(BONOBO_IDLFLAGS)
-EXTRA_DIST = $(evolution_eplug).in
+EXTRA_DIST = automake.xml $(evolution_eplug).in
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1076,7 +1050,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-evolution_pluginLTLIBRARIES: $(evolution_plugin_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(evolution_plugindir)" || $(mkdir_p) "$(DESTDIR)$(evolution_plugindir)"
+ test -z "$(evolution_plugindir)" || $(MKDIR_P) "$(DESTDIR)$(evolution_plugindir)"
@list='$(evolution_plugin_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -1087,7 +1061,7 @@ install-evolution_pluginLTLIBRARIES: $(evolution_plugin_LTLIBRARIES)
uninstall-evolution_pluginLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @set -x; list='$(evolution_plugin_LTLIBRARIES)'; for p in $$list; do \
+ @list='$(evolution_plugin_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(evolution_plugindir)/$$p'"; \
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(evolution_plugindir)/$$p"; \
@@ -1101,11 +1075,11 @@ clean-evolution_pluginLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-liborg-gnome-mail-notification.la: $(liborg_gnome_mail_notification_la_OBJECTS) $(liborg_gnome_mail_notification_la_DEPENDENCIES)
- $(LINK) $(am_liborg_gnome_mail_notification_la_rpath) $(liborg_gnome_mail_notification_la_LDFLAGS) $(liborg_gnome_mail_notification_la_OBJECTS) $(liborg_gnome_mail_notification_la_LIBADD) $(LIBS)
+liborg-jylefort-mail-notification.la: $(liborg_jylefort_mail_notification_la_OBJECTS) $(liborg_jylefort_mail_notification_la_DEPENDENCIES)
+ $(liborg_jylefort_mail_notification_la_LINK) $(am_liborg_jylefort_mail_notification_la_rpath) $(liborg_jylefort_mail_notification_la_OBJECTS) $(liborg_jylefort_mail_notification_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -1133,7 +1107,7 @@ clean-binPROGRAMS:
done
mail-notification$(EXEEXT): $(mail_notification_OBJECTS) $(mail_notification_DEPENDENCIES)
@rm -f mail-notification$(EXEEXT)
- $(LINK) $(mail_notification_LDFLAGS) $(mail_notification_OBJECTS) $(mail_notification_LDADD) $(LIBS)
+ $(mail_notification_LINK) $(mail_notification_OBJECTS) $(mail_notification_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -1141,12 +1115,12 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-skels.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-stubs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-folder-tree-control.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-glue.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-common.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-skels.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-stubs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborg_jylefort_mail_notification_la-mn-evolution-folder-tree-control.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborg_jylefort_mail_notification_la-mn-evolution-glue.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborg_jylefort_mail_notification_la-mn-evolution-plugin.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail_notification-GNOME_MailNotification-common.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Po@am__quote@
@@ -1221,1072 +1195,1072 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-liborg_gnome_mail_notification_la-mn-evolution-plugin.lo: mn-evolution-plugin.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_gnome_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liborg_gnome_mail_notification_la-mn-evolution-plugin.lo -MD -MP -MF "$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-plugin.Tpo" -c -o liborg_gnome_mail_notification_la-mn-evolution-plugin.lo `test -f 'mn-evolution-plugin.c' || echo '$(srcdir)/'`mn-evolution-plugin.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-plugin.Tpo" "$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-plugin.Plo"; else rm -f "$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-plugin.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-plugin.c' object='liborg_gnome_mail_notification_la-mn-evolution-plugin.lo' libtool=yes @AMDEPBACKSLASH@
+liborg_jylefort_mail_notification_la-mn-evolution-plugin.lo: mn-evolution-plugin.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_jylefort_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liborg_jylefort_mail_notification_la-mn-evolution-plugin.lo -MD -MP -MF $(DEPDIR)/liborg_jylefort_mail_notification_la-mn-evolution-plugin.Tpo -c -o liborg_jylefort_mail_notification_la-mn-evolution-plugin.lo `test -f 'mn-evolution-plugin.c' || echo '$(srcdir)/'`mn-evolution-plugin.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborg_jylefort_mail_notification_la-mn-evolution-plugin.Tpo $(DEPDIR)/liborg_jylefort_mail_notification_la-mn-evolution-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-plugin.c' object='liborg_jylefort_mail_notification_la-mn-evolution-plugin.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_gnome_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liborg_gnome_mail_notification_la-mn-evolution-plugin.lo `test -f 'mn-evolution-plugin.c' || echo '$(srcdir)/'`mn-evolution-plugin.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_jylefort_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liborg_jylefort_mail_notification_la-mn-evolution-plugin.lo `test -f 'mn-evolution-plugin.c' || echo '$(srcdir)/'`mn-evolution-plugin.c
-liborg_gnome_mail_notification_la-mn-evolution-folder-tree-control.lo: mn-evolution-folder-tree-control.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_gnome_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liborg_gnome_mail_notification_la-mn-evolution-folder-tree-control.lo -MD -MP -MF "$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-folder-tree-control.Tpo" -c -o liborg_gnome_mail_notification_la-mn-evolution-folder-tree-control.lo `test -f 'mn-evolution-folder-tree-control.c' || echo '$(srcdir)/'`mn-evolution-folder-tree-control.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-folder-tree-control.Tpo" "$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-folder-tree-control.Plo"; else rm -f "$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-folder-tree-control.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-folder-tree-control.c' object='liborg_gnome_mail_notification_la-mn-evolution-folder-tree-control.lo' libtool=yes @AMDEPBACKSLASH@
+liborg_jylefort_mail_notification_la-mn-evolution-folder-tree-control.lo: mn-evolution-folder-tree-control.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_jylefort_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liborg_jylefort_mail_notification_la-mn-evolution-folder-tree-control.lo -MD -MP -MF $(DEPDIR)/liborg_jylefort_mail_notification_la-mn-evolution-folder-tree-control.Tpo -c -o liborg_jylefort_mail_notification_la-mn-evolution-folder-tree-control.lo `test -f 'mn-evolution-folder-tree-control.c' || echo '$(srcdir)/'`mn-evolution-folder-tree-control.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborg_jylefort_mail_notification_la-mn-evolution-folder-tree-control.Tpo $(DEPDIR)/liborg_jylefort_mail_notification_la-mn-evolution-folder-tree-control.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-folder-tree-control.c' object='liborg_jylefort_mail_notification_la-mn-evolution-folder-tree-control.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_gnome_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liborg_gnome_mail_notification_la-mn-evolution-folder-tree-control.lo `test -f 'mn-evolution-folder-tree-control.c' || echo '$(srcdir)/'`mn-evolution-folder-tree-control.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_jylefort_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liborg_jylefort_mail_notification_la-mn-evolution-folder-tree-control.lo `test -f 'mn-evolution-folder-tree-control.c' || echo '$(srcdir)/'`mn-evolution-folder-tree-control.c
-liborg_gnome_mail_notification_la-mn-evolution-glue.lo: mn-evolution-glue.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_gnome_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liborg_gnome_mail_notification_la-mn-evolution-glue.lo -MD -MP -MF "$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-glue.Tpo" -c -o liborg_gnome_mail_notification_la-mn-evolution-glue.lo `test -f 'mn-evolution-glue.c' || echo '$(srcdir)/'`mn-evolution-glue.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-glue.Tpo" "$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-glue.Plo"; else rm -f "$(DEPDIR)/liborg_gnome_mail_notification_la-mn-evolution-glue.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-glue.c' object='liborg_gnome_mail_notification_la-mn-evolution-glue.lo' libtool=yes @AMDEPBACKSLASH@
+liborg_jylefort_mail_notification_la-mn-evolution-glue.lo: mn-evolution-glue.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_jylefort_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liborg_jylefort_mail_notification_la-mn-evolution-glue.lo -MD -MP -MF $(DEPDIR)/liborg_jylefort_mail_notification_la-mn-evolution-glue.Tpo -c -o liborg_jylefort_mail_notification_la-mn-evolution-glue.lo `test -f 'mn-evolution-glue.c' || echo '$(srcdir)/'`mn-evolution-glue.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborg_jylefort_mail_notification_la-mn-evolution-glue.Tpo $(DEPDIR)/liborg_jylefort_mail_notification_la-mn-evolution-glue.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-glue.c' object='liborg_jylefort_mail_notification_la-mn-evolution-glue.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_gnome_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liborg_gnome_mail_notification_la-mn-evolution-glue.lo `test -f 'mn-evolution-glue.c' || echo '$(srcdir)/'`mn-evolution-glue.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_jylefort_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liborg_jylefort_mail_notification_la-mn-evolution-glue.lo `test -f 'mn-evolution-glue.c' || echo '$(srcdir)/'`mn-evolution-glue.c
-liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-common.lo: GNOME_MailNotification_Evolution-common.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_gnome_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-common.lo -MD -MP -MF "$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-common.Tpo" -c -o liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-common.lo `test -f 'GNOME_MailNotification_Evolution-common.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-common.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-common.Tpo" "$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-common.Plo"; else rm -f "$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-common.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification_Evolution-common.c' object='liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-common.lo' libtool=yes @AMDEPBACKSLASH@
+liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-common.lo: GNOME_MailNotification_Evolution-common.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_jylefort_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-common.lo -MD -MP -MF $(DEPDIR)/liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-common.Tpo -c -o liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-common.lo `test -f 'GNOME_MailNotification_Evolution-common.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-common.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-common.Tpo $(DEPDIR)/liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-common.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification_Evolution-common.c' object='liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-common.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_gnome_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-common.lo `test -f 'GNOME_MailNotification_Evolution-common.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-common.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_jylefort_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-common.lo `test -f 'GNOME_MailNotification_Evolution-common.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-common.c
-liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-skels.lo: GNOME_MailNotification_Evolution-skels.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_gnome_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-skels.lo -MD -MP -MF "$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-skels.Tpo" -c -o liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-skels.lo `test -f 'GNOME_MailNotification_Evolution-skels.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-skels.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-skels.Tpo" "$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-skels.Plo"; else rm -f "$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-skels.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification_Evolution-skels.c' object='liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-skels.lo' libtool=yes @AMDEPBACKSLASH@
+liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-skels.lo: GNOME_MailNotification_Evolution-skels.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_jylefort_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-skels.lo -MD -MP -MF $(DEPDIR)/liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-skels.Tpo -c -o liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-skels.lo `test -f 'GNOME_MailNotification_Evolution-skels.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-skels.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-skels.Tpo $(DEPDIR)/liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-skels.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification_Evolution-skels.c' object='liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-skels.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_gnome_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-skels.lo `test -f 'GNOME_MailNotification_Evolution-skels.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-skels.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_jylefort_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-skels.lo `test -f 'GNOME_MailNotification_Evolution-skels.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-skels.c
-liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-stubs.lo: GNOME_MailNotification_Evolution-stubs.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_gnome_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-stubs.lo -MD -MP -MF "$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-stubs.Tpo" -c -o liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-stubs.lo `test -f 'GNOME_MailNotification_Evolution-stubs.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-stubs.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-stubs.Tpo" "$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-stubs.Plo"; else rm -f "$(DEPDIR)/liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-stubs.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification_Evolution-stubs.c' object='liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-stubs.lo' libtool=yes @AMDEPBACKSLASH@
+liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-stubs.lo: GNOME_MailNotification_Evolution-stubs.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_jylefort_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-stubs.lo -MD -MP -MF $(DEPDIR)/liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-stubs.Tpo -c -o liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-stubs.lo `test -f 'GNOME_MailNotification_Evolution-stubs.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-stubs.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-stubs.Tpo $(DEPDIR)/liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-stubs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification_Evolution-stubs.c' object='liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-stubs.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_gnome_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liborg_gnome_mail_notification_la-GNOME_MailNotification_Evolution-stubs.lo `test -f 'GNOME_MailNotification_Evolution-stubs.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-stubs.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liborg_jylefort_mail_notification_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liborg_jylefort_mail_notification_la-GNOME_MailNotification_Evolution-stubs.lo `test -f 'GNOME_MailNotification_Evolution-stubs.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-stubs.c
mail_notification-mn-main.o: mn-main.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-main.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-main.Tpo" -c -o mail_notification-mn-main.o `test -f 'mn-main.c' || echo '$(srcdir)/'`mn-main.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-main.Tpo" "$(DEPDIR)/mail_notification-mn-main.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-main.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-main.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-main.Tpo -c -o mail_notification-mn-main.o `test -f 'mn-main.c' || echo '$(srcdir)/'`mn-main.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-main.Tpo $(DEPDIR)/mail_notification-mn-main.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-main.c' object='mail_notification-mn-main.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-main.o `test -f 'mn-main.c' || echo '$(srcdir)/'`mn-main.c
mail_notification-mn-main.obj: mn-main.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-main.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-main.Tpo" -c -o mail_notification-mn-main.obj `if test -f 'mn-main.c'; then $(CYGPATH_W) 'mn-main.c'; else $(CYGPATH_W) '$(srcdir)/mn-main.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-main.Tpo" "$(DEPDIR)/mail_notification-mn-main.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-main.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-main.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-main.Tpo -c -o mail_notification-mn-main.obj `if test -f 'mn-main.c'; then $(CYGPATH_W) 'mn-main.c'; else $(CYGPATH_W) '$(srcdir)/mn-main.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-main.Tpo $(DEPDIR)/mail_notification-mn-main.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-main.c' object='mail_notification-mn-main.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-main.obj `if test -f 'mn-main.c'; then $(CYGPATH_W) 'mn-main.c'; else $(CYGPATH_W) '$(srcdir)/mn-main.c'; fi`
mail_notification-eggtrayicon.o: eggtrayicon.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-eggtrayicon.o -MD -MP -MF "$(DEPDIR)/mail_notification-eggtrayicon.Tpo" -c -o mail_notification-eggtrayicon.o `test -f 'eggtrayicon.c' || echo '$(srcdir)/'`eggtrayicon.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-eggtrayicon.Tpo" "$(DEPDIR)/mail_notification-eggtrayicon.Po"; else rm -f "$(DEPDIR)/mail_notification-eggtrayicon.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-eggtrayicon.o -MD -MP -MF $(DEPDIR)/mail_notification-eggtrayicon.Tpo -c -o mail_notification-eggtrayicon.o `test -f 'eggtrayicon.c' || echo '$(srcdir)/'`eggtrayicon.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-eggtrayicon.Tpo $(DEPDIR)/mail_notification-eggtrayicon.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eggtrayicon.c' object='mail_notification-eggtrayicon.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-eggtrayicon.o `test -f 'eggtrayicon.c' || echo '$(srcdir)/'`eggtrayicon.c
mail_notification-eggtrayicon.obj: eggtrayicon.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-eggtrayicon.obj -MD -MP -MF "$(DEPDIR)/mail_notification-eggtrayicon.Tpo" -c -o mail_notification-eggtrayicon.obj `if test -f 'eggtrayicon.c'; then $(CYGPATH_W) 'eggtrayicon.c'; else $(CYGPATH_W) '$(srcdir)/eggtrayicon.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-eggtrayicon.Tpo" "$(DEPDIR)/mail_notification-eggtrayicon.Po"; else rm -f "$(DEPDIR)/mail_notification-eggtrayicon.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-eggtrayicon.obj -MD -MP -MF $(DEPDIR)/mail_notification-eggtrayicon.Tpo -c -o mail_notification-eggtrayicon.obj `if test -f 'eggtrayicon.c'; then $(CYGPATH_W) 'eggtrayicon.c'; else $(CYGPATH_W) '$(srcdir)/eggtrayicon.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-eggtrayicon.Tpo $(DEPDIR)/mail_notification-eggtrayicon.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eggtrayicon.c' object='mail_notification-eggtrayicon.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-eggtrayicon.obj `if test -f 'eggtrayicon.c'; then $(CYGPATH_W) 'eggtrayicon.c'; else $(CYGPATH_W) '$(srcdir)/eggtrayicon.c'; fi`
mail_notification-mn-conf.o: mn-conf.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-conf.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-conf.Tpo" -c -o mail_notification-mn-conf.o `test -f 'mn-conf.c' || echo '$(srcdir)/'`mn-conf.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-conf.Tpo" "$(DEPDIR)/mail_notification-mn-conf.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-conf.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-conf.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-conf.Tpo -c -o mail_notification-mn-conf.o `test -f 'mn-conf.c' || echo '$(srcdir)/'`mn-conf.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-conf.Tpo $(DEPDIR)/mail_notification-mn-conf.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-conf.c' object='mail_notification-mn-conf.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-conf.o `test -f 'mn-conf.c' || echo '$(srcdir)/'`mn-conf.c
mail_notification-mn-conf.obj: mn-conf.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-conf.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-conf.Tpo" -c -o mail_notification-mn-conf.obj `if test -f 'mn-conf.c'; then $(CYGPATH_W) 'mn-conf.c'; else $(CYGPATH_W) '$(srcdir)/mn-conf.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-conf.Tpo" "$(DEPDIR)/mail_notification-mn-conf.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-conf.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-conf.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-conf.Tpo -c -o mail_notification-mn-conf.obj `if test -f 'mn-conf.c'; then $(CYGPATH_W) 'mn-conf.c'; else $(CYGPATH_W) '$(srcdir)/mn-conf.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-conf.Tpo $(DEPDIR)/mail_notification-mn-conf.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-conf.c' object='mail_notification-mn-conf.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-conf.obj `if test -f 'mn-conf.c'; then $(CYGPATH_W) 'mn-conf.c'; else $(CYGPATH_W) '$(srcdir)/mn-conf.c'; fi`
mail_notification-mn-locked-callback.o: mn-locked-callback.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-locked-callback.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-locked-callback.Tpo" -c -o mail_notification-mn-locked-callback.o `test -f 'mn-locked-callback.c' || echo '$(srcdir)/'`mn-locked-callback.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-locked-callback.Tpo" "$(DEPDIR)/mail_notification-mn-locked-callback.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-locked-callback.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-locked-callback.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-locked-callback.Tpo -c -o mail_notification-mn-locked-callback.o `test -f 'mn-locked-callback.c' || echo '$(srcdir)/'`mn-locked-callback.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-locked-callback.Tpo $(DEPDIR)/mail_notification-mn-locked-callback.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-locked-callback.c' object='mail_notification-mn-locked-callback.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-locked-callback.o `test -f 'mn-locked-callback.c' || echo '$(srcdir)/'`mn-locked-callback.c
mail_notification-mn-locked-callback.obj: mn-locked-callback.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-locked-callback.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-locked-callback.Tpo" -c -o mail_notification-mn-locked-callback.obj `if test -f 'mn-locked-callback.c'; then $(CYGPATH_W) 'mn-locked-callback.c'; else $(CYGPATH_W) '$(srcdir)/mn-locked-callback.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-locked-callback.Tpo" "$(DEPDIR)/mail_notification-mn-locked-callback.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-locked-callback.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-locked-callback.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-locked-callback.Tpo -c -o mail_notification-mn-locked-callback.obj `if test -f 'mn-locked-callback.c'; then $(CYGPATH_W) 'mn-locked-callback.c'; else $(CYGPATH_W) '$(srcdir)/mn-locked-callback.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-locked-callback.Tpo $(DEPDIR)/mail_notification-mn-locked-callback.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-locked-callback.c' object='mail_notification-mn-locked-callback.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-locked-callback.obj `if test -f 'mn-locked-callback.c'; then $(CYGPATH_W) 'mn-locked-callback.c'; else $(CYGPATH_W) '$(srcdir)/mn-locked-callback.c'; fi`
mail_notification-mn-stock.o: mn-stock.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-stock.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-stock.Tpo" -c -o mail_notification-mn-stock.o `test -f 'mn-stock.c' || echo '$(srcdir)/'`mn-stock.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-stock.Tpo" "$(DEPDIR)/mail_notification-mn-stock.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-stock.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-stock.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-stock.Tpo -c -o mail_notification-mn-stock.o `test -f 'mn-stock.c' || echo '$(srcdir)/'`mn-stock.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-stock.Tpo $(DEPDIR)/mail_notification-mn-stock.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-stock.c' object='mail_notification-mn-stock.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-stock.o `test -f 'mn-stock.c' || echo '$(srcdir)/'`mn-stock.c
mail_notification-mn-stock.obj: mn-stock.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-stock.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-stock.Tpo" -c -o mail_notification-mn-stock.obj `if test -f 'mn-stock.c'; then $(CYGPATH_W) 'mn-stock.c'; else $(CYGPATH_W) '$(srcdir)/mn-stock.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-stock.Tpo" "$(DEPDIR)/mail_notification-mn-stock.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-stock.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-stock.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-stock.Tpo -c -o mail_notification-mn-stock.obj `if test -f 'mn-stock.c'; then $(CYGPATH_W) 'mn-stock.c'; else $(CYGPATH_W) '$(srcdir)/mn-stock.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-stock.Tpo $(DEPDIR)/mail_notification-mn-stock.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-stock.c' object='mail_notification-mn-stock.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-stock.obj `if test -f 'mn-stock.c'; then $(CYGPATH_W) 'mn-stock.c'; else $(CYGPATH_W) '$(srcdir)/mn-stock.c'; fi`
mail_notification-mn-util.o: mn-util.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-util.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-util.Tpo" -c -o mail_notification-mn-util.o `test -f 'mn-util.c' || echo '$(srcdir)/'`mn-util.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-util.Tpo" "$(DEPDIR)/mail_notification-mn-util.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-util.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-util.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-util.Tpo -c -o mail_notification-mn-util.o `test -f 'mn-util.c' || echo '$(srcdir)/'`mn-util.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-util.Tpo $(DEPDIR)/mail_notification-mn-util.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-util.c' object='mail_notification-mn-util.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-util.o `test -f 'mn-util.c' || echo '$(srcdir)/'`mn-util.c
mail_notification-mn-util.obj: mn-util.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-util.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-util.Tpo" -c -o mail_notification-mn-util.obj `if test -f 'mn-util.c'; then $(CYGPATH_W) 'mn-util.c'; else $(CYGPATH_W) '$(srcdir)/mn-util.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-util.Tpo" "$(DEPDIR)/mail_notification-mn-util.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-util.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-util.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-util.Tpo -c -o mail_notification-mn-util.obj `if test -f 'mn-util.c'; then $(CYGPATH_W) 'mn-util.c'; else $(CYGPATH_W) '$(srcdir)/mn-util.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-util.Tpo $(DEPDIR)/mail_notification-mn-util.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-util.c' object='mail_notification-mn-util.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-util.obj `if test -f 'mn-util.c'; then $(CYGPATH_W) 'mn-util.c'; else $(CYGPATH_W) '$(srcdir)/mn-util.c'; fi`
mail_notification-mn-vfs.o: mn-vfs.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-vfs.Tpo" -c -o mail_notification-mn-vfs.o `test -f 'mn-vfs.c' || echo '$(srcdir)/'`mn-vfs.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-vfs.Tpo" "$(DEPDIR)/mail_notification-mn-vfs.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-vfs.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-vfs.Tpo -c -o mail_notification-mn-vfs.o `test -f 'mn-vfs.c' || echo '$(srcdir)/'`mn-vfs.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-vfs.Tpo $(DEPDIR)/mail_notification-mn-vfs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-vfs.c' object='mail_notification-mn-vfs.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-vfs.o `test -f 'mn-vfs.c' || echo '$(srcdir)/'`mn-vfs.c
mail_notification-mn-vfs.obj: mn-vfs.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-vfs.Tpo" -c -o mail_notification-mn-vfs.obj `if test -f 'mn-vfs.c'; then $(CYGPATH_W) 'mn-vfs.c'; else $(CYGPATH_W) '$(srcdir)/mn-vfs.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-vfs.Tpo" "$(DEPDIR)/mail_notification-mn-vfs.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-vfs.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-vfs.Tpo -c -o mail_notification-mn-vfs.obj `if test -f 'mn-vfs.c'; then $(CYGPATH_W) 'mn-vfs.c'; else $(CYGPATH_W) '$(srcdir)/mn-vfs.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-vfs.Tpo $(DEPDIR)/mail_notification-mn-vfs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-vfs.c' object='mail_notification-mn-vfs.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-vfs.obj `if test -f 'mn-vfs.c'; then $(CYGPATH_W) 'mn-vfs.c'; else $(CYGPATH_W) '$(srcdir)/mn-vfs.c'; fi`
mail_notification-mn-xml.o: mn-xml.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-xml.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-xml.Tpo" -c -o mail_notification-mn-xml.o `test -f 'mn-xml.c' || echo '$(srcdir)/'`mn-xml.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-xml.Tpo" "$(DEPDIR)/mail_notification-mn-xml.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-xml.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-xml.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-xml.Tpo -c -o mail_notification-mn-xml.o `test -f 'mn-xml.c' || echo '$(srcdir)/'`mn-xml.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-xml.Tpo $(DEPDIR)/mail_notification-mn-xml.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-xml.c' object='mail_notification-mn-xml.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-xml.o `test -f 'mn-xml.c' || echo '$(srcdir)/'`mn-xml.c
mail_notification-mn-xml.obj: mn-xml.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-xml.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-xml.Tpo" -c -o mail_notification-mn-xml.obj `if test -f 'mn-xml.c'; then $(CYGPATH_W) 'mn-xml.c'; else $(CYGPATH_W) '$(srcdir)/mn-xml.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-xml.Tpo" "$(DEPDIR)/mail_notification-mn-xml.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-xml.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-xml.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-xml.Tpo -c -o mail_notification-mn-xml.obj `if test -f 'mn-xml.c'; then $(CYGPATH_W) 'mn-xml.c'; else $(CYGPATH_W) '$(srcdir)/mn-xml.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-xml.Tpo $(DEPDIR)/mail_notification-mn-xml.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-xml.c' object='mail_notification-mn-xml.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-xml.obj `if test -f 'mn-xml.c'; then $(CYGPATH_W) 'mn-xml.c'; else $(CYGPATH_W) '$(srcdir)/mn-xml.c'; fi`
mail_notification-nautilus-cell-renderer-pixbuf-emblem.o: nautilus-cell-renderer-pixbuf-emblem.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-nautilus-cell-renderer-pixbuf-emblem.o -MD -MP -MF "$(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Tpo" -c -o mail_notification-nautilus-cell-renderer-pixbuf-emblem.o `test -f 'nautilus-cell-renderer-pixbuf-emblem.c' || echo '$(srcdir)/'`nautilus-cell-renderer-pixbuf-emblem.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Tpo" "$(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Po"; else rm -f "$(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-nautilus-cell-renderer-pixbuf-emblem.o -MD -MP -MF $(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Tpo -c -o mail_notification-nautilus-cell-renderer-pixbuf-emblem.o `test -f 'nautilus-cell-renderer-pixbuf-emblem.c' || echo '$(srcdir)/'`nautilus-cell-renderer-pixbuf-emblem.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Tpo $(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='nautilus-cell-renderer-pixbuf-emblem.c' object='mail_notification-nautilus-cell-renderer-pixbuf-emblem.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-nautilus-cell-renderer-pixbuf-emblem.o `test -f 'nautilus-cell-renderer-pixbuf-emblem.c' || echo '$(srcdir)/'`nautilus-cell-renderer-pixbuf-emblem.c
mail_notification-nautilus-cell-renderer-pixbuf-emblem.obj: nautilus-cell-renderer-pixbuf-emblem.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-nautilus-cell-renderer-pixbuf-emblem.obj -MD -MP -MF "$(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Tpo" -c -o mail_notification-nautilus-cell-renderer-pixbuf-emblem.obj `if test -f 'nautilus-cell-renderer-pixbuf-emblem.c'; then $(CYGPATH_W) 'nautilus-cell-renderer-pixbuf-emblem.c'; else $(CYGPATH_W) '$(srcdir)/nautilus-cell-renderer-pixbuf-emblem.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Tpo" "$(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Po"; else rm -f "$(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-nautilus-cell-renderer-pixbuf-emblem.obj -MD -MP -MF $(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Tpo -c -o mail_notification-nautilus-cell-renderer-pixbuf-emblem.obj `if test -f 'nautilus-cell-renderer-pixbuf-emblem.c'; then $(CYGPATH_W) 'nautilus-cell-renderer-pixbuf-emblem.c'; else $(CYGPATH_W) '$(srcdir)/nautilus-cell-renderer-pixbuf-emblem.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Tpo $(DEPDIR)/mail_notification-nautilus-cell-renderer-pixbuf-emblem.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='nautilus-cell-renderer-pixbuf-emblem.c' object='mail_notification-nautilus-cell-renderer-pixbuf-emblem.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-nautilus-cell-renderer-pixbuf-emblem.obj `if test -f 'nautilus-cell-renderer-pixbuf-emblem.c'; then $(CYGPATH_W) 'nautilus-cell-renderer-pixbuf-emblem.c'; else $(CYGPATH_W) '$(srcdir)/nautilus-cell-renderer-pixbuf-emblem.c'; fi`
mail_notification-mn-about-dialog.o: mn-about-dialog.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-about-dialog.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-about-dialog.Tpo" -c -o mail_notification-mn-about-dialog.o `test -f 'mn-about-dialog.c' || echo '$(srcdir)/'`mn-about-dialog.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-about-dialog.Tpo" "$(DEPDIR)/mail_notification-mn-about-dialog.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-about-dialog.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-about-dialog.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-about-dialog.Tpo -c -o mail_notification-mn-about-dialog.o `test -f 'mn-about-dialog.c' || echo '$(srcdir)/'`mn-about-dialog.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-about-dialog.Tpo $(DEPDIR)/mail_notification-mn-about-dialog.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-about-dialog.c' object='mail_notification-mn-about-dialog.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-about-dialog.o `test -f 'mn-about-dialog.c' || echo '$(srcdir)/'`mn-about-dialog.c
mail_notification-mn-about-dialog.obj: mn-about-dialog.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-about-dialog.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-about-dialog.Tpo" -c -o mail_notification-mn-about-dialog.obj `if test -f 'mn-about-dialog.c'; then $(CYGPATH_W) 'mn-about-dialog.c'; else $(CYGPATH_W) '$(srcdir)/mn-about-dialog.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-about-dialog.Tpo" "$(DEPDIR)/mail_notification-mn-about-dialog.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-about-dialog.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-about-dialog.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-about-dialog.Tpo -c -o mail_notification-mn-about-dialog.obj `if test -f 'mn-about-dialog.c'; then $(CYGPATH_W) 'mn-about-dialog.c'; else $(CYGPATH_W) '$(srcdir)/mn-about-dialog.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-about-dialog.Tpo $(DEPDIR)/mail_notification-mn-about-dialog.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-about-dialog.c' object='mail_notification-mn-about-dialog.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-about-dialog.obj `if test -f 'mn-about-dialog.c'; then $(CYGPATH_W) 'mn-about-dialog.c'; else $(CYGPATH_W) '$(srcdir)/mn-about-dialog.c'; fi`
mail_notification-mn-autodetect-mailbox-properties.o: mn-autodetect-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-autodetect-mailbox-properties.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Tpo" -c -o mail_notification-mn-autodetect-mailbox-properties.o `test -f 'mn-autodetect-mailbox-properties.c' || echo '$(srcdir)/'`mn-autodetect-mailbox-properties.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-autodetect-mailbox-properties.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Tpo -c -o mail_notification-mn-autodetect-mailbox-properties.o `test -f 'mn-autodetect-mailbox-properties.c' || echo '$(srcdir)/'`mn-autodetect-mailbox-properties.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-autodetect-mailbox-properties.c' object='mail_notification-mn-autodetect-mailbox-properties.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-autodetect-mailbox-properties.o `test -f 'mn-autodetect-mailbox-properties.c' || echo '$(srcdir)/'`mn-autodetect-mailbox-properties.c
mail_notification-mn-autodetect-mailbox-properties.obj: mn-autodetect-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-autodetect-mailbox-properties.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Tpo" -c -o mail_notification-mn-autodetect-mailbox-properties.obj `if test -f 'mn-autodetect-mailbox-properties.c'; then $(CYGPATH_W) 'mn-autodetect-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-autodetect-mailbox-properties.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-autodetect-mailbox-properties.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Tpo -c -o mail_notification-mn-autodetect-mailbox-properties.obj `if test -f 'mn-autodetect-mailbox-properties.c'; then $(CYGPATH_W) 'mn-autodetect-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-autodetect-mailbox-properties.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-autodetect-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-autodetect-mailbox-properties.c' object='mail_notification-mn-autodetect-mailbox-properties.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-autodetect-mailbox-properties.obj `if test -f 'mn-autodetect-mailbox-properties.c'; then $(CYGPATH_W) 'mn-autodetect-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-autodetect-mailbox-properties.c'; fi`
mail_notification-mn-automation.o: mn-automation.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-automation.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-automation.Tpo" -c -o mail_notification-mn-automation.o `test -f 'mn-automation.c' || echo '$(srcdir)/'`mn-automation.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-automation.Tpo" "$(DEPDIR)/mail_notification-mn-automation.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-automation.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-automation.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-automation.Tpo -c -o mail_notification-mn-automation.o `test -f 'mn-automation.c' || echo '$(srcdir)/'`mn-automation.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-automation.Tpo $(DEPDIR)/mail_notification-mn-automation.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-automation.c' object='mail_notification-mn-automation.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-automation.o `test -f 'mn-automation.c' || echo '$(srcdir)/'`mn-automation.c
mail_notification-mn-automation.obj: mn-automation.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-automation.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-automation.Tpo" -c -o mail_notification-mn-automation.obj `if test -f 'mn-automation.c'; then $(CYGPATH_W) 'mn-automation.c'; else $(CYGPATH_W) '$(srcdir)/mn-automation.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-automation.Tpo" "$(DEPDIR)/mail_notification-mn-automation.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-automation.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-automation.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-automation.Tpo -c -o mail_notification-mn-automation.obj `if test -f 'mn-automation.c'; then $(CYGPATH_W) 'mn-automation.c'; else $(CYGPATH_W) '$(srcdir)/mn-automation.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-automation.Tpo $(DEPDIR)/mail_notification-mn-automation.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-automation.c' object='mail_notification-mn-automation.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-automation.obj `if test -f 'mn-automation.c'; then $(CYGPATH_W) 'mn-automation.c'; else $(CYGPATH_W) '$(srcdir)/mn-automation.c'; fi`
mail_notification-mn-blinking-image.o: mn-blinking-image.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-blinking-image.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-blinking-image.Tpo" -c -o mail_notification-mn-blinking-image.o `test -f 'mn-blinking-image.c' || echo '$(srcdir)/'`mn-blinking-image.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-blinking-image.Tpo" "$(DEPDIR)/mail_notification-mn-blinking-image.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-blinking-image.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-blinking-image.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-blinking-image.Tpo -c -o mail_notification-mn-blinking-image.o `test -f 'mn-blinking-image.c' || echo '$(srcdir)/'`mn-blinking-image.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-blinking-image.Tpo $(DEPDIR)/mail_notification-mn-blinking-image.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-blinking-image.c' object='mail_notification-mn-blinking-image.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-blinking-image.o `test -f 'mn-blinking-image.c' || echo '$(srcdir)/'`mn-blinking-image.c
mail_notification-mn-blinking-image.obj: mn-blinking-image.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-blinking-image.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-blinking-image.Tpo" -c -o mail_notification-mn-blinking-image.obj `if test -f 'mn-blinking-image.c'; then $(CYGPATH_W) 'mn-blinking-image.c'; else $(CYGPATH_W) '$(srcdir)/mn-blinking-image.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-blinking-image.Tpo" "$(DEPDIR)/mail_notification-mn-blinking-image.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-blinking-image.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-blinking-image.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-blinking-image.Tpo -c -o mail_notification-mn-blinking-image.obj `if test -f 'mn-blinking-image.c'; then $(CYGPATH_W) 'mn-blinking-image.c'; else $(CYGPATH_W) '$(srcdir)/mn-blinking-image.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-blinking-image.Tpo $(DEPDIR)/mail_notification-mn-blinking-image.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-blinking-image.c' object='mail_notification-mn-blinking-image.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-blinking-image.obj `if test -f 'mn-blinking-image.c'; then $(CYGPATH_W) 'mn-blinking-image.c'; else $(CYGPATH_W) '$(srcdir)/mn-blinking-image.c'; fi`
mail_notification-mn-compact-message-view.o: mn-compact-message-view.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-compact-message-view.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-compact-message-view.Tpo" -c -o mail_notification-mn-compact-message-view.o `test -f 'mn-compact-message-view.c' || echo '$(srcdir)/'`mn-compact-message-view.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-compact-message-view.Tpo" "$(DEPDIR)/mail_notification-mn-compact-message-view.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-compact-message-view.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-compact-message-view.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-compact-message-view.Tpo -c -o mail_notification-mn-compact-message-view.o `test -f 'mn-compact-message-view.c' || echo '$(srcdir)/'`mn-compact-message-view.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-compact-message-view.Tpo $(DEPDIR)/mail_notification-mn-compact-message-view.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-compact-message-view.c' object='mail_notification-mn-compact-message-view.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-compact-message-view.o `test -f 'mn-compact-message-view.c' || echo '$(srcdir)/'`mn-compact-message-view.c
mail_notification-mn-compact-message-view.obj: mn-compact-message-view.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-compact-message-view.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-compact-message-view.Tpo" -c -o mail_notification-mn-compact-message-view.obj `if test -f 'mn-compact-message-view.c'; then $(CYGPATH_W) 'mn-compact-message-view.c'; else $(CYGPATH_W) '$(srcdir)/mn-compact-message-view.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-compact-message-view.Tpo" "$(DEPDIR)/mail_notification-mn-compact-message-view.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-compact-message-view.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-compact-message-view.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-compact-message-view.Tpo -c -o mail_notification-mn-compact-message-view.obj `if test -f 'mn-compact-message-view.c'; then $(CYGPATH_W) 'mn-compact-message-view.c'; else $(CYGPATH_W) '$(srcdir)/mn-compact-message-view.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-compact-message-view.Tpo $(DEPDIR)/mail_notification-mn-compact-message-view.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-compact-message-view.c' object='mail_notification-mn-compact-message-view.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-compact-message-view.obj `if test -f 'mn-compact-message-view.c'; then $(CYGPATH_W) 'mn-compact-message-view.c'; else $(CYGPATH_W) '$(srcdir)/mn-compact-message-view.c'; fi`
mail_notification-mn-dialog.o: mn-dialog.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-dialog.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-dialog.Tpo" -c -o mail_notification-mn-dialog.o `test -f 'mn-dialog.c' || echo '$(srcdir)/'`mn-dialog.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-dialog.Tpo" "$(DEPDIR)/mail_notification-mn-dialog.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-dialog.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-dialog.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-dialog.Tpo -c -o mail_notification-mn-dialog.o `test -f 'mn-dialog.c' || echo '$(srcdir)/'`mn-dialog.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-dialog.Tpo $(DEPDIR)/mail_notification-mn-dialog.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-dialog.c' object='mail_notification-mn-dialog.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-dialog.o `test -f 'mn-dialog.c' || echo '$(srcdir)/'`mn-dialog.c
mail_notification-mn-dialog.obj: mn-dialog.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-dialog.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-dialog.Tpo" -c -o mail_notification-mn-dialog.obj `if test -f 'mn-dialog.c'; then $(CYGPATH_W) 'mn-dialog.c'; else $(CYGPATH_W) '$(srcdir)/mn-dialog.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-dialog.Tpo" "$(DEPDIR)/mail_notification-mn-dialog.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-dialog.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-dialog.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-dialog.Tpo -c -o mail_notification-mn-dialog.obj `if test -f 'mn-dialog.c'; then $(CYGPATH_W) 'mn-dialog.c'; else $(CYGPATH_W) '$(srcdir)/mn-dialog.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-dialog.Tpo $(DEPDIR)/mail_notification-mn-dialog.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-dialog.c' object='mail_notification-mn-dialog.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-dialog.obj `if test -f 'mn-dialog.c'; then $(CYGPATH_W) 'mn-dialog.c'; else $(CYGPATH_W) '$(srcdir)/mn-dialog.c'; fi`
mail_notification-mn-mail-icon.o: mn-mail-icon.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mail-icon.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mail-icon.Tpo" -c -o mail_notification-mn-mail-icon.o `test -f 'mn-mail-icon.c' || echo '$(srcdir)/'`mn-mail-icon.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mail-icon.Tpo" "$(DEPDIR)/mail_notification-mn-mail-icon.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mail-icon.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mail-icon.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-mail-icon.Tpo -c -o mail_notification-mn-mail-icon.o `test -f 'mn-mail-icon.c' || echo '$(srcdir)/'`mn-mail-icon.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mail-icon.Tpo $(DEPDIR)/mail_notification-mn-mail-icon.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mail-icon.c' object='mail_notification-mn-mail-icon.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mail-icon.o `test -f 'mn-mail-icon.c' || echo '$(srcdir)/'`mn-mail-icon.c
mail_notification-mn-mail-icon.obj: mn-mail-icon.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mail-icon.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mail-icon.Tpo" -c -o mail_notification-mn-mail-icon.obj `if test -f 'mn-mail-icon.c'; then $(CYGPATH_W) 'mn-mail-icon.c'; else $(CYGPATH_W) '$(srcdir)/mn-mail-icon.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mail-icon.Tpo" "$(DEPDIR)/mail_notification-mn-mail-icon.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mail-icon.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mail-icon.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-mail-icon.Tpo -c -o mail_notification-mn-mail-icon.obj `if test -f 'mn-mail-icon.c'; then $(CYGPATH_W) 'mn-mail-icon.c'; else $(CYGPATH_W) '$(srcdir)/mn-mail-icon.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mail-icon.Tpo $(DEPDIR)/mail_notification-mn-mail-icon.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mail-icon.c' object='mail_notification-mn-mail-icon.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mail-icon.obj `if test -f 'mn-mail-icon.c'; then $(CYGPATH_W) 'mn-mail-icon.c'; else $(CYGPATH_W) '$(srcdir)/mn-mail-icon.c'; fi`
mail_notification-mn-mailbox.o: mn-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mailbox.Tpo" -c -o mail_notification-mn-mailbox.o `test -f 'mn-mailbox.c' || echo '$(srcdir)/'`mn-mailbox.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-mailbox.Tpo -c -o mail_notification-mn-mailbox.o `test -f 'mn-mailbox.c' || echo '$(srcdir)/'`mn-mailbox.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mailbox.Tpo $(DEPDIR)/mail_notification-mn-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mailbox.c' object='mail_notification-mn-mailbox.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mailbox.o `test -f 'mn-mailbox.c' || echo '$(srcdir)/'`mn-mailbox.c
mail_notification-mn-mailbox.obj: mn-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mailbox.Tpo" -c -o mail_notification-mn-mailbox.obj `if test -f 'mn-mailbox.c'; then $(CYGPATH_W) 'mn-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailbox.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-mailbox.Tpo -c -o mail_notification-mn-mailbox.obj `if test -f 'mn-mailbox.c'; then $(CYGPATH_W) 'mn-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailbox.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mailbox.Tpo $(DEPDIR)/mail_notification-mn-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mailbox.c' object='mail_notification-mn-mailbox.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mailbox.obj `if test -f 'mn-mailbox.c'; then $(CYGPATH_W) 'mn-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailbox.c'; fi`
mail_notification-mn-mailbox-properties.o: mn-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox-properties.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mailbox-properties.Tpo" -c -o mail_notification-mn-mailbox-properties.o `test -f 'mn-mailbox-properties.c' || echo '$(srcdir)/'`mn-mailbox-properties.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox-properties.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-mailbox-properties.Tpo -c -o mail_notification-mn-mailbox-properties.o `test -f 'mn-mailbox-properties.c' || echo '$(srcdir)/'`mn-mailbox-properties.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mailbox-properties.c' object='mail_notification-mn-mailbox-properties.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mailbox-properties.o `test -f 'mn-mailbox-properties.c' || echo '$(srcdir)/'`mn-mailbox-properties.c
mail_notification-mn-mailbox-properties.obj: mn-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox-properties.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mailbox-properties.Tpo" -c -o mail_notification-mn-mailbox-properties.obj `if test -f 'mn-mailbox-properties.c'; then $(CYGPATH_W) 'mn-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailbox-properties.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox-properties.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-mailbox-properties.Tpo -c -o mail_notification-mn-mailbox-properties.obj `if test -f 'mn-mailbox-properties.c'; then $(CYGPATH_W) 'mn-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailbox-properties.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mailbox-properties.c' object='mail_notification-mn-mailbox-properties.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mailbox-properties.obj `if test -f 'mn-mailbox-properties.c'; then $(CYGPATH_W) 'mn-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailbox-properties.c'; fi`
mail_notification-mn-mailbox-properties-dialog.o: mn-mailbox-properties-dialog.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox-properties-dialog.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Tpo" -c -o mail_notification-mn-mailbox-properties-dialog.o `test -f 'mn-mailbox-properties-dialog.c' || echo '$(srcdir)/'`mn-mailbox-properties-dialog.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Tpo" "$(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox-properties-dialog.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Tpo -c -o mail_notification-mn-mailbox-properties-dialog.o `test -f 'mn-mailbox-properties-dialog.c' || echo '$(srcdir)/'`mn-mailbox-properties-dialog.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Tpo $(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mailbox-properties-dialog.c' object='mail_notification-mn-mailbox-properties-dialog.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mailbox-properties-dialog.o `test -f 'mn-mailbox-properties-dialog.c' || echo '$(srcdir)/'`mn-mailbox-properties-dialog.c
mail_notification-mn-mailbox-properties-dialog.obj: mn-mailbox-properties-dialog.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox-properties-dialog.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Tpo" -c -o mail_notification-mn-mailbox-properties-dialog.obj `if test -f 'mn-mailbox-properties-dialog.c'; then $(CYGPATH_W) 'mn-mailbox-properties-dialog.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailbox-properties-dialog.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Tpo" "$(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox-properties-dialog.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Tpo -c -o mail_notification-mn-mailbox-properties-dialog.obj `if test -f 'mn-mailbox-properties-dialog.c'; then $(CYGPATH_W) 'mn-mailbox-properties-dialog.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailbox-properties-dialog.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Tpo $(DEPDIR)/mail_notification-mn-mailbox-properties-dialog.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mailbox-properties-dialog.c' object='mail_notification-mn-mailbox-properties-dialog.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mailbox-properties-dialog.obj `if test -f 'mn-mailbox-properties-dialog.c'; then $(CYGPATH_W) 'mn-mailbox-properties-dialog.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailbox-properties-dialog.c'; fi`
mail_notification-mn-mailbox-view.o: mn-mailbox-view.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox-view.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mailbox-view.Tpo" -c -o mail_notification-mn-mailbox-view.o `test -f 'mn-mailbox-view.c' || echo '$(srcdir)/'`mn-mailbox-view.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mailbox-view.Tpo" "$(DEPDIR)/mail_notification-mn-mailbox-view.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mailbox-view.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox-view.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-mailbox-view.Tpo -c -o mail_notification-mn-mailbox-view.o `test -f 'mn-mailbox-view.c' || echo '$(srcdir)/'`mn-mailbox-view.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mailbox-view.Tpo $(DEPDIR)/mail_notification-mn-mailbox-view.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mailbox-view.c' object='mail_notification-mn-mailbox-view.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mailbox-view.o `test -f 'mn-mailbox-view.c' || echo '$(srcdir)/'`mn-mailbox-view.c
mail_notification-mn-mailbox-view.obj: mn-mailbox-view.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox-view.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mailbox-view.Tpo" -c -o mail_notification-mn-mailbox-view.obj `if test -f 'mn-mailbox-view.c'; then $(CYGPATH_W) 'mn-mailbox-view.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailbox-view.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mailbox-view.Tpo" "$(DEPDIR)/mail_notification-mn-mailbox-view.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mailbox-view.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailbox-view.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-mailbox-view.Tpo -c -o mail_notification-mn-mailbox-view.obj `if test -f 'mn-mailbox-view.c'; then $(CYGPATH_W) 'mn-mailbox-view.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailbox-view.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mailbox-view.Tpo $(DEPDIR)/mail_notification-mn-mailbox-view.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mailbox-view.c' object='mail_notification-mn-mailbox-view.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mailbox-view.obj `if test -f 'mn-mailbox-view.c'; then $(CYGPATH_W) 'mn-mailbox-view.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailbox-view.c'; fi`
mail_notification-mn-mailboxes.o: mn-mailboxes.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailboxes.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mailboxes.Tpo" -c -o mail_notification-mn-mailboxes.o `test -f 'mn-mailboxes.c' || echo '$(srcdir)/'`mn-mailboxes.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mailboxes.Tpo" "$(DEPDIR)/mail_notification-mn-mailboxes.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mailboxes.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailboxes.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-mailboxes.Tpo -c -o mail_notification-mn-mailboxes.o `test -f 'mn-mailboxes.c' || echo '$(srcdir)/'`mn-mailboxes.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mailboxes.Tpo $(DEPDIR)/mail_notification-mn-mailboxes.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mailboxes.c' object='mail_notification-mn-mailboxes.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mailboxes.o `test -f 'mn-mailboxes.c' || echo '$(srcdir)/'`mn-mailboxes.c
mail_notification-mn-mailboxes.obj: mn-mailboxes.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailboxes.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mailboxes.Tpo" -c -o mail_notification-mn-mailboxes.obj `if test -f 'mn-mailboxes.c'; then $(CYGPATH_W) 'mn-mailboxes.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailboxes.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mailboxes.Tpo" "$(DEPDIR)/mail_notification-mn-mailboxes.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mailboxes.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mailboxes.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-mailboxes.Tpo -c -o mail_notification-mn-mailboxes.obj `if test -f 'mn-mailboxes.c'; then $(CYGPATH_W) 'mn-mailboxes.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailboxes.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mailboxes.Tpo $(DEPDIR)/mail_notification-mn-mailboxes.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mailboxes.c' object='mail_notification-mn-mailboxes.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mailboxes.obj `if test -f 'mn-mailboxes.c'; then $(CYGPATH_W) 'mn-mailboxes.c'; else $(CYGPATH_W) '$(srcdir)/mn-mailboxes.c'; fi`
mail_notification-mn-message.o: mn-message.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-message.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-message.Tpo" -c -o mail_notification-mn-message.o `test -f 'mn-message.c' || echo '$(srcdir)/'`mn-message.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-message.Tpo" "$(DEPDIR)/mail_notification-mn-message.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-message.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-message.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-message.Tpo -c -o mail_notification-mn-message.o `test -f 'mn-message.c' || echo '$(srcdir)/'`mn-message.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-message.Tpo $(DEPDIR)/mail_notification-mn-message.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-message.c' object='mail_notification-mn-message.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-message.o `test -f 'mn-message.c' || echo '$(srcdir)/'`mn-message.c
mail_notification-mn-message.obj: mn-message.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-message.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-message.Tpo" -c -o mail_notification-mn-message.obj `if test -f 'mn-message.c'; then $(CYGPATH_W) 'mn-message.c'; else $(CYGPATH_W) '$(srcdir)/mn-message.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-message.Tpo" "$(DEPDIR)/mail_notification-mn-message.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-message.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-message.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-message.Tpo -c -o mail_notification-mn-message.obj `if test -f 'mn-message.c'; then $(CYGPATH_W) 'mn-message.c'; else $(CYGPATH_W) '$(srcdir)/mn-message.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-message.Tpo $(DEPDIR)/mail_notification-mn-message.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-message.c' object='mail_notification-mn-message.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-message.obj `if test -f 'mn-message.c'; then $(CYGPATH_W) 'mn-message.c'; else $(CYGPATH_W) '$(srcdir)/mn-message.c'; fi`
mail_notification-mn-message-view.o: mn-message-view.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-message-view.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-message-view.Tpo" -c -o mail_notification-mn-message-view.o `test -f 'mn-message-view.c' || echo '$(srcdir)/'`mn-message-view.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-message-view.Tpo" "$(DEPDIR)/mail_notification-mn-message-view.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-message-view.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-message-view.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-message-view.Tpo -c -o mail_notification-mn-message-view.o `test -f 'mn-message-view.c' || echo '$(srcdir)/'`mn-message-view.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-message-view.Tpo $(DEPDIR)/mail_notification-mn-message-view.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-message-view.c' object='mail_notification-mn-message-view.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-message-view.o `test -f 'mn-message-view.c' || echo '$(srcdir)/'`mn-message-view.c
mail_notification-mn-message-view.obj: mn-message-view.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-message-view.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-message-view.Tpo" -c -o mail_notification-mn-message-view.obj `if test -f 'mn-message-view.c'; then $(CYGPATH_W) 'mn-message-view.c'; else $(CYGPATH_W) '$(srcdir)/mn-message-view.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-message-view.Tpo" "$(DEPDIR)/mail_notification-mn-message-view.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-message-view.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-message-view.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-message-view.Tpo -c -o mail_notification-mn-message-view.obj `if test -f 'mn-message-view.c'; then $(CYGPATH_W) 'mn-message-view.c'; else $(CYGPATH_W) '$(srcdir)/mn-message-view.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-message-view.Tpo $(DEPDIR)/mail_notification-mn-message-view.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-message-view.c' object='mail_notification-mn-message-view.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-message-view.obj `if test -f 'mn-message-view.c'; then $(CYGPATH_W) 'mn-message-view.c'; else $(CYGPATH_W) '$(srcdir)/mn-message-view.c'; fi`
mail_notification-mn-popup.o: mn-popup.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-popup.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-popup.Tpo" -c -o mail_notification-mn-popup.o `test -f 'mn-popup.c' || echo '$(srcdir)/'`mn-popup.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-popup.Tpo" "$(DEPDIR)/mail_notification-mn-popup.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-popup.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-popup.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-popup.Tpo -c -o mail_notification-mn-popup.o `test -f 'mn-popup.c' || echo '$(srcdir)/'`mn-popup.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-popup.Tpo $(DEPDIR)/mail_notification-mn-popup.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-popup.c' object='mail_notification-mn-popup.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-popup.o `test -f 'mn-popup.c' || echo '$(srcdir)/'`mn-popup.c
mail_notification-mn-popup.obj: mn-popup.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-popup.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-popup.Tpo" -c -o mail_notification-mn-popup.obj `if test -f 'mn-popup.c'; then $(CYGPATH_W) 'mn-popup.c'; else $(CYGPATH_W) '$(srcdir)/mn-popup.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-popup.Tpo" "$(DEPDIR)/mail_notification-mn-popup.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-popup.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-popup.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-popup.Tpo -c -o mail_notification-mn-popup.obj `if test -f 'mn-popup.c'; then $(CYGPATH_W) 'mn-popup.c'; else $(CYGPATH_W) '$(srcdir)/mn-popup.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-popup.Tpo $(DEPDIR)/mail_notification-mn-popup.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-popup.c' object='mail_notification-mn-popup.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-popup.obj `if test -f 'mn-popup.c'; then $(CYGPATH_W) 'mn-popup.c'; else $(CYGPATH_W) '$(srcdir)/mn-popup.c'; fi`
mail_notification-mn-popups.o: mn-popups.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-popups.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-popups.Tpo" -c -o mail_notification-mn-popups.o `test -f 'mn-popups.c' || echo '$(srcdir)/'`mn-popups.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-popups.Tpo" "$(DEPDIR)/mail_notification-mn-popups.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-popups.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-popups.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-popups.Tpo -c -o mail_notification-mn-popups.o `test -f 'mn-popups.c' || echo '$(srcdir)/'`mn-popups.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-popups.Tpo $(DEPDIR)/mail_notification-mn-popups.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-popups.c' object='mail_notification-mn-popups.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-popups.o `test -f 'mn-popups.c' || echo '$(srcdir)/'`mn-popups.c
mail_notification-mn-popups.obj: mn-popups.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-popups.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-popups.Tpo" -c -o mail_notification-mn-popups.obj `if test -f 'mn-popups.c'; then $(CYGPATH_W) 'mn-popups.c'; else $(CYGPATH_W) '$(srcdir)/mn-popups.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-popups.Tpo" "$(DEPDIR)/mail_notification-mn-popups.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-popups.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-popups.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-popups.Tpo -c -o mail_notification-mn-popups.obj `if test -f 'mn-popups.c'; then $(CYGPATH_W) 'mn-popups.c'; else $(CYGPATH_W) '$(srcdir)/mn-popups.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-popups.Tpo $(DEPDIR)/mail_notification-mn-popups.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-popups.c' object='mail_notification-mn-popups.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-popups.obj `if test -f 'mn-popups.c'; then $(CYGPATH_W) 'mn-popups.c'; else $(CYGPATH_W) '$(srcdir)/mn-popups.c'; fi`
mail_notification-mn-properties-dialog.o: mn-properties-dialog.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-properties-dialog.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-properties-dialog.Tpo" -c -o mail_notification-mn-properties-dialog.o `test -f 'mn-properties-dialog.c' || echo '$(srcdir)/'`mn-properties-dialog.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-properties-dialog.Tpo" "$(DEPDIR)/mail_notification-mn-properties-dialog.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-properties-dialog.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-properties-dialog.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-properties-dialog.Tpo -c -o mail_notification-mn-properties-dialog.o `test -f 'mn-properties-dialog.c' || echo '$(srcdir)/'`mn-properties-dialog.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-properties-dialog.Tpo $(DEPDIR)/mail_notification-mn-properties-dialog.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-properties-dialog.c' object='mail_notification-mn-properties-dialog.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-properties-dialog.o `test -f 'mn-properties-dialog.c' || echo '$(srcdir)/'`mn-properties-dialog.c
mail_notification-mn-properties-dialog.obj: mn-properties-dialog.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-properties-dialog.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-properties-dialog.Tpo" -c -o mail_notification-mn-properties-dialog.obj `if test -f 'mn-properties-dialog.c'; then $(CYGPATH_W) 'mn-properties-dialog.c'; else $(CYGPATH_W) '$(srcdir)/mn-properties-dialog.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-properties-dialog.Tpo" "$(DEPDIR)/mail_notification-mn-properties-dialog.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-properties-dialog.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-properties-dialog.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-properties-dialog.Tpo -c -o mail_notification-mn-properties-dialog.obj `if test -f 'mn-properties-dialog.c'; then $(CYGPATH_W) 'mn-properties-dialog.c'; else $(CYGPATH_W) '$(srcdir)/mn-properties-dialog.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-properties-dialog.Tpo $(DEPDIR)/mail_notification-mn-properties-dialog.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-properties-dialog.c' object='mail_notification-mn-properties-dialog.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-properties-dialog.obj `if test -f 'mn-properties-dialog.c'; then $(CYGPATH_W) 'mn-properties-dialog.c'; else $(CYGPATH_W) '$(srcdir)/mn-properties-dialog.c'; fi`
mail_notification-mn-shell.o: mn-shell.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-shell.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-shell.Tpo" -c -o mail_notification-mn-shell.o `test -f 'mn-shell.c' || echo '$(srcdir)/'`mn-shell.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-shell.Tpo" "$(DEPDIR)/mail_notification-mn-shell.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-shell.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-shell.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-shell.Tpo -c -o mail_notification-mn-shell.o `test -f 'mn-shell.c' || echo '$(srcdir)/'`mn-shell.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-shell.Tpo $(DEPDIR)/mail_notification-mn-shell.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-shell.c' object='mail_notification-mn-shell.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-shell.o `test -f 'mn-shell.c' || echo '$(srcdir)/'`mn-shell.c
mail_notification-mn-shell.obj: mn-shell.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-shell.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-shell.Tpo" -c -o mail_notification-mn-shell.obj `if test -f 'mn-shell.c'; then $(CYGPATH_W) 'mn-shell.c'; else $(CYGPATH_W) '$(srcdir)/mn-shell.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-shell.Tpo" "$(DEPDIR)/mail_notification-mn-shell.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-shell.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-shell.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-shell.Tpo -c -o mail_notification-mn-shell.obj `if test -f 'mn-shell.c'; then $(CYGPATH_W) 'mn-shell.c'; else $(CYGPATH_W) '$(srcdir)/mn-shell.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-shell.Tpo $(DEPDIR)/mail_notification-mn-shell.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-shell.c' object='mail_notification-mn-shell.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-shell.obj `if test -f 'mn-shell.c'; then $(CYGPATH_W) 'mn-shell.c'; else $(CYGPATH_W) '$(srcdir)/mn-shell.c'; fi`
mail_notification-mn-standard-message-view.o: mn-standard-message-view.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-standard-message-view.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-standard-message-view.Tpo" -c -o mail_notification-mn-standard-message-view.o `test -f 'mn-standard-message-view.c' || echo '$(srcdir)/'`mn-standard-message-view.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-standard-message-view.Tpo" "$(DEPDIR)/mail_notification-mn-standard-message-view.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-standard-message-view.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-standard-message-view.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-standard-message-view.Tpo -c -o mail_notification-mn-standard-message-view.o `test -f 'mn-standard-message-view.c' || echo '$(srcdir)/'`mn-standard-message-view.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-standard-message-view.Tpo $(DEPDIR)/mail_notification-mn-standard-message-view.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-standard-message-view.c' object='mail_notification-mn-standard-message-view.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-standard-message-view.o `test -f 'mn-standard-message-view.c' || echo '$(srcdir)/'`mn-standard-message-view.c
mail_notification-mn-standard-message-view.obj: mn-standard-message-view.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-standard-message-view.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-standard-message-view.Tpo" -c -o mail_notification-mn-standard-message-view.obj `if test -f 'mn-standard-message-view.c'; then $(CYGPATH_W) 'mn-standard-message-view.c'; else $(CYGPATH_W) '$(srcdir)/mn-standard-message-view.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-standard-message-view.Tpo" "$(DEPDIR)/mail_notification-mn-standard-message-view.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-standard-message-view.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-standard-message-view.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-standard-message-view.Tpo -c -o mail_notification-mn-standard-message-view.obj `if test -f 'mn-standard-message-view.c'; then $(CYGPATH_W) 'mn-standard-message-view.c'; else $(CYGPATH_W) '$(srcdir)/mn-standard-message-view.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-standard-message-view.Tpo $(DEPDIR)/mail_notification-mn-standard-message-view.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-standard-message-view.c' object='mail_notification-mn-standard-message-view.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-standard-message-view.obj `if test -f 'mn-standard-message-view.c'; then $(CYGPATH_W) 'mn-standard-message-view.c'; else $(CYGPATH_W) '$(srcdir)/mn-standard-message-view.c'; fi`
mail_notification-mn-test-mailbox.o: mn-test-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-test-mailbox.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-test-mailbox.Tpo" -c -o mail_notification-mn-test-mailbox.o `test -f 'mn-test-mailbox.c' || echo '$(srcdir)/'`mn-test-mailbox.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-test-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-test-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-test-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-test-mailbox.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-test-mailbox.Tpo -c -o mail_notification-mn-test-mailbox.o `test -f 'mn-test-mailbox.c' || echo '$(srcdir)/'`mn-test-mailbox.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-test-mailbox.Tpo $(DEPDIR)/mail_notification-mn-test-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-test-mailbox.c' object='mail_notification-mn-test-mailbox.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-test-mailbox.o `test -f 'mn-test-mailbox.c' || echo '$(srcdir)/'`mn-test-mailbox.c
mail_notification-mn-test-mailbox.obj: mn-test-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-test-mailbox.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-test-mailbox.Tpo" -c -o mail_notification-mn-test-mailbox.obj `if test -f 'mn-test-mailbox.c'; then $(CYGPATH_W) 'mn-test-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-test-mailbox.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-test-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-test-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-test-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-test-mailbox.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-test-mailbox.Tpo -c -o mail_notification-mn-test-mailbox.obj `if test -f 'mn-test-mailbox.c'; then $(CYGPATH_W) 'mn-test-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-test-mailbox.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-test-mailbox.Tpo $(DEPDIR)/mail_notification-mn-test-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-test-mailbox.c' object='mail_notification-mn-test-mailbox.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-test-mailbox.obj `if test -f 'mn-test-mailbox.c'; then $(CYGPATH_W) 'mn-test-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-test-mailbox.c'; fi`
mail_notification-mn-text-table.o: mn-text-table.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-text-table.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-text-table.Tpo" -c -o mail_notification-mn-text-table.o `test -f 'mn-text-table.c' || echo '$(srcdir)/'`mn-text-table.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-text-table.Tpo" "$(DEPDIR)/mail_notification-mn-text-table.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-text-table.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-text-table.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-text-table.Tpo -c -o mail_notification-mn-text-table.o `test -f 'mn-text-table.c' || echo '$(srcdir)/'`mn-text-table.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-text-table.Tpo $(DEPDIR)/mail_notification-mn-text-table.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-text-table.c' object='mail_notification-mn-text-table.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-text-table.o `test -f 'mn-text-table.c' || echo '$(srcdir)/'`mn-text-table.c
mail_notification-mn-text-table.obj: mn-text-table.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-text-table.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-text-table.Tpo" -c -o mail_notification-mn-text-table.obj `if test -f 'mn-text-table.c'; then $(CYGPATH_W) 'mn-text-table.c'; else $(CYGPATH_W) '$(srcdir)/mn-text-table.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-text-table.Tpo" "$(DEPDIR)/mail_notification-mn-text-table.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-text-table.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-text-table.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-text-table.Tpo -c -o mail_notification-mn-text-table.obj `if test -f 'mn-text-table.c'; then $(CYGPATH_W) 'mn-text-table.c'; else $(CYGPATH_W) '$(srcdir)/mn-text-table.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-text-table.Tpo $(DEPDIR)/mail_notification-mn-text-table.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-text-table.c' object='mail_notification-mn-text-table.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-text-table.obj `if test -f 'mn-text-table.c'; then $(CYGPATH_W) 'mn-text-table.c'; else $(CYGPATH_W) '$(srcdir)/mn-text-table.c'; fi`
mail_notification-mn-tooltips.o: mn-tooltips.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-tooltips.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-tooltips.Tpo" -c -o mail_notification-mn-tooltips.o `test -f 'mn-tooltips.c' || echo '$(srcdir)/'`mn-tooltips.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-tooltips.Tpo" "$(DEPDIR)/mail_notification-mn-tooltips.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-tooltips.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-tooltips.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-tooltips.Tpo -c -o mail_notification-mn-tooltips.o `test -f 'mn-tooltips.c' || echo '$(srcdir)/'`mn-tooltips.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-tooltips.Tpo $(DEPDIR)/mail_notification-mn-tooltips.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-tooltips.c' object='mail_notification-mn-tooltips.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-tooltips.o `test -f 'mn-tooltips.c' || echo '$(srcdir)/'`mn-tooltips.c
mail_notification-mn-tooltips.obj: mn-tooltips.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-tooltips.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-tooltips.Tpo" -c -o mail_notification-mn-tooltips.obj `if test -f 'mn-tooltips.c'; then $(CYGPATH_W) 'mn-tooltips.c'; else $(CYGPATH_W) '$(srcdir)/mn-tooltips.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-tooltips.Tpo" "$(DEPDIR)/mail_notification-mn-tooltips.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-tooltips.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-tooltips.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-tooltips.Tpo -c -o mail_notification-mn-tooltips.obj `if test -f 'mn-tooltips.c'; then $(CYGPATH_W) 'mn-tooltips.c'; else $(CYGPATH_W) '$(srcdir)/mn-tooltips.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-tooltips.Tpo $(DEPDIR)/mail_notification-mn-tooltips.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-tooltips.c' object='mail_notification-mn-tooltips.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-tooltips.obj `if test -f 'mn-tooltips.c'; then $(CYGPATH_W) 'mn-tooltips.c'; else $(CYGPATH_W) '$(srcdir)/mn-tooltips.c'; fi`
mail_notification-mn-mbox-mailbox-backend.o: mn-mbox-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mbox-mailbox-backend.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Tpo" -c -o mail_notification-mn-mbox-mailbox-backend.o `test -f 'mn-mbox-mailbox-backend.c' || echo '$(srcdir)/'`mn-mbox-mailbox-backend.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mbox-mailbox-backend.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Tpo -c -o mail_notification-mn-mbox-mailbox-backend.o `test -f 'mn-mbox-mailbox-backend.c' || echo '$(srcdir)/'`mn-mbox-mailbox-backend.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mbox-mailbox-backend.c' object='mail_notification-mn-mbox-mailbox-backend.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mbox-mailbox-backend.o `test -f 'mn-mbox-mailbox-backend.c' || echo '$(srcdir)/'`mn-mbox-mailbox-backend.c
mail_notification-mn-mbox-mailbox-backend.obj: mn-mbox-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mbox-mailbox-backend.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Tpo" -c -o mail_notification-mn-mbox-mailbox-backend.obj `if test -f 'mn-mbox-mailbox-backend.c'; then $(CYGPATH_W) 'mn-mbox-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-mbox-mailbox-backend.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mbox-mailbox-backend.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Tpo -c -o mail_notification-mn-mbox-mailbox-backend.obj `if test -f 'mn-mbox-mailbox-backend.c'; then $(CYGPATH_W) 'mn-mbox-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-mbox-mailbox-backend.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-mbox-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mbox-mailbox-backend.c' object='mail_notification-mn-mbox-mailbox-backend.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mbox-mailbox-backend.obj `if test -f 'mn-mbox-mailbox-backend.c'; then $(CYGPATH_W) 'mn-mbox-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-mbox-mailbox-backend.c'; fi`
mail_notification-mn-mozilla-mailbox-backend.o: mn-mozilla-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mozilla-mailbox-backend.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Tpo" -c -o mail_notification-mn-mozilla-mailbox-backend.o `test -f 'mn-mozilla-mailbox-backend.c' || echo '$(srcdir)/'`mn-mozilla-mailbox-backend.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mozilla-mailbox-backend.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Tpo -c -o mail_notification-mn-mozilla-mailbox-backend.o `test -f 'mn-mozilla-mailbox-backend.c' || echo '$(srcdir)/'`mn-mozilla-mailbox-backend.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mozilla-mailbox-backend.c' object='mail_notification-mn-mozilla-mailbox-backend.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mozilla-mailbox-backend.o `test -f 'mn-mozilla-mailbox-backend.c' || echo '$(srcdir)/'`mn-mozilla-mailbox-backend.c
mail_notification-mn-mozilla-mailbox-backend.obj: mn-mozilla-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mozilla-mailbox-backend.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Tpo" -c -o mail_notification-mn-mozilla-mailbox-backend.obj `if test -f 'mn-mozilla-mailbox-backend.c'; then $(CYGPATH_W) 'mn-mozilla-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-mozilla-mailbox-backend.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mozilla-mailbox-backend.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Tpo -c -o mail_notification-mn-mozilla-mailbox-backend.obj `if test -f 'mn-mozilla-mailbox-backend.c'; then $(CYGPATH_W) 'mn-mozilla-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-mozilla-mailbox-backend.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-mozilla-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mozilla-mailbox-backend.c' object='mail_notification-mn-mozilla-mailbox-backend.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mozilla-mailbox-backend.obj `if test -f 'mn-mozilla-mailbox-backend.c'; then $(CYGPATH_W) 'mn-mozilla-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-mozilla-mailbox-backend.c'; fi`
mail_notification-mn-base-mbox-mailbox-backend.o: mn-base-mbox-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-base-mbox-mailbox-backend.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Tpo" -c -o mail_notification-mn-base-mbox-mailbox-backend.o `test -f 'mn-base-mbox-mailbox-backend.c' || echo '$(srcdir)/'`mn-base-mbox-mailbox-backend.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-base-mbox-mailbox-backend.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Tpo -c -o mail_notification-mn-base-mbox-mailbox-backend.o `test -f 'mn-base-mbox-mailbox-backend.c' || echo '$(srcdir)/'`mn-base-mbox-mailbox-backend.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-base-mbox-mailbox-backend.c' object='mail_notification-mn-base-mbox-mailbox-backend.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-base-mbox-mailbox-backend.o `test -f 'mn-base-mbox-mailbox-backend.c' || echo '$(srcdir)/'`mn-base-mbox-mailbox-backend.c
mail_notification-mn-base-mbox-mailbox-backend.obj: mn-base-mbox-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-base-mbox-mailbox-backend.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Tpo" -c -o mail_notification-mn-base-mbox-mailbox-backend.obj `if test -f 'mn-base-mbox-mailbox-backend.c'; then $(CYGPATH_W) 'mn-base-mbox-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-base-mbox-mailbox-backend.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-base-mbox-mailbox-backend.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Tpo -c -o mail_notification-mn-base-mbox-mailbox-backend.obj `if test -f 'mn-base-mbox-mailbox-backend.c'; then $(CYGPATH_W) 'mn-base-mbox-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-base-mbox-mailbox-backend.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-base-mbox-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-base-mbox-mailbox-backend.c' object='mail_notification-mn-base-mbox-mailbox-backend.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-base-mbox-mailbox-backend.obj `if test -f 'mn-base-mbox-mailbox-backend.c'; then $(CYGPATH_W) 'mn-base-mbox-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-base-mbox-mailbox-backend.c'; fi`
mail_notification-mn-mh-mailbox-backend.o: mn-mh-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mh-mailbox-backend.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Tpo" -c -o mail_notification-mn-mh-mailbox-backend.o `test -f 'mn-mh-mailbox-backend.c' || echo '$(srcdir)/'`mn-mh-mailbox-backend.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mh-mailbox-backend.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Tpo -c -o mail_notification-mn-mh-mailbox-backend.o `test -f 'mn-mh-mailbox-backend.c' || echo '$(srcdir)/'`mn-mh-mailbox-backend.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mh-mailbox-backend.c' object='mail_notification-mn-mh-mailbox-backend.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mh-mailbox-backend.o `test -f 'mn-mh-mailbox-backend.c' || echo '$(srcdir)/'`mn-mh-mailbox-backend.c
mail_notification-mn-mh-mailbox-backend.obj: mn-mh-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mh-mailbox-backend.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Tpo" -c -o mail_notification-mn-mh-mailbox-backend.obj `if test -f 'mn-mh-mailbox-backend.c'; then $(CYGPATH_W) 'mn-mh-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-mh-mailbox-backend.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-mh-mailbox-backend.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Tpo -c -o mail_notification-mn-mh-mailbox-backend.obj `if test -f 'mn-mh-mailbox-backend.c'; then $(CYGPATH_W) 'mn-mh-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-mh-mailbox-backend.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-mh-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-mh-mailbox-backend.c' object='mail_notification-mn-mh-mailbox-backend.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-mh-mailbox-backend.obj `if test -f 'mn-mh-mailbox-backend.c'; then $(CYGPATH_W) 'mn-mh-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-mh-mailbox-backend.c'; fi`
mail_notification-mn-maildir-mailbox-backend.o: mn-maildir-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-maildir-mailbox-backend.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Tpo" -c -o mail_notification-mn-maildir-mailbox-backend.o `test -f 'mn-maildir-mailbox-backend.c' || echo '$(srcdir)/'`mn-maildir-mailbox-backend.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-maildir-mailbox-backend.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Tpo -c -o mail_notification-mn-maildir-mailbox-backend.o `test -f 'mn-maildir-mailbox-backend.c' || echo '$(srcdir)/'`mn-maildir-mailbox-backend.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-maildir-mailbox-backend.c' object='mail_notification-mn-maildir-mailbox-backend.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-maildir-mailbox-backend.o `test -f 'mn-maildir-mailbox-backend.c' || echo '$(srcdir)/'`mn-maildir-mailbox-backend.c
mail_notification-mn-maildir-mailbox-backend.obj: mn-maildir-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-maildir-mailbox-backend.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Tpo" -c -o mail_notification-mn-maildir-mailbox-backend.obj `if test -f 'mn-maildir-mailbox-backend.c'; then $(CYGPATH_W) 'mn-maildir-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-maildir-mailbox-backend.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-maildir-mailbox-backend.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Tpo -c -o mail_notification-mn-maildir-mailbox-backend.obj `if test -f 'mn-maildir-mailbox-backend.c'; then $(CYGPATH_W) 'mn-maildir-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-maildir-mailbox-backend.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-maildir-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-maildir-mailbox-backend.c' object='mail_notification-mn-maildir-mailbox-backend.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-maildir-mailbox-backend.obj `if test -f 'mn-maildir-mailbox-backend.c'; then $(CYGPATH_W) 'mn-maildir-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-maildir-mailbox-backend.c'; fi`
mail_notification-mn-md5.o: mn-md5.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-md5.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-md5.Tpo" -c -o mail_notification-mn-md5.o `test -f 'mn-md5.c' || echo '$(srcdir)/'`mn-md5.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-md5.Tpo" "$(DEPDIR)/mail_notification-mn-md5.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-md5.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-md5.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-md5.Tpo -c -o mail_notification-mn-md5.o `test -f 'mn-md5.c' || echo '$(srcdir)/'`mn-md5.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-md5.Tpo $(DEPDIR)/mail_notification-mn-md5.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-md5.c' object='mail_notification-mn-md5.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-md5.o `test -f 'mn-md5.c' || echo '$(srcdir)/'`mn-md5.c
mail_notification-mn-md5.obj: mn-md5.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-md5.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-md5.Tpo" -c -o mail_notification-mn-md5.obj `if test -f 'mn-md5.c'; then $(CYGPATH_W) 'mn-md5.c'; else $(CYGPATH_W) '$(srcdir)/mn-md5.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-md5.Tpo" "$(DEPDIR)/mail_notification-mn-md5.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-md5.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-md5.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-md5.Tpo -c -o mail_notification-mn-md5.obj `if test -f 'mn-md5.c'; then $(CYGPATH_W) 'mn-md5.c'; else $(CYGPATH_W) '$(srcdir)/mn-md5.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-md5.Tpo $(DEPDIR)/mail_notification-mn-md5.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-md5.c' object='mail_notification-mn-md5.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-md5.obj `if test -f 'mn-md5.c'; then $(CYGPATH_W) 'mn-md5.c'; else $(CYGPATH_W) '$(srcdir)/mn-md5.c'; fi`
mail_notification-mn-pop3-mailbox.o: mn-pop3-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pop3-mailbox.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-pop3-mailbox.Tpo" -c -o mail_notification-mn-pop3-mailbox.o `test -f 'mn-pop3-mailbox.c' || echo '$(srcdir)/'`mn-pop3-mailbox.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-pop3-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-pop3-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-pop3-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pop3-mailbox.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-pop3-mailbox.Tpo -c -o mail_notification-mn-pop3-mailbox.o `test -f 'mn-pop3-mailbox.c' || echo '$(srcdir)/'`mn-pop3-mailbox.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-pop3-mailbox.Tpo $(DEPDIR)/mail_notification-mn-pop3-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-pop3-mailbox.c' object='mail_notification-mn-pop3-mailbox.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-pop3-mailbox.o `test -f 'mn-pop3-mailbox.c' || echo '$(srcdir)/'`mn-pop3-mailbox.c
mail_notification-mn-pop3-mailbox.obj: mn-pop3-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pop3-mailbox.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-pop3-mailbox.Tpo" -c -o mail_notification-mn-pop3-mailbox.obj `if test -f 'mn-pop3-mailbox.c'; then $(CYGPATH_W) 'mn-pop3-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-pop3-mailbox.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-pop3-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-pop3-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-pop3-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pop3-mailbox.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-pop3-mailbox.Tpo -c -o mail_notification-mn-pop3-mailbox.obj `if test -f 'mn-pop3-mailbox.c'; then $(CYGPATH_W) 'mn-pop3-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-pop3-mailbox.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-pop3-mailbox.Tpo $(DEPDIR)/mail_notification-mn-pop3-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-pop3-mailbox.c' object='mail_notification-mn-pop3-mailbox.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-pop3-mailbox.obj `if test -f 'mn-pop3-mailbox.c'; then $(CYGPATH_W) 'mn-pop3-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-pop3-mailbox.c'; fi`
mail_notification-mn-pop3-mailbox-properties.o: mn-pop3-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pop3-mailbox-properties.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Tpo" -c -o mail_notification-mn-pop3-mailbox-properties.o `test -f 'mn-pop3-mailbox-properties.c' || echo '$(srcdir)/'`mn-pop3-mailbox-properties.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pop3-mailbox-properties.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Tpo -c -o mail_notification-mn-pop3-mailbox-properties.o `test -f 'mn-pop3-mailbox-properties.c' || echo '$(srcdir)/'`mn-pop3-mailbox-properties.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-pop3-mailbox-properties.c' object='mail_notification-mn-pop3-mailbox-properties.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-pop3-mailbox-properties.o `test -f 'mn-pop3-mailbox-properties.c' || echo '$(srcdir)/'`mn-pop3-mailbox-properties.c
mail_notification-mn-pop3-mailbox-properties.obj: mn-pop3-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pop3-mailbox-properties.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Tpo" -c -o mail_notification-mn-pop3-mailbox-properties.obj `if test -f 'mn-pop3-mailbox-properties.c'; then $(CYGPATH_W) 'mn-pop3-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-pop3-mailbox-properties.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pop3-mailbox-properties.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Tpo -c -o mail_notification-mn-pop3-mailbox-properties.obj `if test -f 'mn-pop3-mailbox-properties.c'; then $(CYGPATH_W) 'mn-pop3-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-pop3-mailbox-properties.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-pop3-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-pop3-mailbox-properties.c' object='mail_notification-mn-pop3-mailbox-properties.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-pop3-mailbox-properties.obj `if test -f 'mn-pop3-mailbox-properties.c'; then $(CYGPATH_W) 'mn-pop3-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-pop3-mailbox-properties.c'; fi`
mail_notification-mn-imap-mailbox.o: mn-imap-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-imap-mailbox.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-imap-mailbox.Tpo" -c -o mail_notification-mn-imap-mailbox.o `test -f 'mn-imap-mailbox.c' || echo '$(srcdir)/'`mn-imap-mailbox.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-imap-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-imap-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-imap-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-imap-mailbox.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-imap-mailbox.Tpo -c -o mail_notification-mn-imap-mailbox.o `test -f 'mn-imap-mailbox.c' || echo '$(srcdir)/'`mn-imap-mailbox.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-imap-mailbox.Tpo $(DEPDIR)/mail_notification-mn-imap-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-imap-mailbox.c' object='mail_notification-mn-imap-mailbox.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-imap-mailbox.o `test -f 'mn-imap-mailbox.c' || echo '$(srcdir)/'`mn-imap-mailbox.c
mail_notification-mn-imap-mailbox.obj: mn-imap-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-imap-mailbox.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-imap-mailbox.Tpo" -c -o mail_notification-mn-imap-mailbox.obj `if test -f 'mn-imap-mailbox.c'; then $(CYGPATH_W) 'mn-imap-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-imap-mailbox.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-imap-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-imap-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-imap-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-imap-mailbox.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-imap-mailbox.Tpo -c -o mail_notification-mn-imap-mailbox.obj `if test -f 'mn-imap-mailbox.c'; then $(CYGPATH_W) 'mn-imap-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-imap-mailbox.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-imap-mailbox.Tpo $(DEPDIR)/mail_notification-mn-imap-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-imap-mailbox.c' object='mail_notification-mn-imap-mailbox.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-imap-mailbox.obj `if test -f 'mn-imap-mailbox.c'; then $(CYGPATH_W) 'mn-imap-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-imap-mailbox.c'; fi`
mail_notification-mn-imap-mailbox-properties.o: mn-imap-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-imap-mailbox-properties.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Tpo" -c -o mail_notification-mn-imap-mailbox-properties.o `test -f 'mn-imap-mailbox-properties.c' || echo '$(srcdir)/'`mn-imap-mailbox-properties.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-imap-mailbox-properties.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Tpo -c -o mail_notification-mn-imap-mailbox-properties.o `test -f 'mn-imap-mailbox-properties.c' || echo '$(srcdir)/'`mn-imap-mailbox-properties.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-imap-mailbox-properties.c' object='mail_notification-mn-imap-mailbox-properties.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-imap-mailbox-properties.o `test -f 'mn-imap-mailbox-properties.c' || echo '$(srcdir)/'`mn-imap-mailbox-properties.c
mail_notification-mn-imap-mailbox-properties.obj: mn-imap-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-imap-mailbox-properties.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Tpo" -c -o mail_notification-mn-imap-mailbox-properties.obj `if test -f 'mn-imap-mailbox-properties.c'; then $(CYGPATH_W) 'mn-imap-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-imap-mailbox-properties.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-imap-mailbox-properties.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Tpo -c -o mail_notification-mn-imap-mailbox-properties.obj `if test -f 'mn-imap-mailbox-properties.c'; then $(CYGPATH_W) 'mn-imap-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-imap-mailbox-properties.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-imap-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-imap-mailbox-properties.c' object='mail_notification-mn-imap-mailbox-properties.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-imap-mailbox-properties.obj `if test -f 'mn-imap-mailbox-properties.c'; then $(CYGPATH_W) 'mn-imap-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-imap-mailbox-properties.c'; fi`
mail_notification-mn-client-session.o: mn-client-session.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-client-session.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-client-session.Tpo" -c -o mail_notification-mn-client-session.o `test -f 'mn-client-session.c' || echo '$(srcdir)/'`mn-client-session.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-client-session.Tpo" "$(DEPDIR)/mail_notification-mn-client-session.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-client-session.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-client-session.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-client-session.Tpo -c -o mail_notification-mn-client-session.o `test -f 'mn-client-session.c' || echo '$(srcdir)/'`mn-client-session.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-client-session.Tpo $(DEPDIR)/mail_notification-mn-client-session.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-client-session.c' object='mail_notification-mn-client-session.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-client-session.o `test -f 'mn-client-session.c' || echo '$(srcdir)/'`mn-client-session.c
mail_notification-mn-client-session.obj: mn-client-session.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-client-session.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-client-session.Tpo" -c -o mail_notification-mn-client-session.obj `if test -f 'mn-client-session.c'; then $(CYGPATH_W) 'mn-client-session.c'; else $(CYGPATH_W) '$(srcdir)/mn-client-session.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-client-session.Tpo" "$(DEPDIR)/mail_notification-mn-client-session.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-client-session.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-client-session.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-client-session.Tpo -c -o mail_notification-mn-client-session.obj `if test -f 'mn-client-session.c'; then $(CYGPATH_W) 'mn-client-session.c'; else $(CYGPATH_W) '$(srcdir)/mn-client-session.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-client-session.Tpo $(DEPDIR)/mail_notification-mn-client-session.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-client-session.c' object='mail_notification-mn-client-session.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-client-session.obj `if test -f 'mn-client-session.c'; then $(CYGPATH_W) 'mn-client-session.c'; else $(CYGPATH_W) '$(srcdir)/mn-client-session.c'; fi`
mail_notification-mn-auth-combo-box.o: mn-auth-combo-box.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-auth-combo-box.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-auth-combo-box.Tpo" -c -o mail_notification-mn-auth-combo-box.o `test -f 'mn-auth-combo-box.c' || echo '$(srcdir)/'`mn-auth-combo-box.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-auth-combo-box.Tpo" "$(DEPDIR)/mail_notification-mn-auth-combo-box.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-auth-combo-box.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-auth-combo-box.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-auth-combo-box.Tpo -c -o mail_notification-mn-auth-combo-box.o `test -f 'mn-auth-combo-box.c' || echo '$(srcdir)/'`mn-auth-combo-box.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-auth-combo-box.Tpo $(DEPDIR)/mail_notification-mn-auth-combo-box.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-auth-combo-box.c' object='mail_notification-mn-auth-combo-box.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-auth-combo-box.o `test -f 'mn-auth-combo-box.c' || echo '$(srcdir)/'`mn-auth-combo-box.c
mail_notification-mn-auth-combo-box.obj: mn-auth-combo-box.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-auth-combo-box.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-auth-combo-box.Tpo" -c -o mail_notification-mn-auth-combo-box.obj `if test -f 'mn-auth-combo-box.c'; then $(CYGPATH_W) 'mn-auth-combo-box.c'; else $(CYGPATH_W) '$(srcdir)/mn-auth-combo-box.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-auth-combo-box.Tpo" "$(DEPDIR)/mail_notification-mn-auth-combo-box.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-auth-combo-box.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-auth-combo-box.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-auth-combo-box.Tpo -c -o mail_notification-mn-auth-combo-box.obj `if test -f 'mn-auth-combo-box.c'; then $(CYGPATH_W) 'mn-auth-combo-box.c'; else $(CYGPATH_W) '$(srcdir)/mn-auth-combo-box.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-auth-combo-box.Tpo $(DEPDIR)/mail_notification-mn-auth-combo-box.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-auth-combo-box.c' object='mail_notification-mn-auth-combo-box.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-auth-combo-box.obj `if test -f 'mn-auth-combo-box.c'; then $(CYGPATH_W) 'mn-auth-combo-box.c'; else $(CYGPATH_W) '$(srcdir)/mn-auth-combo-box.c'; fi`
mail_notification-mn-pi-mailbox.o: mn-pi-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pi-mailbox.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-pi-mailbox.Tpo" -c -o mail_notification-mn-pi-mailbox.o `test -f 'mn-pi-mailbox.c' || echo '$(srcdir)/'`mn-pi-mailbox.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-pi-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-pi-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-pi-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pi-mailbox.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-pi-mailbox.Tpo -c -o mail_notification-mn-pi-mailbox.o `test -f 'mn-pi-mailbox.c' || echo '$(srcdir)/'`mn-pi-mailbox.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-pi-mailbox.Tpo $(DEPDIR)/mail_notification-mn-pi-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-pi-mailbox.c' object='mail_notification-mn-pi-mailbox.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-pi-mailbox.o `test -f 'mn-pi-mailbox.c' || echo '$(srcdir)/'`mn-pi-mailbox.c
mail_notification-mn-pi-mailbox.obj: mn-pi-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pi-mailbox.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-pi-mailbox.Tpo" -c -o mail_notification-mn-pi-mailbox.obj `if test -f 'mn-pi-mailbox.c'; then $(CYGPATH_W) 'mn-pi-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-pi-mailbox.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-pi-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-pi-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-pi-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pi-mailbox.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-pi-mailbox.Tpo -c -o mail_notification-mn-pi-mailbox.obj `if test -f 'mn-pi-mailbox.c'; then $(CYGPATH_W) 'mn-pi-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-pi-mailbox.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-pi-mailbox.Tpo $(DEPDIR)/mail_notification-mn-pi-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-pi-mailbox.c' object='mail_notification-mn-pi-mailbox.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-pi-mailbox.obj `if test -f 'mn-pi-mailbox.c'; then $(CYGPATH_W) 'mn-pi-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-pi-mailbox.c'; fi`
mail_notification-mn-pi-mailbox-properties.o: mn-pi-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pi-mailbox-properties.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Tpo" -c -o mail_notification-mn-pi-mailbox-properties.o `test -f 'mn-pi-mailbox-properties.c' || echo '$(srcdir)/'`mn-pi-mailbox-properties.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pi-mailbox-properties.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Tpo -c -o mail_notification-mn-pi-mailbox-properties.o `test -f 'mn-pi-mailbox-properties.c' || echo '$(srcdir)/'`mn-pi-mailbox-properties.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-pi-mailbox-properties.c' object='mail_notification-mn-pi-mailbox-properties.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-pi-mailbox-properties.o `test -f 'mn-pi-mailbox-properties.c' || echo '$(srcdir)/'`mn-pi-mailbox-properties.c
mail_notification-mn-pi-mailbox-properties.obj: mn-pi-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pi-mailbox-properties.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Tpo" -c -o mail_notification-mn-pi-mailbox-properties.obj `if test -f 'mn-pi-mailbox-properties.c'; then $(CYGPATH_W) 'mn-pi-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-pi-mailbox-properties.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-pi-mailbox-properties.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Tpo -c -o mail_notification-mn-pi-mailbox-properties.obj `if test -f 'mn-pi-mailbox-properties.c'; then $(CYGPATH_W) 'mn-pi-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-pi-mailbox-properties.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-pi-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-pi-mailbox-properties.c' object='mail_notification-mn-pi-mailbox-properties.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-pi-mailbox-properties.obj `if test -f 'mn-pi-mailbox-properties.c'; then $(CYGPATH_W) 'mn-pi-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-pi-mailbox-properties.c'; fi`
mail_notification-mn-authenticated-mailbox.o: mn-authenticated-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-authenticated-mailbox.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-authenticated-mailbox.Tpo" -c -o mail_notification-mn-authenticated-mailbox.o `test -f 'mn-authenticated-mailbox.c' || echo '$(srcdir)/'`mn-authenticated-mailbox.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-authenticated-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-authenticated-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-authenticated-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-authenticated-mailbox.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-authenticated-mailbox.Tpo -c -o mail_notification-mn-authenticated-mailbox.o `test -f 'mn-authenticated-mailbox.c' || echo '$(srcdir)/'`mn-authenticated-mailbox.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-authenticated-mailbox.Tpo $(DEPDIR)/mail_notification-mn-authenticated-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-authenticated-mailbox.c' object='mail_notification-mn-authenticated-mailbox.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-authenticated-mailbox.o `test -f 'mn-authenticated-mailbox.c' || echo '$(srcdir)/'`mn-authenticated-mailbox.c
mail_notification-mn-authenticated-mailbox.obj: mn-authenticated-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-authenticated-mailbox.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-authenticated-mailbox.Tpo" -c -o mail_notification-mn-authenticated-mailbox.obj `if test -f 'mn-authenticated-mailbox.c'; then $(CYGPATH_W) 'mn-authenticated-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-authenticated-mailbox.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-authenticated-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-authenticated-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-authenticated-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-authenticated-mailbox.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-authenticated-mailbox.Tpo -c -o mail_notification-mn-authenticated-mailbox.obj `if test -f 'mn-authenticated-mailbox.c'; then $(CYGPATH_W) 'mn-authenticated-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-authenticated-mailbox.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-authenticated-mailbox.Tpo $(DEPDIR)/mail_notification-mn-authenticated-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-authenticated-mailbox.c' object='mail_notification-mn-authenticated-mailbox.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-authenticated-mailbox.obj `if test -f 'mn-authenticated-mailbox.c'; then $(CYGPATH_W) 'mn-authenticated-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-authenticated-mailbox.c'; fi`
mail_notification-mn-authenticated-mailbox-properties.o: mn-authenticated-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-authenticated-mailbox-properties.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Tpo" -c -o mail_notification-mn-authenticated-mailbox-properties.o `test -f 'mn-authenticated-mailbox-properties.c' || echo '$(srcdir)/'`mn-authenticated-mailbox-properties.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-authenticated-mailbox-properties.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Tpo -c -o mail_notification-mn-authenticated-mailbox-properties.o `test -f 'mn-authenticated-mailbox-properties.c' || echo '$(srcdir)/'`mn-authenticated-mailbox-properties.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-authenticated-mailbox-properties.c' object='mail_notification-mn-authenticated-mailbox-properties.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-authenticated-mailbox-properties.o `test -f 'mn-authenticated-mailbox-properties.c' || echo '$(srcdir)/'`mn-authenticated-mailbox-properties.c
mail_notification-mn-authenticated-mailbox-properties.obj: mn-authenticated-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-authenticated-mailbox-properties.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Tpo" -c -o mail_notification-mn-authenticated-mailbox-properties.obj `if test -f 'mn-authenticated-mailbox-properties.c'; then $(CYGPATH_W) 'mn-authenticated-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-authenticated-mailbox-properties.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-authenticated-mailbox-properties.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Tpo -c -o mail_notification-mn-authenticated-mailbox-properties.obj `if test -f 'mn-authenticated-mailbox-properties.c'; then $(CYGPATH_W) 'mn-authenticated-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-authenticated-mailbox-properties.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-authenticated-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-authenticated-mailbox-properties.c' object='mail_notification-mn-authenticated-mailbox-properties.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-authenticated-mailbox-properties.obj `if test -f 'mn-authenticated-mailbox-properties.c'; then $(CYGPATH_W) 'mn-authenticated-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-authenticated-mailbox-properties.c'; fi`
mail_notification-mn-sylpheed-mailbox-backend.o: mn-sylpheed-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-sylpheed-mailbox-backend.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Tpo" -c -o mail_notification-mn-sylpheed-mailbox-backend.o `test -f 'mn-sylpheed-mailbox-backend.c' || echo '$(srcdir)/'`mn-sylpheed-mailbox-backend.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-sylpheed-mailbox-backend.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Tpo -c -o mail_notification-mn-sylpheed-mailbox-backend.o `test -f 'mn-sylpheed-mailbox-backend.c' || echo '$(srcdir)/'`mn-sylpheed-mailbox-backend.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-sylpheed-mailbox-backend.c' object='mail_notification-mn-sylpheed-mailbox-backend.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-sylpheed-mailbox-backend.o `test -f 'mn-sylpheed-mailbox-backend.c' || echo '$(srcdir)/'`mn-sylpheed-mailbox-backend.c
mail_notification-mn-sylpheed-mailbox-backend.obj: mn-sylpheed-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-sylpheed-mailbox-backend.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Tpo" -c -o mail_notification-mn-sylpheed-mailbox-backend.obj `if test -f 'mn-sylpheed-mailbox-backend.c'; then $(CYGPATH_W) 'mn-sylpheed-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-sylpheed-mailbox-backend.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-sylpheed-mailbox-backend.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Tpo -c -o mail_notification-mn-sylpheed-mailbox-backend.obj `if test -f 'mn-sylpheed-mailbox-backend.c'; then $(CYGPATH_W) 'mn-sylpheed-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-sylpheed-mailbox-backend.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-sylpheed-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-sylpheed-mailbox-backend.c' object='mail_notification-mn-sylpheed-mailbox-backend.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-sylpheed-mailbox-backend.obj `if test -f 'mn-sylpheed-mailbox-backend.c'; then $(CYGPATH_W) 'mn-sylpheed-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-sylpheed-mailbox-backend.c'; fi`
mail_notification-mn-gmail-mailbox.o: mn-gmail-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-gmail-mailbox.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-gmail-mailbox.Tpo" -c -o mail_notification-mn-gmail-mailbox.o `test -f 'mn-gmail-mailbox.c' || echo '$(srcdir)/'`mn-gmail-mailbox.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-gmail-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-gmail-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-gmail-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-gmail-mailbox.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-gmail-mailbox.Tpo -c -o mail_notification-mn-gmail-mailbox.o `test -f 'mn-gmail-mailbox.c' || echo '$(srcdir)/'`mn-gmail-mailbox.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-gmail-mailbox.Tpo $(DEPDIR)/mail_notification-mn-gmail-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-gmail-mailbox.c' object='mail_notification-mn-gmail-mailbox.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-gmail-mailbox.o `test -f 'mn-gmail-mailbox.c' || echo '$(srcdir)/'`mn-gmail-mailbox.c
mail_notification-mn-gmail-mailbox.obj: mn-gmail-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-gmail-mailbox.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-gmail-mailbox.Tpo" -c -o mail_notification-mn-gmail-mailbox.obj `if test -f 'mn-gmail-mailbox.c'; then $(CYGPATH_W) 'mn-gmail-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-gmail-mailbox.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-gmail-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-gmail-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-gmail-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-gmail-mailbox.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-gmail-mailbox.Tpo -c -o mail_notification-mn-gmail-mailbox.obj `if test -f 'mn-gmail-mailbox.c'; then $(CYGPATH_W) 'mn-gmail-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-gmail-mailbox.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-gmail-mailbox.Tpo $(DEPDIR)/mail_notification-mn-gmail-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-gmail-mailbox.c' object='mail_notification-mn-gmail-mailbox.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-gmail-mailbox.obj `if test -f 'mn-gmail-mailbox.c'; then $(CYGPATH_W) 'mn-gmail-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-gmail-mailbox.c'; fi`
mail_notification-mn-gmail-mailbox-properties.o: mn-gmail-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-gmail-mailbox-properties.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Tpo" -c -o mail_notification-mn-gmail-mailbox-properties.o `test -f 'mn-gmail-mailbox-properties.c' || echo '$(srcdir)/'`mn-gmail-mailbox-properties.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-gmail-mailbox-properties.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Tpo -c -o mail_notification-mn-gmail-mailbox-properties.o `test -f 'mn-gmail-mailbox-properties.c' || echo '$(srcdir)/'`mn-gmail-mailbox-properties.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-gmail-mailbox-properties.c' object='mail_notification-mn-gmail-mailbox-properties.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-gmail-mailbox-properties.o `test -f 'mn-gmail-mailbox-properties.c' || echo '$(srcdir)/'`mn-gmail-mailbox-properties.c
mail_notification-mn-gmail-mailbox-properties.obj: mn-gmail-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-gmail-mailbox-properties.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Tpo" -c -o mail_notification-mn-gmail-mailbox-properties.obj `if test -f 'mn-gmail-mailbox-properties.c'; then $(CYGPATH_W) 'mn-gmail-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-gmail-mailbox-properties.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-gmail-mailbox-properties.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Tpo -c -o mail_notification-mn-gmail-mailbox-properties.obj `if test -f 'mn-gmail-mailbox-properties.c'; then $(CYGPATH_W) 'mn-gmail-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-gmail-mailbox-properties.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-gmail-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-gmail-mailbox-properties.c' object='mail_notification-mn-gmail-mailbox-properties.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-gmail-mailbox-properties.obj `if test -f 'mn-gmail-mailbox-properties.c'; then $(CYGPATH_W) 'mn-gmail-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-gmail-mailbox-properties.c'; fi`
mail_notification-mn-custom-vfs-mailbox.o: mn-custom-vfs-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-custom-vfs-mailbox.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Tpo" -c -o mail_notification-mn-custom-vfs-mailbox.o `test -f 'mn-custom-vfs-mailbox.c' || echo '$(srcdir)/'`mn-custom-vfs-mailbox.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-custom-vfs-mailbox.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Tpo -c -o mail_notification-mn-custom-vfs-mailbox.o `test -f 'mn-custom-vfs-mailbox.c' || echo '$(srcdir)/'`mn-custom-vfs-mailbox.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Tpo $(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-custom-vfs-mailbox.c' object='mail_notification-mn-custom-vfs-mailbox.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-custom-vfs-mailbox.o `test -f 'mn-custom-vfs-mailbox.c' || echo '$(srcdir)/'`mn-custom-vfs-mailbox.c
mail_notification-mn-custom-vfs-mailbox.obj: mn-custom-vfs-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-custom-vfs-mailbox.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Tpo" -c -o mail_notification-mn-custom-vfs-mailbox.obj `if test -f 'mn-custom-vfs-mailbox.c'; then $(CYGPATH_W) 'mn-custom-vfs-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-custom-vfs-mailbox.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-custom-vfs-mailbox.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Tpo -c -o mail_notification-mn-custom-vfs-mailbox.obj `if test -f 'mn-custom-vfs-mailbox.c'; then $(CYGPATH_W) 'mn-custom-vfs-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-custom-vfs-mailbox.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Tpo $(DEPDIR)/mail_notification-mn-custom-vfs-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-custom-vfs-mailbox.c' object='mail_notification-mn-custom-vfs-mailbox.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-custom-vfs-mailbox.obj `if test -f 'mn-custom-vfs-mailbox.c'; then $(CYGPATH_W) 'mn-custom-vfs-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-custom-vfs-mailbox.c'; fi`
mail_notification-mn-system-vfs-mailbox.o: mn-system-vfs-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-system-vfs-mailbox.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Tpo" -c -o mail_notification-mn-system-vfs-mailbox.o `test -f 'mn-system-vfs-mailbox.c' || echo '$(srcdir)/'`mn-system-vfs-mailbox.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-system-vfs-mailbox.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Tpo -c -o mail_notification-mn-system-vfs-mailbox.o `test -f 'mn-system-vfs-mailbox.c' || echo '$(srcdir)/'`mn-system-vfs-mailbox.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Tpo $(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-system-vfs-mailbox.c' object='mail_notification-mn-system-vfs-mailbox.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-system-vfs-mailbox.o `test -f 'mn-system-vfs-mailbox.c' || echo '$(srcdir)/'`mn-system-vfs-mailbox.c
mail_notification-mn-system-vfs-mailbox.obj: mn-system-vfs-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-system-vfs-mailbox.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Tpo" -c -o mail_notification-mn-system-vfs-mailbox.obj `if test -f 'mn-system-vfs-mailbox.c'; then $(CYGPATH_W) 'mn-system-vfs-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-system-vfs-mailbox.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-system-vfs-mailbox.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Tpo -c -o mail_notification-mn-system-vfs-mailbox.obj `if test -f 'mn-system-vfs-mailbox.c'; then $(CYGPATH_W) 'mn-system-vfs-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-system-vfs-mailbox.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Tpo $(DEPDIR)/mail_notification-mn-system-vfs-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-system-vfs-mailbox.c' object='mail_notification-mn-system-vfs-mailbox.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-system-vfs-mailbox.obj `if test -f 'mn-system-vfs-mailbox.c'; then $(CYGPATH_W) 'mn-system-vfs-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-system-vfs-mailbox.c'; fi`
mail_notification-mn-system-vfs-mailbox-properties.o: mn-system-vfs-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-system-vfs-mailbox-properties.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Tpo" -c -o mail_notification-mn-system-vfs-mailbox-properties.o `test -f 'mn-system-vfs-mailbox-properties.c' || echo '$(srcdir)/'`mn-system-vfs-mailbox-properties.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-system-vfs-mailbox-properties.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Tpo -c -o mail_notification-mn-system-vfs-mailbox-properties.o `test -f 'mn-system-vfs-mailbox-properties.c' || echo '$(srcdir)/'`mn-system-vfs-mailbox-properties.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-system-vfs-mailbox-properties.c' object='mail_notification-mn-system-vfs-mailbox-properties.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-system-vfs-mailbox-properties.o `test -f 'mn-system-vfs-mailbox-properties.c' || echo '$(srcdir)/'`mn-system-vfs-mailbox-properties.c
mail_notification-mn-system-vfs-mailbox-properties.obj: mn-system-vfs-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-system-vfs-mailbox-properties.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Tpo" -c -o mail_notification-mn-system-vfs-mailbox-properties.obj `if test -f 'mn-system-vfs-mailbox-properties.c'; then $(CYGPATH_W) 'mn-system-vfs-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-system-vfs-mailbox-properties.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-system-vfs-mailbox-properties.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Tpo -c -o mail_notification-mn-system-vfs-mailbox-properties.obj `if test -f 'mn-system-vfs-mailbox-properties.c'; then $(CYGPATH_W) 'mn-system-vfs-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-system-vfs-mailbox-properties.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-system-vfs-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-system-vfs-mailbox-properties.c' object='mail_notification-mn-system-vfs-mailbox-properties.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-system-vfs-mailbox-properties.obj `if test -f 'mn-system-vfs-mailbox-properties.c'; then $(CYGPATH_W) 'mn-system-vfs-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-system-vfs-mailbox-properties.c'; fi`
mail_notification-mn-vfs-mailbox.o: mn-vfs-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs-mailbox.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-vfs-mailbox.Tpo" -c -o mail_notification-mn-vfs-mailbox.o `test -f 'mn-vfs-mailbox.c' || echo '$(srcdir)/'`mn-vfs-mailbox.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-vfs-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-vfs-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-vfs-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs-mailbox.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-vfs-mailbox.Tpo -c -o mail_notification-mn-vfs-mailbox.o `test -f 'mn-vfs-mailbox.c' || echo '$(srcdir)/'`mn-vfs-mailbox.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-vfs-mailbox.Tpo $(DEPDIR)/mail_notification-mn-vfs-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-vfs-mailbox.c' object='mail_notification-mn-vfs-mailbox.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-vfs-mailbox.o `test -f 'mn-vfs-mailbox.c' || echo '$(srcdir)/'`mn-vfs-mailbox.c
mail_notification-mn-vfs-mailbox.obj: mn-vfs-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs-mailbox.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-vfs-mailbox.Tpo" -c -o mail_notification-mn-vfs-mailbox.obj `if test -f 'mn-vfs-mailbox.c'; then $(CYGPATH_W) 'mn-vfs-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-vfs-mailbox.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-vfs-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-vfs-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-vfs-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs-mailbox.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-vfs-mailbox.Tpo -c -o mail_notification-mn-vfs-mailbox.obj `if test -f 'mn-vfs-mailbox.c'; then $(CYGPATH_W) 'mn-vfs-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-vfs-mailbox.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-vfs-mailbox.Tpo $(DEPDIR)/mail_notification-mn-vfs-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-vfs-mailbox.c' object='mail_notification-mn-vfs-mailbox.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-vfs-mailbox.obj `if test -f 'mn-vfs-mailbox.c'; then $(CYGPATH_W) 'mn-vfs-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-vfs-mailbox.c'; fi`
mail_notification-mn-vfs-mailbox-backend.o: mn-vfs-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs-mailbox-backend.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Tpo" -c -o mail_notification-mn-vfs-mailbox-backend.o `test -f 'mn-vfs-mailbox-backend.c' || echo '$(srcdir)/'`mn-vfs-mailbox-backend.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs-mailbox-backend.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Tpo -c -o mail_notification-mn-vfs-mailbox-backend.o `test -f 'mn-vfs-mailbox-backend.c' || echo '$(srcdir)/'`mn-vfs-mailbox-backend.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-vfs-mailbox-backend.c' object='mail_notification-mn-vfs-mailbox-backend.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-vfs-mailbox-backend.o `test -f 'mn-vfs-mailbox-backend.c' || echo '$(srcdir)/'`mn-vfs-mailbox-backend.c
mail_notification-mn-vfs-mailbox-backend.obj: mn-vfs-mailbox-backend.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs-mailbox-backend.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Tpo" -c -o mail_notification-mn-vfs-mailbox-backend.obj `if test -f 'mn-vfs-mailbox-backend.c'; then $(CYGPATH_W) 'mn-vfs-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-vfs-mailbox-backend.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Tpo" "$(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs-mailbox-backend.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Tpo -c -o mail_notification-mn-vfs-mailbox-backend.obj `if test -f 'mn-vfs-mailbox-backend.c'; then $(CYGPATH_W) 'mn-vfs-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-vfs-mailbox-backend.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Tpo $(DEPDIR)/mail_notification-mn-vfs-mailbox-backend.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-vfs-mailbox-backend.c' object='mail_notification-mn-vfs-mailbox-backend.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-vfs-mailbox-backend.obj `if test -f 'mn-vfs-mailbox-backend.c'; then $(CYGPATH_W) 'mn-vfs-mailbox-backend.c'; else $(CYGPATH_W) '$(srcdir)/mn-vfs-mailbox-backend.c'; fi`
mail_notification-mn-vfs-message.o: mn-vfs-message.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs-message.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-vfs-message.Tpo" -c -o mail_notification-mn-vfs-message.o `test -f 'mn-vfs-message.c' || echo '$(srcdir)/'`mn-vfs-message.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-vfs-message.Tpo" "$(DEPDIR)/mail_notification-mn-vfs-message.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-vfs-message.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs-message.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-vfs-message.Tpo -c -o mail_notification-mn-vfs-message.o `test -f 'mn-vfs-message.c' || echo '$(srcdir)/'`mn-vfs-message.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-vfs-message.Tpo $(DEPDIR)/mail_notification-mn-vfs-message.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-vfs-message.c' object='mail_notification-mn-vfs-message.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-vfs-message.o `test -f 'mn-vfs-message.c' || echo '$(srcdir)/'`mn-vfs-message.c
mail_notification-mn-vfs-message.obj: mn-vfs-message.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs-message.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-vfs-message.Tpo" -c -o mail_notification-mn-vfs-message.obj `if test -f 'mn-vfs-message.c'; then $(CYGPATH_W) 'mn-vfs-message.c'; else $(CYGPATH_W) '$(srcdir)/mn-vfs-message.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-vfs-message.Tpo" "$(DEPDIR)/mail_notification-mn-vfs-message.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-vfs-message.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-vfs-message.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-vfs-message.Tpo -c -o mail_notification-mn-vfs-message.obj `if test -f 'mn-vfs-message.c'; then $(CYGPATH_W) 'mn-vfs-message.c'; else $(CYGPATH_W) '$(srcdir)/mn-vfs-message.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-vfs-message.Tpo $(DEPDIR)/mail_notification-mn-vfs-message.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-vfs-message.c' object='mail_notification-mn-vfs-message.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-vfs-message.obj `if test -f 'mn-vfs-message.c'; then $(CYGPATH_W) 'mn-vfs-message.c'; else $(CYGPATH_W) '$(srcdir)/mn-vfs-message.c'; fi`
mail_notification-mn-reentrant-mailbox.o: mn-reentrant-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-reentrant-mailbox.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-reentrant-mailbox.Tpo" -c -o mail_notification-mn-reentrant-mailbox.o `test -f 'mn-reentrant-mailbox.c' || echo '$(srcdir)/'`mn-reentrant-mailbox.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-reentrant-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-reentrant-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-reentrant-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-reentrant-mailbox.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-reentrant-mailbox.Tpo -c -o mail_notification-mn-reentrant-mailbox.o `test -f 'mn-reentrant-mailbox.c' || echo '$(srcdir)/'`mn-reentrant-mailbox.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-reentrant-mailbox.Tpo $(DEPDIR)/mail_notification-mn-reentrant-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-reentrant-mailbox.c' object='mail_notification-mn-reentrant-mailbox.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-reentrant-mailbox.o `test -f 'mn-reentrant-mailbox.c' || echo '$(srcdir)/'`mn-reentrant-mailbox.c
mail_notification-mn-reentrant-mailbox.obj: mn-reentrant-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-reentrant-mailbox.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-reentrant-mailbox.Tpo" -c -o mail_notification-mn-reentrant-mailbox.obj `if test -f 'mn-reentrant-mailbox.c'; then $(CYGPATH_W) 'mn-reentrant-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-reentrant-mailbox.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-reentrant-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-reentrant-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-reentrant-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-reentrant-mailbox.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-reentrant-mailbox.Tpo -c -o mail_notification-mn-reentrant-mailbox.obj `if test -f 'mn-reentrant-mailbox.c'; then $(CYGPATH_W) 'mn-reentrant-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-reentrant-mailbox.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-reentrant-mailbox.Tpo $(DEPDIR)/mail_notification-mn-reentrant-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-reentrant-mailbox.c' object='mail_notification-mn-reentrant-mailbox.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-reentrant-mailbox.obj `if test -f 'mn-reentrant-mailbox.c'; then $(CYGPATH_W) 'mn-reentrant-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-reentrant-mailbox.c'; fi`
mail_notification-mn-message-mime.o: mn-message-mime.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-message-mime.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-message-mime.Tpo" -c -o mail_notification-mn-message-mime.o `test -f 'mn-message-mime.c' || echo '$(srcdir)/'`mn-message-mime.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-message-mime.Tpo" "$(DEPDIR)/mail_notification-mn-message-mime.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-message-mime.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-message-mime.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-message-mime.Tpo -c -o mail_notification-mn-message-mime.o `test -f 'mn-message-mime.c' || echo '$(srcdir)/'`mn-message-mime.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-message-mime.Tpo $(DEPDIR)/mail_notification-mn-message-mime.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-message-mime.c' object='mail_notification-mn-message-mime.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-message-mime.o `test -f 'mn-message-mime.c' || echo '$(srcdir)/'`mn-message-mime.c
mail_notification-mn-message-mime.obj: mn-message-mime.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-message-mime.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-message-mime.Tpo" -c -o mail_notification-mn-message-mime.obj `if test -f 'mn-message-mime.c'; then $(CYGPATH_W) 'mn-message-mime.c'; else $(CYGPATH_W) '$(srcdir)/mn-message-mime.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-message-mime.Tpo" "$(DEPDIR)/mail_notification-mn-message-mime.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-message-mime.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-message-mime.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-message-mime.Tpo -c -o mail_notification-mn-message-mime.obj `if test -f 'mn-message-mime.c'; then $(CYGPATH_W) 'mn-message-mime.c'; else $(CYGPATH_W) '$(srcdir)/mn-message-mime.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-message-mime.Tpo $(DEPDIR)/mail_notification-mn-message-mime.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-message-mime.c' object='mail_notification-mn-message-mime.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-message-mime.obj `if test -f 'mn-message-mime.c'; then $(CYGPATH_W) 'mn-message-mime.c'; else $(CYGPATH_W) '$(srcdir)/mn-message-mime.c'; fi`
mail_notification-mn-gmime-stream-vfs.o: mn-gmime-stream-vfs.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-gmime-stream-vfs.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Tpo" -c -o mail_notification-mn-gmime-stream-vfs.o `test -f 'mn-gmime-stream-vfs.c' || echo '$(srcdir)/'`mn-gmime-stream-vfs.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Tpo" "$(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-gmime-stream-vfs.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Tpo -c -o mail_notification-mn-gmime-stream-vfs.o `test -f 'mn-gmime-stream-vfs.c' || echo '$(srcdir)/'`mn-gmime-stream-vfs.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Tpo $(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-gmime-stream-vfs.c' object='mail_notification-mn-gmime-stream-vfs.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-gmime-stream-vfs.o `test -f 'mn-gmime-stream-vfs.c' || echo '$(srcdir)/'`mn-gmime-stream-vfs.c
mail_notification-mn-gmime-stream-vfs.obj: mn-gmime-stream-vfs.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-gmime-stream-vfs.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Tpo" -c -o mail_notification-mn-gmime-stream-vfs.obj `if test -f 'mn-gmime-stream-vfs.c'; then $(CYGPATH_W) 'mn-gmime-stream-vfs.c'; else $(CYGPATH_W) '$(srcdir)/mn-gmime-stream-vfs.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Tpo" "$(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-gmime-stream-vfs.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Tpo -c -o mail_notification-mn-gmime-stream-vfs.obj `if test -f 'mn-gmime-stream-vfs.c'; then $(CYGPATH_W) 'mn-gmime-stream-vfs.c'; else $(CYGPATH_W) '$(srcdir)/mn-gmime-stream-vfs.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Tpo $(DEPDIR)/mail_notification-mn-gmime-stream-vfs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-gmime-stream-vfs.c' object='mail_notification-mn-gmime-stream-vfs.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-gmime-stream-vfs.obj `if test -f 'mn-gmime-stream-vfs.c'; then $(CYGPATH_W) 'mn-gmime-stream-vfs.c'; else $(CYGPATH_W) '$(srcdir)/mn-gmime-stream-vfs.c'; fi`
mail_notification-mn-ssl.o: mn-ssl.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-ssl.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-ssl.Tpo" -c -o mail_notification-mn-ssl.o `test -f 'mn-ssl.c' || echo '$(srcdir)/'`mn-ssl.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-ssl.Tpo" "$(DEPDIR)/mail_notification-mn-ssl.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-ssl.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-ssl.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-ssl.Tpo -c -o mail_notification-mn-ssl.o `test -f 'mn-ssl.c' || echo '$(srcdir)/'`mn-ssl.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-ssl.Tpo $(DEPDIR)/mail_notification-mn-ssl.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-ssl.c' object='mail_notification-mn-ssl.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-ssl.o `test -f 'mn-ssl.c' || echo '$(srcdir)/'`mn-ssl.c
mail_notification-mn-ssl.obj: mn-ssl.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-ssl.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-ssl.Tpo" -c -o mail_notification-mn-ssl.obj `if test -f 'mn-ssl.c'; then $(CYGPATH_W) 'mn-ssl.c'; else $(CYGPATH_W) '$(srcdir)/mn-ssl.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-ssl.Tpo" "$(DEPDIR)/mail_notification-mn-ssl.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-ssl.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-ssl.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-ssl.Tpo -c -o mail_notification-mn-ssl.obj `if test -f 'mn-ssl.c'; then $(CYGPATH_W) 'mn-ssl.c'; else $(CYGPATH_W) '$(srcdir)/mn-ssl.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-ssl.Tpo $(DEPDIR)/mail_notification-mn-ssl.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-ssl.c' object='mail_notification-mn-ssl.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-ssl.obj `if test -f 'mn-ssl.c'; then $(CYGPATH_W) 'mn-ssl.c'; else $(CYGPATH_W) '$(srcdir)/mn-ssl.c'; fi`
mail_notification-mn-sasl.o: mn-sasl.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-sasl.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-sasl.Tpo" -c -o mail_notification-mn-sasl.o `test -f 'mn-sasl.c' || echo '$(srcdir)/'`mn-sasl.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-sasl.Tpo" "$(DEPDIR)/mail_notification-mn-sasl.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-sasl.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-sasl.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-sasl.Tpo -c -o mail_notification-mn-sasl.o `test -f 'mn-sasl.c' || echo '$(srcdir)/'`mn-sasl.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-sasl.Tpo $(DEPDIR)/mail_notification-mn-sasl.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-sasl.c' object='mail_notification-mn-sasl.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-sasl.o `test -f 'mn-sasl.c' || echo '$(srcdir)/'`mn-sasl.c
mail_notification-mn-sasl.obj: mn-sasl.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-sasl.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-sasl.Tpo" -c -o mail_notification-mn-sasl.obj `if test -f 'mn-sasl.c'; then $(CYGPATH_W) 'mn-sasl.c'; else $(CYGPATH_W) '$(srcdir)/mn-sasl.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-sasl.Tpo" "$(DEPDIR)/mail_notification-mn-sasl.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-sasl.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-sasl.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-sasl.Tpo -c -o mail_notification-mn-sasl.obj `if test -f 'mn-sasl.c'; then $(CYGPATH_W) 'mn-sasl.c'; else $(CYGPATH_W) '$(srcdir)/mn-sasl.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-sasl.Tpo $(DEPDIR)/mail_notification-mn-sasl.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-sasl.c' object='mail_notification-mn-sasl.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-sasl.obj `if test -f 'mn-sasl.c'; then $(CYGPATH_W) 'mn-sasl.c'; else $(CYGPATH_W) '$(srcdir)/mn-sasl.c'; fi`
mail_notification-mn-evolution-glue-client.o: mn-evolution-glue-client.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-glue-client.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-evolution-glue-client.Tpo" -c -o mail_notification-mn-evolution-glue-client.o `test -f 'mn-evolution-glue-client.c' || echo '$(srcdir)/'`mn-evolution-glue-client.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-evolution-glue-client.Tpo" "$(DEPDIR)/mail_notification-mn-evolution-glue-client.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-evolution-glue-client.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-glue-client.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-evolution-glue-client.Tpo -c -o mail_notification-mn-evolution-glue-client.o `test -f 'mn-evolution-glue-client.c' || echo '$(srcdir)/'`mn-evolution-glue-client.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-evolution-glue-client.Tpo $(DEPDIR)/mail_notification-mn-evolution-glue-client.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-glue-client.c' object='mail_notification-mn-evolution-glue-client.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-evolution-glue-client.o `test -f 'mn-evolution-glue-client.c' || echo '$(srcdir)/'`mn-evolution-glue-client.c
mail_notification-mn-evolution-glue-client.obj: mn-evolution-glue-client.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-glue-client.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-evolution-glue-client.Tpo" -c -o mail_notification-mn-evolution-glue-client.obj `if test -f 'mn-evolution-glue-client.c'; then $(CYGPATH_W) 'mn-evolution-glue-client.c'; else $(CYGPATH_W) '$(srcdir)/mn-evolution-glue-client.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-evolution-glue-client.Tpo" "$(DEPDIR)/mail_notification-mn-evolution-glue-client.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-evolution-glue-client.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-glue-client.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-evolution-glue-client.Tpo -c -o mail_notification-mn-evolution-glue-client.obj `if test -f 'mn-evolution-glue-client.c'; then $(CYGPATH_W) 'mn-evolution-glue-client.c'; else $(CYGPATH_W) '$(srcdir)/mn-evolution-glue-client.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-evolution-glue-client.Tpo $(DEPDIR)/mail_notification-mn-evolution-glue-client.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-glue-client.c' object='mail_notification-mn-evolution-glue-client.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-evolution-glue-client.obj `if test -f 'mn-evolution-glue-client.c'; then $(CYGPATH_W) 'mn-evolution-glue-client.c'; else $(CYGPATH_W) '$(srcdir)/mn-evolution-glue-client.c'; fi`
mail_notification-mn-bonobo-unknown.o: mn-bonobo-unknown.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-bonobo-unknown.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-bonobo-unknown.Tpo" -c -o mail_notification-mn-bonobo-unknown.o `test -f 'mn-bonobo-unknown.c' || echo '$(srcdir)/'`mn-bonobo-unknown.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-bonobo-unknown.Tpo" "$(DEPDIR)/mail_notification-mn-bonobo-unknown.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-bonobo-unknown.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-bonobo-unknown.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-bonobo-unknown.Tpo -c -o mail_notification-mn-bonobo-unknown.o `test -f 'mn-bonobo-unknown.c' || echo '$(srcdir)/'`mn-bonobo-unknown.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-bonobo-unknown.Tpo $(DEPDIR)/mail_notification-mn-bonobo-unknown.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-bonobo-unknown.c' object='mail_notification-mn-bonobo-unknown.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-bonobo-unknown.o `test -f 'mn-bonobo-unknown.c' || echo '$(srcdir)/'`mn-bonobo-unknown.c
mail_notification-mn-bonobo-unknown.obj: mn-bonobo-unknown.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-bonobo-unknown.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-bonobo-unknown.Tpo" -c -o mail_notification-mn-bonobo-unknown.obj `if test -f 'mn-bonobo-unknown.c'; then $(CYGPATH_W) 'mn-bonobo-unknown.c'; else $(CYGPATH_W) '$(srcdir)/mn-bonobo-unknown.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-bonobo-unknown.Tpo" "$(DEPDIR)/mail_notification-mn-bonobo-unknown.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-bonobo-unknown.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-bonobo-unknown.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-bonobo-unknown.Tpo -c -o mail_notification-mn-bonobo-unknown.obj `if test -f 'mn-bonobo-unknown.c'; then $(CYGPATH_W) 'mn-bonobo-unknown.c'; else $(CYGPATH_W) '$(srcdir)/mn-bonobo-unknown.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-bonobo-unknown.Tpo $(DEPDIR)/mail_notification-mn-bonobo-unknown.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-bonobo-unknown.c' object='mail_notification-mn-bonobo-unknown.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-bonobo-unknown.obj `if test -f 'mn-bonobo-unknown.c'; then $(CYGPATH_W) 'mn-bonobo-unknown.c'; else $(CYGPATH_W) '$(srcdir)/mn-bonobo-unknown.c'; fi`
mail_notification-mn-evolution-mailbox.o: mn-evolution-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-mailbox.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-evolution-mailbox.Tpo" -c -o mail_notification-mn-evolution-mailbox.o `test -f 'mn-evolution-mailbox.c' || echo '$(srcdir)/'`mn-evolution-mailbox.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-evolution-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-evolution-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-evolution-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-mailbox.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-evolution-mailbox.Tpo -c -o mail_notification-mn-evolution-mailbox.o `test -f 'mn-evolution-mailbox.c' || echo '$(srcdir)/'`mn-evolution-mailbox.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-evolution-mailbox.Tpo $(DEPDIR)/mail_notification-mn-evolution-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-mailbox.c' object='mail_notification-mn-evolution-mailbox.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-evolution-mailbox.o `test -f 'mn-evolution-mailbox.c' || echo '$(srcdir)/'`mn-evolution-mailbox.c
mail_notification-mn-evolution-mailbox.obj: mn-evolution-mailbox.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-mailbox.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-evolution-mailbox.Tpo" -c -o mail_notification-mn-evolution-mailbox.obj `if test -f 'mn-evolution-mailbox.c'; then $(CYGPATH_W) 'mn-evolution-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-evolution-mailbox.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-evolution-mailbox.Tpo" "$(DEPDIR)/mail_notification-mn-evolution-mailbox.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-evolution-mailbox.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-mailbox.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-evolution-mailbox.Tpo -c -o mail_notification-mn-evolution-mailbox.obj `if test -f 'mn-evolution-mailbox.c'; then $(CYGPATH_W) 'mn-evolution-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-evolution-mailbox.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-evolution-mailbox.Tpo $(DEPDIR)/mail_notification-mn-evolution-mailbox.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-mailbox.c' object='mail_notification-mn-evolution-mailbox.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-evolution-mailbox.obj `if test -f 'mn-evolution-mailbox.c'; then $(CYGPATH_W) 'mn-evolution-mailbox.c'; else $(CYGPATH_W) '$(srcdir)/mn-evolution-mailbox.c'; fi`
mail_notification-mn-evolution-mailbox-properties.o: mn-evolution-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-mailbox-properties.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Tpo" -c -o mail_notification-mn-evolution-mailbox-properties.o `test -f 'mn-evolution-mailbox-properties.c' || echo '$(srcdir)/'`mn-evolution-mailbox-properties.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-mailbox-properties.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Tpo -c -o mail_notification-mn-evolution-mailbox-properties.o `test -f 'mn-evolution-mailbox-properties.c' || echo '$(srcdir)/'`mn-evolution-mailbox-properties.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-mailbox-properties.c' object='mail_notification-mn-evolution-mailbox-properties.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-evolution-mailbox-properties.o `test -f 'mn-evolution-mailbox-properties.c' || echo '$(srcdir)/'`mn-evolution-mailbox-properties.c
mail_notification-mn-evolution-mailbox-properties.obj: mn-evolution-mailbox-properties.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-mailbox-properties.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Tpo" -c -o mail_notification-mn-evolution-mailbox-properties.obj `if test -f 'mn-evolution-mailbox-properties.c'; then $(CYGPATH_W) 'mn-evolution-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-evolution-mailbox-properties.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Tpo" "$(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-mailbox-properties.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Tpo -c -o mail_notification-mn-evolution-mailbox-properties.obj `if test -f 'mn-evolution-mailbox-properties.c'; then $(CYGPATH_W) 'mn-evolution-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-evolution-mailbox-properties.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Tpo $(DEPDIR)/mail_notification-mn-evolution-mailbox-properties.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-mailbox-properties.c' object='mail_notification-mn-evolution-mailbox-properties.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-evolution-mailbox-properties.obj `if test -f 'mn-evolution-mailbox-properties.c'; then $(CYGPATH_W) 'mn-evolution-mailbox-properties.c'; else $(CYGPATH_W) '$(srcdir)/mn-evolution-mailbox-properties.c'; fi`
mail_notification-mn-evolution-message.o: mn-evolution-message.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-message.o -MD -MP -MF "$(DEPDIR)/mail_notification-mn-evolution-message.Tpo" -c -o mail_notification-mn-evolution-message.o `test -f 'mn-evolution-message.c' || echo '$(srcdir)/'`mn-evolution-message.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-evolution-message.Tpo" "$(DEPDIR)/mail_notification-mn-evolution-message.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-evolution-message.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-message.o -MD -MP -MF $(DEPDIR)/mail_notification-mn-evolution-message.Tpo -c -o mail_notification-mn-evolution-message.o `test -f 'mn-evolution-message.c' || echo '$(srcdir)/'`mn-evolution-message.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-evolution-message.Tpo $(DEPDIR)/mail_notification-mn-evolution-message.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-message.c' object='mail_notification-mn-evolution-message.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-evolution-message.o `test -f 'mn-evolution-message.c' || echo '$(srcdir)/'`mn-evolution-message.c
mail_notification-mn-evolution-message.obj: mn-evolution-message.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-message.obj -MD -MP -MF "$(DEPDIR)/mail_notification-mn-evolution-message.Tpo" -c -o mail_notification-mn-evolution-message.obj `if test -f 'mn-evolution-message.c'; then $(CYGPATH_W) 'mn-evolution-message.c'; else $(CYGPATH_W) '$(srcdir)/mn-evolution-message.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-mn-evolution-message.Tpo" "$(DEPDIR)/mail_notification-mn-evolution-message.Po"; else rm -f "$(DEPDIR)/mail_notification-mn-evolution-message.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-mn-evolution-message.obj -MD -MP -MF $(DEPDIR)/mail_notification-mn-evolution-message.Tpo -c -o mail_notification-mn-evolution-message.obj `if test -f 'mn-evolution-message.c'; then $(CYGPATH_W) 'mn-evolution-message.c'; else $(CYGPATH_W) '$(srcdir)/mn-evolution-message.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-mn-evolution-message.Tpo $(DEPDIR)/mail_notification-mn-evolution-message.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mn-evolution-message.c' object='mail_notification-mn-evolution-message.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-mn-evolution-message.obj `if test -f 'mn-evolution-message.c'; then $(CYGPATH_W) 'mn-evolution-message.c'; else $(CYGPATH_W) '$(srcdir)/mn-evolution-message.c'; fi`
mail_notification-GNOME_MailNotification-common.o: GNOME_MailNotification-common.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification-common.o -MD -MP -MF "$(DEPDIR)/mail_notification-GNOME_MailNotification-common.Tpo" -c -o mail_notification-GNOME_MailNotification-common.o `test -f 'GNOME_MailNotification-common.c' || echo '$(srcdir)/'`GNOME_MailNotification-common.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-GNOME_MailNotification-common.Tpo" "$(DEPDIR)/mail_notification-GNOME_MailNotification-common.Po"; else rm -f "$(DEPDIR)/mail_notification-GNOME_MailNotification-common.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification-common.o -MD -MP -MF $(DEPDIR)/mail_notification-GNOME_MailNotification-common.Tpo -c -o mail_notification-GNOME_MailNotification-common.o `test -f 'GNOME_MailNotification-common.c' || echo '$(srcdir)/'`GNOME_MailNotification-common.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-GNOME_MailNotification-common.Tpo $(DEPDIR)/mail_notification-GNOME_MailNotification-common.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification-common.c' object='mail_notification-GNOME_MailNotification-common.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-GNOME_MailNotification-common.o `test -f 'GNOME_MailNotification-common.c' || echo '$(srcdir)/'`GNOME_MailNotification-common.c
mail_notification-GNOME_MailNotification-common.obj: GNOME_MailNotification-common.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification-common.obj -MD -MP -MF "$(DEPDIR)/mail_notification-GNOME_MailNotification-common.Tpo" -c -o mail_notification-GNOME_MailNotification-common.obj `if test -f 'GNOME_MailNotification-common.c'; then $(CYGPATH_W) 'GNOME_MailNotification-common.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification-common.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-GNOME_MailNotification-common.Tpo" "$(DEPDIR)/mail_notification-GNOME_MailNotification-common.Po"; else rm -f "$(DEPDIR)/mail_notification-GNOME_MailNotification-common.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification-common.obj -MD -MP -MF $(DEPDIR)/mail_notification-GNOME_MailNotification-common.Tpo -c -o mail_notification-GNOME_MailNotification-common.obj `if test -f 'GNOME_MailNotification-common.c'; then $(CYGPATH_W) 'GNOME_MailNotification-common.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification-common.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-GNOME_MailNotification-common.Tpo $(DEPDIR)/mail_notification-GNOME_MailNotification-common.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification-common.c' object='mail_notification-GNOME_MailNotification-common.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-GNOME_MailNotification-common.obj `if test -f 'GNOME_MailNotification-common.c'; then $(CYGPATH_W) 'GNOME_MailNotification-common.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification-common.c'; fi`
mail_notification-GNOME_MailNotification-skels.o: GNOME_MailNotification-skels.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification-skels.o -MD -MP -MF "$(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Tpo" -c -o mail_notification-GNOME_MailNotification-skels.o `test -f 'GNOME_MailNotification-skels.c' || echo '$(srcdir)/'`GNOME_MailNotification-skels.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Tpo" "$(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Po"; else rm -f "$(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification-skels.o -MD -MP -MF $(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Tpo -c -o mail_notification-GNOME_MailNotification-skels.o `test -f 'GNOME_MailNotification-skels.c' || echo '$(srcdir)/'`GNOME_MailNotification-skels.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Tpo $(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification-skels.c' object='mail_notification-GNOME_MailNotification-skels.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-GNOME_MailNotification-skels.o `test -f 'GNOME_MailNotification-skels.c' || echo '$(srcdir)/'`GNOME_MailNotification-skels.c
mail_notification-GNOME_MailNotification-skels.obj: GNOME_MailNotification-skels.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification-skels.obj -MD -MP -MF "$(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Tpo" -c -o mail_notification-GNOME_MailNotification-skels.obj `if test -f 'GNOME_MailNotification-skels.c'; then $(CYGPATH_W) 'GNOME_MailNotification-skels.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification-skels.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Tpo" "$(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Po"; else rm -f "$(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification-skels.obj -MD -MP -MF $(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Tpo -c -o mail_notification-GNOME_MailNotification-skels.obj `if test -f 'GNOME_MailNotification-skels.c'; then $(CYGPATH_W) 'GNOME_MailNotification-skels.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification-skels.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Tpo $(DEPDIR)/mail_notification-GNOME_MailNotification-skels.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification-skels.c' object='mail_notification-GNOME_MailNotification-skels.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-GNOME_MailNotification-skels.obj `if test -f 'GNOME_MailNotification-skels.c'; then $(CYGPATH_W) 'GNOME_MailNotification-skels.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification-skels.c'; fi`
mail_notification-GNOME_MailNotification-stubs.o: GNOME_MailNotification-stubs.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification-stubs.o -MD -MP -MF "$(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Tpo" -c -o mail_notification-GNOME_MailNotification-stubs.o `test -f 'GNOME_MailNotification-stubs.c' || echo '$(srcdir)/'`GNOME_MailNotification-stubs.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Tpo" "$(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Po"; else rm -f "$(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification-stubs.o -MD -MP -MF $(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Tpo -c -o mail_notification-GNOME_MailNotification-stubs.o `test -f 'GNOME_MailNotification-stubs.c' || echo '$(srcdir)/'`GNOME_MailNotification-stubs.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Tpo $(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification-stubs.c' object='mail_notification-GNOME_MailNotification-stubs.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-GNOME_MailNotification-stubs.o `test -f 'GNOME_MailNotification-stubs.c' || echo '$(srcdir)/'`GNOME_MailNotification-stubs.c
mail_notification-GNOME_MailNotification-stubs.obj: GNOME_MailNotification-stubs.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification-stubs.obj -MD -MP -MF "$(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Tpo" -c -o mail_notification-GNOME_MailNotification-stubs.obj `if test -f 'GNOME_MailNotification-stubs.c'; then $(CYGPATH_W) 'GNOME_MailNotification-stubs.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification-stubs.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Tpo" "$(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Po"; else rm -f "$(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification-stubs.obj -MD -MP -MF $(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Tpo -c -o mail_notification-GNOME_MailNotification-stubs.obj `if test -f 'GNOME_MailNotification-stubs.c'; then $(CYGPATH_W) 'GNOME_MailNotification-stubs.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification-stubs.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Tpo $(DEPDIR)/mail_notification-GNOME_MailNotification-stubs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification-stubs.c' object='mail_notification-GNOME_MailNotification-stubs.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-GNOME_MailNotification-stubs.obj `if test -f 'GNOME_MailNotification-stubs.c'; then $(CYGPATH_W) 'GNOME_MailNotification-stubs.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification-stubs.c'; fi`
mail_notification-GNOME_MailNotification_Evolution-common.o: GNOME_MailNotification_Evolution-common.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification_Evolution-common.o -MD -MP -MF "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Tpo" -c -o mail_notification-GNOME_MailNotification_Evolution-common.o `test -f 'GNOME_MailNotification_Evolution-common.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-common.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Tpo" "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Po"; else rm -f "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification_Evolution-common.o -MD -MP -MF $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Tpo -c -o mail_notification-GNOME_MailNotification_Evolution-common.o `test -f 'GNOME_MailNotification_Evolution-common.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-common.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Tpo $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification_Evolution-common.c' object='mail_notification-GNOME_MailNotification_Evolution-common.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-GNOME_MailNotification_Evolution-common.o `test -f 'GNOME_MailNotification_Evolution-common.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-common.c
mail_notification-GNOME_MailNotification_Evolution-common.obj: GNOME_MailNotification_Evolution-common.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification_Evolution-common.obj -MD -MP -MF "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Tpo" -c -o mail_notification-GNOME_MailNotification_Evolution-common.obj `if test -f 'GNOME_MailNotification_Evolution-common.c'; then $(CYGPATH_W) 'GNOME_MailNotification_Evolution-common.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification_Evolution-common.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Tpo" "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Po"; else rm -f "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification_Evolution-common.obj -MD -MP -MF $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Tpo -c -o mail_notification-GNOME_MailNotification_Evolution-common.obj `if test -f 'GNOME_MailNotification_Evolution-common.c'; then $(CYGPATH_W) 'GNOME_MailNotification_Evolution-common.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification_Evolution-common.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Tpo $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-common.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification_Evolution-common.c' object='mail_notification-GNOME_MailNotification_Evolution-common.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-GNOME_MailNotification_Evolution-common.obj `if test -f 'GNOME_MailNotification_Evolution-common.c'; then $(CYGPATH_W) 'GNOME_MailNotification_Evolution-common.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification_Evolution-common.c'; fi`
mail_notification-GNOME_MailNotification_Evolution-skels.o: GNOME_MailNotification_Evolution-skels.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification_Evolution-skels.o -MD -MP -MF "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Tpo" -c -o mail_notification-GNOME_MailNotification_Evolution-skels.o `test -f 'GNOME_MailNotification_Evolution-skels.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-skels.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Tpo" "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Po"; else rm -f "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification_Evolution-skels.o -MD -MP -MF $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Tpo -c -o mail_notification-GNOME_MailNotification_Evolution-skels.o `test -f 'GNOME_MailNotification_Evolution-skels.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-skels.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Tpo $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification_Evolution-skels.c' object='mail_notification-GNOME_MailNotification_Evolution-skels.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-GNOME_MailNotification_Evolution-skels.o `test -f 'GNOME_MailNotification_Evolution-skels.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-skels.c
mail_notification-GNOME_MailNotification_Evolution-skels.obj: GNOME_MailNotification_Evolution-skels.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification_Evolution-skels.obj -MD -MP -MF "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Tpo" -c -o mail_notification-GNOME_MailNotification_Evolution-skels.obj `if test -f 'GNOME_MailNotification_Evolution-skels.c'; then $(CYGPATH_W) 'GNOME_MailNotification_Evolution-skels.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification_Evolution-skels.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Tpo" "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Po"; else rm -f "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification_Evolution-skels.obj -MD -MP -MF $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Tpo -c -o mail_notification-GNOME_MailNotification_Evolution-skels.obj `if test -f 'GNOME_MailNotification_Evolution-skels.c'; then $(CYGPATH_W) 'GNOME_MailNotification_Evolution-skels.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification_Evolution-skels.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Tpo $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-skels.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification_Evolution-skels.c' object='mail_notification-GNOME_MailNotification_Evolution-skels.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-GNOME_MailNotification_Evolution-skels.obj `if test -f 'GNOME_MailNotification_Evolution-skels.c'; then $(CYGPATH_W) 'GNOME_MailNotification_Evolution-skels.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification_Evolution-skels.c'; fi`
mail_notification-GNOME_MailNotification_Evolution-stubs.o: GNOME_MailNotification_Evolution-stubs.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification_Evolution-stubs.o -MD -MP -MF "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Tpo" -c -o mail_notification-GNOME_MailNotification_Evolution-stubs.o `test -f 'GNOME_MailNotification_Evolution-stubs.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-stubs.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Tpo" "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Po"; else rm -f "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification_Evolution-stubs.o -MD -MP -MF $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Tpo -c -o mail_notification-GNOME_MailNotification_Evolution-stubs.o `test -f 'GNOME_MailNotification_Evolution-stubs.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-stubs.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Tpo $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification_Evolution-stubs.c' object='mail_notification-GNOME_MailNotification_Evolution-stubs.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-GNOME_MailNotification_Evolution-stubs.o `test -f 'GNOME_MailNotification_Evolution-stubs.c' || echo '$(srcdir)/'`GNOME_MailNotification_Evolution-stubs.c
mail_notification-GNOME_MailNotification_Evolution-stubs.obj: GNOME_MailNotification_Evolution-stubs.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification_Evolution-stubs.obj -MD -MP -MF "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Tpo" -c -o mail_notification-GNOME_MailNotification_Evolution-stubs.obj `if test -f 'GNOME_MailNotification_Evolution-stubs.c'; then $(CYGPATH_W) 'GNOME_MailNotification_Evolution-stubs.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification_Evolution-stubs.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Tpo" "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Po"; else rm -f "$(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail_notification-GNOME_MailNotification_Evolution-stubs.obj -MD -MP -MF $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Tpo -c -o mail_notification-GNOME_MailNotification_Evolution-stubs.obj `if test -f 'GNOME_MailNotification_Evolution-stubs.c'; then $(CYGPATH_W) 'GNOME_MailNotification_Evolution-stubs.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification_Evolution-stubs.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Tpo $(DEPDIR)/mail_notification-GNOME_MailNotification_Evolution-stubs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='GNOME_MailNotification_Evolution-stubs.c' object='mail_notification-GNOME_MailNotification_Evolution-stubs.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mail_notification_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail_notification-GNOME_MailNotification_Evolution-stubs.obj `if test -f 'GNOME_MailNotification_Evolution-stubs.c'; then $(CYGPATH_W) 'GNOME_MailNotification_Evolution-stubs.c'; else $(CYGPATH_W) '$(srcdir)/GNOME_MailNotification_Evolution-stubs.c'; fi`
@@ -2296,13 +2270,9 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
install-evolution_pluginDATA: $(evolution_plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(evolution_plugindir)" || $(mkdir_p) "$(DESTDIR)$(evolution_plugindir)"
+ test -z "$(evolution_plugindir)" || $(MKDIR_P) "$(DESTDIR)$(evolution_plugindir)"
@list='$(evolution_plugin_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -2367,23 +2337,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; 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"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -2400,7 +2368,7 @@ check: $(BUILT_SOURCES)
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(evolution_plugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(evolution_plugindir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
@@ -2439,7 +2407,7 @@ distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+ distclean-tags
dvi: dvi-am
@@ -2454,12 +2422,20 @@ info-am:
install-data-am: install-evolution_pluginDATA \
install-evolution_pluginLTLIBRARIES
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -2481,22 +2457,27 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-evolution_pluginDATA \
- uninstall-evolution_pluginLTLIBRARIES uninstall-info-am
+ uninstall-evolution_pluginLTLIBRARIES
+
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-evolution_pluginLTLIBRARIES clean-generic clean-libtool \
ctags distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-evolution_pluginDATA \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-evolution_pluginDATA \
install-evolution_pluginLTLIBRARIES 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 mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-evolution_pluginDATA \
- uninstall-evolution_pluginLTLIBRARIES uninstall-info-am
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-evolution_pluginDATA \
+ uninstall-evolution_pluginLTLIBRARIES
Makefile.am: automake.xml $(AML)
diff --git a/src/aml.make b/src/aml.make
@@ -1,12 +1,12 @@
if WITH_EVOLUTION
-evolution_eplug = org-gnome-mail-notification.eplug
+evolution_eplug = org-jylefort-mail-notification.eplug
evolution_plugin_DATA = $(evolution_eplug)
endif
IDLFLAGS = $(BONOBO_IDLFLAGS)
CLEANFILES += $(evolution_eplug)
-EXTRA_DIST = $(evolution_eplug).in
+EXTRA_DIST = automake.xml $(evolution_eplug).in
%.eplug: %.eplug.in
sed -e 's|\@PLUGINDIR\@|$(evolution_plugindir)|' $< > $@
diff --git a/src/automake.xml b/src/automake.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<makefile>
+ <program name="mail-notification">
+ <cppflags>$(WARN_CFLAGS)</cppflags>
+ <cppflags>$(DEBUG_CFLAGS)</cppflags>
+ <cppflags>-I$(top_srcdir)</cppflags>
+ <cppflags>-DG_LOG_DOMAIN="\"$(PACKAGE)\""</cppflags>
+ <cppflags>-DPREFIX="\"$(prefix)\""</cppflags>
+ <cppflags>-DSYSCONFDIR="\"$(sysconfdir)\""</cppflags>
+ <cppflags>-DDATADIR="\"$(datadir)\""</cppflags>
+ <cppflags>-DLIBDIR="\"$(libdir)\""</cppflags>
+ <cppflags>-DGNOMELOCALEDIR="\"$(datadir)/locale\""</cppflags>
+ <cppflags>-DUIDIR="\"$(pkgdatadir)/ui\""</cppflags>
+
+ <!-- We add the -export-dynamic flag (which libtool will translate into -->
+ <!-- the proper linker flag) because libglade needs to resolve symbols -->
+ <!-- from our own binary in order to autoconnect signal handlers. -->
+ <ldflags>-export-dynamic</ldflags>
+
+ <ldflags>$(INTLLIBS)</ldflags>
+
+ <package name="gnome"/>
+
+ <source name="mn-main.c"/>
+
+ <module name="eggtrayicon"/>
+ <module name="mn-conf"/>
+ <module name="mn-locked-callback"/>
+ <module name="mn-stock"/>
+ <module name="mn-util"/>
+ <module name="mn-vfs"/>
+ <module name="mn-xml"/>
+ <module name="nautilus-cell-renderer-pixbuf-emblem"/>
+
+ <class name="MN:About:Dialog"/>
+ <class name="MN:Autodetect:Mailbox:Properties"/>
+ <class name="MN:Automation"/>
+ <class name="MN:Blinking:Image"/>
+ <class name="MN:Compact:Message:View"/>
+ <class name="MN:Dialog"/>
+ <class name="MN:Mail:Icon"/>
+ <class name="MN:Mailbox"/>
+ <class name="MN:Mailbox:Properties"/>
+ <class name="MN:Mailbox:Properties:Dialog"/>
+ <class name="MN:Mailbox:View"/>
+ <class name="MN:Mailboxes"/>
+ <class name="MN:Message"/>
+ <class name="MN:Message:View"/>
+ <class name="MN:Popup"/>
+ <class name="MN:Popups"/>
+ <class name="MN:Properties:Dialog"/>
+ <class name="MN:Shell"/>
+ <class name="MN:Standard:Message:View"/>
+ <class name="MN:Test:Mailbox"/>
+ <class name="MN:Text:Table"/>
+ <class name="MN:Tooltips"/>
+
+ <interface name="GNOME:MailNotification"/>
+
+ <if test="WITH_MBOX">
+ <class name="MN:Mbox:Mailbox:Backend"/>
+ </if>
+
+ <if test="WITH_MOZILLA">
+ <class name="MN:Mozilla:Mailbox:Backend"/>
+ </if>
+
+ <if test="WITH_MBOX_OR_MOZILLA">
+ <class name="MN:Base:Mbox:Mailbox:Backend"/>
+ </if>
+
+ <if test="WITH_MH">
+ <class name="MN:MH:Mailbox:Backend"/>
+ </if>
+
+ <if test="WITH_MAILDIR">
+ <class name="MN:Maildir:Mailbox:Backend"/>
+ </if>
+
+ <if test="WITH_POP3">
+ <module name="mn-md5"/>
+ <class name="MN:POP3:Mailbox"/>
+ <class name="MN:POP3:Mailbox:Properties"/>
+ </if>
+
+ <if test="WITH_IMAP">
+ <class name="MN:IMAP:Mailbox"/>
+ <class name="MN:IMAP:Mailbox:Properties"/>
+ </if>
+
+ <if test="WITH_POP3_OR_IMAP">
+ <module name="mn-client-session"/>
+ <class name="MN:Auth:Combo:Box"/>
+ <class name="MN:PI:Mailbox"/>
+ <class name="MN:PI:Mailbox:Properties"/>
+ </if>
+
+ <if test="WITH_POP3_OR_IMAP_OR_GMAIL">
+ <class name="MN:Authenticated:Mailbox"/>
+ <class name="MN:Authenticated:Mailbox:Properties"/>
+ </if>
+
+ <if test="WITH_SYLPHEED">
+ <class name="MN:Sylpheed:Mailbox:Backend"/>
+ </if>
+
+ <if test="WITH_GMAIL">
+ <class name="MN:Gmail:Mailbox"/>
+ <class name="MN:Gmail:Mailbox:Properties"/>
+ </if>
+
+ <if test="WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED">
+ <class name="MN:Custom:VFS:Mailbox"/>
+ <class name="MN:System:VFS:Mailbox"/>
+ <class name="MN:System:VFS:Mailbox:Properties"/>
+ <class name="MN:VFS:Mailbox"/>
+ <class name="MN:VFS:Mailbox:Backend"/>
+ <class name="MN:VFS:Message"/>
+ </if>
+
+ <if test="WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION">
+ <class name="MN:Reentrant:Mailbox"/>
+ </if>
+
+ <if test="WITH_MIME">
+ <package name="gmime"/>
+ <module name="mn-message-mime"/>
+ <class name="MN:GMime:Stream:VFS"/>
+ </if>
+
+ <if test="WITH_SSL">
+ <package name="openssl"/>
+ <module name="mn-ssl"/>
+ </if>
+
+ <if test="WITH_SASL">
+ <package name="sasl"/>
+ <module name="mn-sasl"/>
+ </if>
+
+ <if test="WITH_EVOLUTION">
+ <cppflags>$(EVOLUTION_PLUGIN_CFLAGS)</cppflags>
+
+ <source name="mn-evolution.h"/>
+
+ <module name="mn-evolution-glue-client"/>
+
+ <class name="MN:Bonobo:Unknown"/>
+ <class name="MN:Evolution:Mailbox"/>
+ <class name="MN:Evolution:Mailbox:Properties"/>
+ <class name="MN:Evolution:Message"/>
+
+ <interface name="GNOME:MailNotification:Evolution"/>
+ </if>
+ </program>
+
+ <if test="WITH_EVOLUTION">
+ <library name="liborg-jylefort-mail-notification.la" dir="evolution_plugin">
+ <cppflags>$(WARN_CFLAGS)</cppflags>
+ <cppflags>$(DEBUG_CFLAGS)</cppflags>
+ <cppflags>-I$(top_srcdir)</cppflags>
+ <cppflags>-DG_LOG_DOMAIN="\"$(PACKAGE)\""</cppflags>
+
+ <ldflags>-avoid-version -module</ldflags>
+
+ <package name="evolution-plugin"/>
+
+ <source name="mn-evolution-plugin.c"/>
+ <source name="mn-evolution.h"/>
+
+ <class name="MN:Evolution:Folder:Tree:Control"/>
+ <class name="MN:Evolution:Glue"/>
+
+ <interface name="GNOME:MailNotification:Evolution"/>
+ </library>
+ </if>
+</makefile>
diff --git a/src/mn-about-dialog.c b/src/mn-about-dialog.c
@@ -24,7 +24,7 @@
#line 27 "mn-about-dialog.gob"
-#include <gnome.h>
+#include <glib/gi18n.h>
#include "mn-util.h"
#line 31 "mn-about-dialog.c"
diff --git a/src/mn-about-dialog.gob b/src/mn-about-dialog.gob
@@ -25,7 +25,7 @@ requires 2.0.14
%}
%{
-#include <gnome.h>
+#include <glib/gi18n.h>
#include "mn-util.h"
%}
diff --git a/src/mn-auth-combo-box.c b/src/mn-auth-combo-box.c
@@ -141,14 +141,14 @@ mn_auth_combo_box_class_init (MNAuthComboBoxClass * c G_GNUC_UNUSED)
}
}
#undef __GOB_FUNCTION__
-#line 89 "mn-auth-combo-box.gob"
+#line 86 "mn-auth-combo-box.gob"
static void
mn_auth_combo_box_init (MNAuthComboBox * self G_GNUC_UNUSED)
#line 148 "mn-auth-combo-box.c"
{
#define __GOB_FUNCTION__ "MN:Auth:Combo:Box::init"
{
-#line 90 "mn-auth-combo-box.gob"
+#line 87 "mn-auth-combo-box.gob"
GtkListStore *store;
GtkCellRenderer *renderer;
@@ -211,9 +211,8 @@ ___object_set_property (GObject *object,
gboolean valid;
model = gtk_combo_box_get_model(GTK_COMBO_BOX(self));
- valid = gtk_tree_model_get_iter_first(model, &iter);
- while (valid)
+ MN_TREE_MODEL_FOREACH(valid, &iter, model)
{
char *this_mech;
gboolean found;
@@ -228,11 +227,9 @@ ___object_set_property (GObject *object,
gtk_combo_box_set_active_iter(GTK_COMBO_BOX(self), &iter);
break;
}
-
- valid = gtk_tree_model_iter_next(model, &iter);
}
-#line 236 "mn-auth-combo-box.c"
+#line 233 "mn-auth-combo-box.c"
}
break;
default:
@@ -261,7 +258,7 @@ ___object_get_property (GObject *object,
switch (property_id) {
case PROP_ACTIVE_MECHANISM:
{
-#line 76 "mn-auth-combo-box.gob"
+#line 73 "mn-auth-combo-box.gob"
char *mechanism = NULL;
GtkTreeIter iter;
@@ -274,7 +271,7 @@ ___object_get_property (GObject *object,
g_value_take_string(VAL, mechanism);
-#line 278 "mn-auth-combo-box.c"
+#line 275 "mn-auth-combo-box.c"
}
break;
default:
@@ -290,41 +287,41 @@ ___object_get_property (GObject *object,
#undef __GOB_FUNCTION__
-#line 76 "mn-auth-combo-box.gob"
+#line 73 "mn-auth-combo-box.gob"
gchar *
mn_auth_combo_box_get_active_mechanism (MNAuthComboBox * self)
-#line 297 "mn-auth-combo-box.c"
+#line 294 "mn-auth-combo-box.c"
{
#define __GOB_FUNCTION__ "MN:Auth:Combo:Box::get_active_mechanism"
{
#line 45 "mn-auth-combo-box.gob"
gchar* val; g_object_get (G_OBJECT (self), "active_mechanism", &val, NULL); return val;
}}
-#line 304 "mn-auth-combo-box.c"
+#line 301 "mn-auth-combo-box.c"
#undef __GOB_FUNCTION__
#line 47 "mn-auth-combo-box.gob"
void
mn_auth_combo_box_set_active_mechanism (MNAuthComboBox * self, gchar * val)
-#line 310 "mn-auth-combo-box.c"
+#line 307 "mn-auth-combo-box.c"
{
#define __GOB_FUNCTION__ "MN:Auth:Combo:Box::set_active_mechanism"
{
#line 45 "mn-auth-combo-box.gob"
g_object_set (G_OBJECT (self), "active_mechanism", val, NULL);
}}
-#line 317 "mn-auth-combo-box.c"
+#line 314 "mn-auth-combo-box.c"
#undef __GOB_FUNCTION__
-#line 126 "mn-auth-combo-box.gob"
+#line 123 "mn-auth-combo-box.gob"
static int
mn_auth_combo_box_sort_cb (GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer user_data)
-#line 324 "mn-auth-combo-box.c"
+#line 321 "mn-auth-combo-box.c"
{
#define __GOB_FUNCTION__ "MN:Auth:Combo:Box::sort_cb"
{
-#line 131 "mn-auth-combo-box.gob"
+#line 128 "mn-auth-combo-box.gob"
char *mechanism_a;
char *label_a;
@@ -354,24 +351,24 @@ mn_auth_combo_box_sort_cb (GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter *
return coll;
}}
-#line 358 "mn-auth-combo-box.c"
+#line 355 "mn-auth-combo-box.c"
#undef __GOB_FUNCTION__
-#line 161 "mn-auth-combo-box.gob"
+#line 158 "mn-auth-combo-box.gob"
void
mn_auth_combo_box_append (MNAuthComboBox * self, const char * mechanism, const char * label)
-#line 364 "mn-auth-combo-box.c"
+#line 361 "mn-auth-combo-box.c"
{
#define __GOB_FUNCTION__ "MN:Auth:Combo:Box::append"
-#line 161 "mn-auth-combo-box.gob"
+#line 158 "mn-auth-combo-box.gob"
g_return_if_fail (self != NULL);
-#line 161 "mn-auth-combo-box.gob"
+#line 158 "mn-auth-combo-box.gob"
g_return_if_fail (MN_IS_AUTH_COMBO_BOX (self));
-#line 161 "mn-auth-combo-box.gob"
+#line 158 "mn-auth-combo-box.gob"
g_return_if_fail (label != NULL);
-#line 373 "mn-auth-combo-box.c"
+#line 370 "mn-auth-combo-box.c"
{
-#line 163 "mn-auth-combo-box.gob"
+#line 160 "mn-auth-combo-box.gob"
GtkTreeModel *model;
GtkTreeIter iter;
@@ -384,19 +381,19 @@ mn_auth_combo_box_append (MNAuthComboBox * self, const char * mechanism, const c
COLUMN_LABEL, label,
-1);
}}
-#line 388 "mn-auth-combo-box.c"
+#line 385 "mn-auth-combo-box.c"
#undef __GOB_FUNCTION__
-#line 176 "mn-auth-combo-box.gob"
+#line 173 "mn-auth-combo-box.gob"
GtkWidget *
mn_auth_combo_box_new (void)
-#line 394 "mn-auth-combo-box.c"
+#line 391 "mn-auth-combo-box.c"
{
#define __GOB_FUNCTION__ "MN:Auth:Combo:Box::new"
{
-#line 178 "mn-auth-combo-box.gob"
+#line 175 "mn-auth-combo-box.gob"
return GTK_WIDGET(GET_NEW);
}}
-#line 402 "mn-auth-combo-box.c"
+#line 399 "mn-auth-combo-box.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-auth-combo-box.gob b/src/mn-auth-combo-box.gob
@@ -51,9 +51,8 @@ class MN:Auth:Combo:Box from Gtk:Combo:Box
gboolean valid;
model = gtk_combo_box_get_model(GTK_COMBO_BOX(self));
- valid = gtk_tree_model_get_iter_first(model, &iter);
- while (valid)
+ MN_TREE_MODEL_FOREACH(valid, &iter, model)
{
char *this_mech;
gboolean found;
@@ -68,8 +67,6 @@ class MN:Auth:Combo:Box from Gtk:Combo:Box
gtk_combo_box_set_active_iter(GTK_COMBO_BOX(self), &iter);
break;
}
-
- valid = gtk_tree_model_iter_next(model, &iter);
}
}
get
diff --git a/src/mn-client-session.c b/src/mn-client-session.c
@@ -51,6 +51,7 @@
#include <eel/eel.h>
#if WITH_SSL
#include <openssl/err.h>
+#include <openssl/x509v3.h>
#include "mn-ssl.h"
#endif /* WITH_SSL */
#if WITH_SASL
@@ -115,9 +116,17 @@ static struct addrinfo *mn_client_session_resolve (MNClientSession *session);
static int mn_client_session_connect (MNClientSession *session, struct addrinfo *addrinfo);
#if WITH_SSL
+static GSList *mn_client_session_ssl_get_certificate_servers (X509 *cert);
+static gboolean mn_client_session_ssl_check_server_name (const char *user_name,
+ const char *cert_name);
+static gboolean mn_client_session_ssl_check_server_name_from_list (const char *user_name,
+ const GSList *cert_names);
+static char *mn_client_session_ssl_get_verify_error (MNClientSession *session,
+ X509 *cert);
static gboolean mn_client_session_ssl_verify (MNClientSession *session);
static gboolean mn_client_session_run_untrusted_dialog (const char *server,
- const char *reason);
+ const char *reason,
+ const char *cert_fingerprint);
#endif
static int mn_client_session_enter_state (MNClientSession *session, int id);
@@ -414,21 +423,220 @@ mn_client_session_enable_ssl (MNClientSession *session)
return TRUE;
}
+/**
+ * mn_client_session_ssl_get_certificate_servers():
+ * @cert: the server certificate
+ *
+ * Returns the list of server names (commonName and subjectAltName)
+ * contained in @cert.
+ *
+ * Return value: a newly-allocated list of UTF-8 server names. When no
+ * longer used, the list must be freed with eel_g_slist_free_deep().
+ **/
+static GSList *
+mn_client_session_ssl_get_certificate_servers (X509 *cert)
+{
+ GSList *servers = NULL;
+ X509_NAME *subject;
+ void *ext;
+
+ g_return_val_if_fail(cert != NULL, NULL);
+
+ /* append the commonName entries */
+
+ subject = X509_get_subject_name(cert);
+ if (subject)
+ {
+ int pos = -1;
+
+ while (TRUE)
+ {
+ X509_NAME_ENTRY *entry;
+ ASN1_STRING *data;
+ int len;
+ unsigned char *str;
+
+ pos = X509_NAME_get_index_by_NID(subject, NID_commonName, pos);
+ if (pos == -1)
+ break;
+
+ entry = X509_NAME_get_entry(subject, pos);
+ if (! entry)
+ continue;
+
+ data = X509_NAME_ENTRY_get_data(entry);
+ if (! data)
+ continue;
+
+ len = ASN1_STRING_to_UTF8(&str, data);
+ if (len < 0)
+ continue;
+
+ g_assert(g_utf8_validate(str, len, NULL));
+
+ servers = g_slist_append(servers, g_strndup(str, len));
+ OPENSSL_free(str);
+ }
+ }
+
+ /*
+ * RFC 3501 11.1: "If a subjectAltName extension of type dNSName is
+ * present in the certificate, it SHOULD be used as the source of
+ * the server's identity."
+ */
+
+ ext = X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL);
+ if (ext)
+ {
+ int count;
+ int i;
+
+ count = sk_GENERAL_NAME_num(ext);
+ for (i = 0; i < count; i++)
+ {
+ GENERAL_NAME *name;
+
+ name = sk_GENERAL_NAME_value(ext, i);
+ if (name
+ && name->type == GEN_DNS
+ && name->d.ia5->data
+ && g_utf8_validate(name->d.ia5->data, -1, NULL))
+ servers = g_slist_append(servers, g_strdup(name->d.ia5->data));
+ }
+ }
+
+ return servers;
+}
+
+static gboolean
+mn_client_session_ssl_check_server_name (const char *user_name,
+ const char *cert_name)
+{
+ g_return_val_if_fail(user_name != NULL, FALSE);
+ g_return_val_if_fail(cert_name != NULL, FALSE);
+
+ /*
+ * RFC 3501 11.1: "A "*" wildcard character MAY be used as the
+ * left-most name component in the certificate. For example,
+ * *.example.com would match a.example.com, foo.example.com,
+ * etc. but would not match example.com."
+ */
+
+ if (g_str_has_prefix(cert_name, "*."))
+ {
+ const char *domain = cert_name + 1;
+
+ return mn_utf8_str_case_has_suffix(user_name, domain) && strlen(user_name) > strlen(domain);
+ }
+ else
+ return ! mn_utf8_strcasecmp(user_name, cert_name);
+}
+
+static gboolean
+mn_client_session_ssl_check_server_name_from_list (const char *user_name,
+ const GSList *cert_names)
+{
+ const GSList *l;
+
+ g_return_val_if_fail(user_name != NULL, FALSE);
+
+ MN_LIST_FOREACH(l, cert_names)
+ {
+ const char *cert_name = l->data;
+
+ if (mn_client_session_ssl_check_server_name(user_name, cert_name))
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static char *
+mn_client_session_ssl_get_verify_error (MNClientSession *session, X509 *cert)
+{
+ long verify_result;
+ GSList *servers;
+ char *error = NULL;
+
+ g_return_val_if_fail(session != NULL, NULL);
+ g_return_val_if_fail(session->ssl != NULL, NULL);
+ g_return_val_if_fail(cert != NULL, NULL);
+
+ /* check the result of the OpenSSL verification */
+
+ verify_result = SSL_get_verify_result(session->ssl);
+ if (verify_result != X509_V_OK)
+ {
+ /*
+ * X509_verify_cert_error_string() is thread-unsafe (it can
+ * return a pointer to a temporary static buffer).
+ */
+ G_LOCK(mn_ssl);
+ error = g_strdup(X509_verify_cert_error_string(verify_result));
+ G_UNLOCK(mn_ssl);
+
+ return error;
+ }
+
+ /*
+ * Check if the user-provided server name matches one of the
+ * certificate-provided server names. This is required for IMAP (RFC
+ * 3501 11.1) and cannot hurt for POP3.
+ */
+
+ servers = mn_client_session_ssl_get_certificate_servers(cert);
+ if (! servers)
+ return g_strdup(_("server name not found in certificate"));
+
+ if (! mn_client_session_ssl_check_server_name_from_list(session->server, servers))
+ {
+ if (g_slist_length(servers) == 1)
+ error = g_strdup_printf(_("user-provided server name \"%s\" does not match certificate-provided server name \"%s\""),
+ session->server, (char *) servers->data);
+ else
+ {
+ GString *servers_comma_list;
+ GSList *l;
+
+ servers_comma_list = g_string_new(NULL);
+
+ MN_LIST_FOREACH(l, servers)
+ {
+ char *server = l->data;
+
+ g_string_append_printf(servers_comma_list, "\"%s\"", server);
+ if (l->next)
+ g_string_append(servers_comma_list, ", ");
+ }
+
+ error = g_strdup_printf(_("user-provided server name \"%s\" matches none of the certificate-provided server names %s"),
+ session->server, servers_comma_list->str);
+
+ g_string_free(servers_comma_list, TRUE);
+ }
+ }
+
+ eel_g_slist_free_deep(servers);
+
+ return error;
+}
+
static gboolean
mn_client_session_ssl_verify (MNClientSession *session)
{
X509 *cert;
gboolean status = FALSE;
+ g_return_val_if_fail(session != NULL, FALSE);
g_return_val_if_fail(session->ssl != NULL, FALSE);
cert = SSL_get_peer_certificate(session->ssl);
if (cert)
{
- long verify_result;
+ char *error;
- verify_result = SSL_get_verify_result(session->ssl);
- if (verify_result == X509_V_OK)
+ error = mn_client_session_ssl_get_verify_error(session, cert);
+ if (! error)
status = TRUE;
else
{
@@ -451,13 +659,7 @@ mn_client_session_ssl_verify (MNClientSession *session)
status = TRUE;
else
{
- char *reason;
-
- reason = g_strdup_printf(_("%s, fingerprint: %s"),
- X509_verify_cert_error_string(verify_result),
- fingerprint);
-
- if (mn_client_session_run_untrusted_dialog(session->server, reason))
+ if (mn_client_session_run_untrusted_dialog(session->server, error, fingerprint))
{
status = TRUE;
gconf_fingerprints = g_slist_append(gconf_fingerprints, g_strdup(fingerprint));
@@ -466,6 +668,7 @@ mn_client_session_ssl_verify (MNClientSession *session)
}
eel_g_slist_free_deep(gconf_fingerprints);
+ g_free(error);
}
X509_free(cert);
@@ -482,7 +685,7 @@ mn_client_session_ssl_verify (MNClientSession *session)
status = TRUE;
else
{
- if (mn_client_session_run_untrusted_dialog(session->server, _("missing certificate")))
+ if (mn_client_session_run_untrusted_dialog(session->server, _("missing certificate"), NULL))
{
status = TRUE;
gconf_servers = g_slist_append(gconf_servers, g_strdup(server));
@@ -499,33 +702,42 @@ mn_client_session_ssl_verify (MNClientSession *session)
static gboolean
mn_client_session_run_untrusted_dialog (const char *server,
- const char *reason)
+ const char *reason,
+ const char *cert_fingerprint)
{
GtkWidget *dialog;
- char *secondary;
+ GString *secondary;
gboolean status;
g_return_val_if_fail(server != NULL, FALSE);
g_return_val_if_fail(reason != NULL, FALSE);
- secondary = g_strdup_printf(_("Mail Notification was unable to trust \"%s\" "
- "(%s). It is possible that someone is "
- "intercepting your communication to obtain "
- "your confidential information.\n"
- "\n"
- "You should only connect to the server if you "
- "are certain you are connected to \"%s\". "
- "If you choose to connect to the server, this "
- "message will not be shown again."),
- server, reason, server);
+ secondary = g_string_new(NULL);
+ g_string_printf(secondary,
+ _("Mail Notification was unable to trust \"%s\" "
+ "(%s). It is possible that someone is "
+ "intercepting your communication to obtain "
+ "your confidential information.\n"
+ "\n"
+ "You should only connect to the server if you "
+ "are certain you are connected to \"%s\". "
+ "If you choose to connect to the server, this "
+ "message will not be shown again."),
+ server, reason, server);
+
+ if (cert_fingerprint)
+ {
+ g_string_append(secondary, "\n\n");
+ g_string_append_printf(secondary, _("Certificate fingerprint: %s."), cert_fingerprint);
+ }
GDK_THREADS_ENTER();
dialog = mn_alert_dialog_new(NULL,
GTK_MESSAGE_WARNING, 0,
_("Connect to untrusted server?"),
- secondary);
- g_free(secondary);
+ secondary->str);
+ g_string_free(secondary, TRUE);
gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_dialog_add_button(GTK_DIALOG(dialog), MN_STOCK_CONNECT, GTK_RESPONSE_OK);
diff --git a/src/mn-conf.c b/src/mn-conf.c
@@ -23,6 +23,7 @@
#include <sys/stat.h>
#include <errno.h>
#include <stdarg.h>
+#include <glib/gi18n.h>
#include <gnome.h>
#include <eel/eel.h>
#include "mn-util.h"
diff --git a/src/mn-conf.h b/src/mn-conf.h
@@ -81,6 +81,8 @@
MN_CONF_POPUPS_EXPIRATION_DELAY_NAMESPACE "/minutes"
#define MN_CONF_POPUPS_EXPIRATION_DELAY_SECONDS \
MN_CONF_POPUPS_EXPIRATION_DELAY_NAMESPACE "/seconds"
+#define MN_CONF_POPUPS_ACTIONS \
+ MN_CONF_POPUPS_NAMESPACE "/actions"
/* obsolete keys */
#define MN_CONF_OBSOLETE_MAILBOXES \
diff --git a/src/mn-evolution-mailbox-properties.c b/src/mn-evolution-mailbox-properties.c
@@ -446,7 +446,7 @@ mn_evolution_mailbox_properties_contact_error (MNEvolutionMailboxProperties * se
selfp->selected_uri_listener = bonobo_object_release_unref(selfp->selected_uri_listener, NULL);
selfp->activated_listener = bonobo_object_release_unref(selfp->activated_listener, NULL);
- label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded."));
+ label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Jean-Yves Lefort's Mail Notification plugin is loaded."));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
diff --git a/src/mn-evolution-mailbox-properties.gob b/src/mn-evolution-mailbox-properties.gob
@@ -201,7 +201,7 @@ class MN:Evolution:Mailbox:Properties from MN:Mailbox:Properties
selfp->selected_uri_listener = bonobo_object_release_unref(selfp->selected_uri_listener, NULL);
selfp->activated_listener = bonobo_object_release_unref(selfp->activated_listener, NULL);
- label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded."));
+ label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Jean-Yves Lefort's Mail Notification plugin is loaded."));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
diff --git a/src/mn-evolution-message.c b/src/mn-evolution-message.c
@@ -91,6 +91,7 @@ static gboolean ___3_mn_evolution_message_open_impl (MNMessage * message, GError
static gboolean mn_evolution_message_set_flags (MNEvolutionMessage * self, guint32 flags, GError ** err) G_GNUC_UNUSED;
static gboolean ___5_mn_evolution_message_mark_as_read_impl (MNMessage * message, GError ** err) G_GNUC_UNUSED;
static gboolean ___6_mn_evolution_message_mark_as_spam_impl (MNMessage * message, GError ** err) G_GNUC_UNUSED;
+static gboolean ___7_mn_evolution_message_delete_impl (MNMessage * message, GError ** err) G_GNUC_UNUSED;
enum {
PROP_0,
@@ -156,7 +157,7 @@ ___finalize(GObject *obj_self)
(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);
#line 73 "mn-evolution-message.gob"
if(self->_priv->uid) { g_free ((gpointer) self->_priv->uid); self->_priv->uid = NULL; }
-#line 160 "mn-evolution-message.c"
+#line 161 "mn-evolution-message.c"
}
#undef __GOB_FUNCTION__
@@ -186,7 +187,9 @@ mn_evolution_message_class_init (MNEvolutionMessageClass * c G_GNUC_UNUSED)
mn_message_class->mark_as_read_impl = ___5_mn_evolution_message_mark_as_read_impl;
#line 121 "mn-evolution-message.gob"
mn_message_class->mark_as_spam_impl = ___6_mn_evolution_message_mark_as_spam_impl;
-#line 190 "mn-evolution-message.c"
+#line 127 "mn-evolution-message.gob"
+ mn_message_class->delete_impl = ___7_mn_evolution_message_delete_impl;
+#line 193 "mn-evolution-message.c"
g_object_class->finalize = ___finalize;
g_object_class->get_property = ___object_get_property;
g_object_class->set_property = ___object_set_property;
@@ -222,7 +225,7 @@ ___object_set_property (GObject *object,
{
#line 74 "mn-evolution-message.gob"
{ char *old = self->_priv->uid; self->_priv->uid = g_value_dup_string (VAL); g_free (old); }
-#line 226 "mn-evolution-message.c"
+#line 229 "mn-evolution-message.c"
}
break;
default:
@@ -253,7 +256,7 @@ ___object_get_property (GObject *object,
{
#line 74 "mn-evolution-message.gob"
g_value_set_string (VAL, self->_priv->uid);
-#line 257 "mn-evolution-message.c"
+#line 260 "mn-evolution-message.c"
}
break;
default:
@@ -273,12 +276,12 @@ g_value_set_string (VAL, self->_priv->uid);
#line 76 "mn-evolution-message.gob"
MNMessage *
mn_evolution_message_new (MNMailbox * mailbox, time_t sent_time, const char * id, const char * from, const char * subject, MNMessageFlags flags, const char * uid)
-#line 277 "mn-evolution-message.c"
+#line 280 "mn-evolution-message.c"
{
#define __GOB_FUNCTION__ "MN:Evolution:Message::new"
#line 76 "mn-evolution-message.gob"
g_return_val_if_fail (uid != NULL, (MNMessage * )0);
-#line 282 "mn-evolution-message.c"
+#line 285 "mn-evolution-message.c"
{
#line 84 "mn-evolution-message.gob"
@@ -291,13 +294,13 @@ mn_evolution_message_new (MNMailbox * mailbox, time_t sent_time, const char * id
MN_EVOLUTION_MESSAGE_PROP_UID((char *) uid),
NULL));
}}
-#line 295 "mn-evolution-message.c"
+#line 298 "mn-evolution-message.c"
#undef __GOB_FUNCTION__
#line 95 "mn-evolution-message.gob"
static gboolean
___2_mn_evolution_message_can_open_impl (MNMessage * message G_GNUC_UNUSED)
-#line 301 "mn-evolution-message.c"
+#line 304 "mn-evolution-message.c"
#define PARENT_HANDLER(___message) \
((MN_MESSAGE_CLASS(parent_class)->can_open_impl)? \
(* MN_MESSAGE_CLASS(parent_class)->can_open_impl)(___message): \
@@ -309,14 +312,14 @@ ___2_mn_evolution_message_can_open_impl (MNMessage * message G_GNUC_UNUSED)
return TRUE;
}}
-#line 313 "mn-evolution-message.c"
+#line 316 "mn-evolution-message.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
#line 101 "mn-evolution-message.gob"
static gboolean
___3_mn_evolution_message_open_impl (MNMessage * message G_GNUC_UNUSED, GError ** err)
-#line 320 "mn-evolution-message.c"
+#line 323 "mn-evolution-message.c"
#define PARENT_HANDLER(___message,___err) \
((MN_MESSAGE_CLASS(parent_class)->open_impl)? \
(* MN_MESSAGE_CLASS(parent_class)->open_impl)(___message,___err): \
@@ -329,34 +332,34 @@ ___3_mn_evolution_message_open_impl (MNMessage * message G_GNUC_UNUSED, GError *
Self *self = SELF(message);
GLUE_METHOD(GNOME_MailNotification_Evolution_Glue_openMessage(glue, mailbox->uri, selfp->uid, &env));
}}
-#line 333 "mn-evolution-message.c"
+#line 336 "mn-evolution-message.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
#line 108 "mn-evolution-message.gob"
static gboolean
mn_evolution_message_set_flags (MNEvolutionMessage * self, guint32 flags, GError ** err)
-#line 340 "mn-evolution-message.c"
+#line 343 "mn-evolution-message.c"
{
#define __GOB_FUNCTION__ "MN:Evolution:Message::set_flags"
#line 108 "mn-evolution-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
#line 108 "mn-evolution-message.gob"
g_return_val_if_fail (MN_IS_EVOLUTION_MESSAGE (self), (gboolean )0);
-#line 347 "mn-evolution-message.c"
+#line 350 "mn-evolution-message.c"
{
#line 110 "mn-evolution-message.gob"
MNMessage *message = MN_MESSAGE(self);
GLUE_METHOD(GNOME_MailNotification_Evolution_Glue_setMessageFlags(glue, mailbox->uri, selfp->uid, flags, &env));
}}
-#line 354 "mn-evolution-message.c"
+#line 357 "mn-evolution-message.c"
#undef __GOB_FUNCTION__
#line 115 "mn-evolution-message.gob"
static gboolean
___5_mn_evolution_message_mark_as_read_impl (MNMessage * message G_GNUC_UNUSED, GError ** err)
-#line 360 "mn-evolution-message.c"
+#line 363 "mn-evolution-message.c"
#define PARENT_HANDLER(___message,___err) \
((MN_MESSAGE_CLASS(parent_class)->mark_as_read_impl)? \
(* MN_MESSAGE_CLASS(parent_class)->mark_as_read_impl)(___message,___err): \
@@ -368,14 +371,14 @@ ___5_mn_evolution_message_mark_as_read_impl (MNMessage * message G_GNUC_UNUSED,
return self_set_flags(SELF(message), CAMEL_MESSAGE_SEEN, err);
}}
-#line 372 "mn-evolution-message.c"
+#line 375 "mn-evolution-message.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
#line 121 "mn-evolution-message.gob"
static gboolean
___6_mn_evolution_message_mark_as_spam_impl (MNMessage * message G_GNUC_UNUSED, GError ** err)
-#line 379 "mn-evolution-message.c"
+#line 382 "mn-evolution-message.c"
#define PARENT_HANDLER(___message,___err) \
((MN_MESSAGE_CLASS(parent_class)->mark_as_spam_impl)? \
(* MN_MESSAGE_CLASS(parent_class)->mark_as_spam_impl)(___message,___err): \
@@ -387,6 +390,25 @@ ___6_mn_evolution_message_mark_as_spam_impl (MNMessage * message G_GNUC_UNUSED,
return self_set_flags(SELF(message), CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_JUNK | CAMEL_MESSAGE_JUNK_LEARN, err);
}}
-#line 391 "mn-evolution-message.c"
+#line 394 "mn-evolution-message.c"
+#undef __GOB_FUNCTION__
+#undef PARENT_HANDLER
+
+#line 127 "mn-evolution-message.gob"
+static gboolean
+___7_mn_evolution_message_delete_impl (MNMessage * message G_GNUC_UNUSED, GError ** err)
+#line 401 "mn-evolution-message.c"
+#define PARENT_HANDLER(___message,___err) \
+ ((MN_MESSAGE_CLASS(parent_class)->delete_impl)? \
+ (* MN_MESSAGE_CLASS(parent_class)->delete_impl)(___message,___err): \
+ ((gboolean )0))
+{
+#define __GOB_FUNCTION__ "MN:Evolution:Message::delete_impl"
+{
+#line 129 "mn-evolution-message.gob"
+
+ return self_set_flags(SELF(message), CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED, err);
+ }}
+#line 413 "mn-evolution-message.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
diff --git a/src/mn-evolution-message.gob b/src/mn-evolution-message.gob
@@ -123,4 +123,10 @@ class MN:Evolution:Message from MN:Message
{
return self_set_flags(SELF(message), CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_JUNK | CAMEL_MESSAGE_JUNK_LEARN, err);
}
+
+ override (MN:Message) gboolean
+ delete_impl (MNMessage *message, GError **err)
+ {
+ return self_set_flags(SELF(message), CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED, err);
+ }
}
diff --git a/src/mn-evolution-plugin.c b/src/mn-evolution-plugin.c
@@ -133,8 +133,8 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
}
void
-org_gnome_mail_notification_folder_changed (EPlugin *plugin,
- EMEventTargetFolder *folder)
+org_jylefort_mail_notification_folder_changed (EPlugin *plugin,
+ EMEventTargetFolder *folder)
{
if (mn_evolution_glues)
{
@@ -160,8 +160,8 @@ org_gnome_mail_notification_folder_changed (EPlugin *plugin,
}
void
-org_gnome_mail_notification_message_reading (EPlugin *plugin,
- EMEventTargetMessage *message)
+org_jylefort_mail_notification_message_reading (EPlugin *plugin,
+ EMEventTargetMessage *message)
{
if (mn_evolution_glues)
{
diff --git a/src/mn-imap-mailbox-private.h b/src/mn-imap-mailbox-private.h
@@ -16,11 +16,11 @@ extern "C" {
#line 18 "mn-imap-mailbox-private.h"
struct _MNIMAPMailboxPrivate {
-#line 161 "mn-imap-mailbox.gob"
+#line 153 "mn-imap-mailbox.gob"
int removed;
-#line 164 "mn-imap-mailbox.gob"
+#line 156 "mn-imap-mailbox.gob"
GMutex * mutex;
-#line 166 "mn-imap-mailbox.gob"
+#line 158 "mn-imap-mailbox.gob"
MNClientSessionPrivate * idle_session;
#line 26 "mn-imap-mailbox-private.h"
};
diff --git a/src/mn-imap-mailbox-properties.c b/src/mn-imap-mailbox-properties.c
@@ -265,7 +265,7 @@ ___object_get_property (GObject *object,
mailbox = gtk_entry_get_text(GTK_ENTRY(selfp->mailbox_entry));
complete = *server && (! other_active || *mailbox);
-#ifndef WITH_SSL
+#if ! WITH_SSL
if (complete)
complete = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pi->conn_radio[MN_PI_MAILBOX_CONNECTION_TYPE_NORMAL]));
#endif /* WITH_SSL */
diff --git a/src/mn-imap-mailbox-properties.gob b/src/mn-imap-mailbox-properties.gob
@@ -65,7 +65,7 @@ class MN:IMAP:Mailbox:Properties from MN:PI:Mailbox:Properties
mailbox = gtk_entry_get_text(GTK_ENTRY(selfp->mailbox_entry));
complete = *server && (! other_active || *mailbox);
-#ifndef WITH_SSL
+#if ! WITH_SSL
if (complete)
complete = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pi->conn_radio[MN_PI_MAILBOX_CONNECTION_TYPE_NORMAL]));
#endif /* WITH_SSL */
diff --git a/src/mn-imap-mailbox.c b/src/mn-imap-mailbox.c
@@ -86,8 +86,6 @@ struct _MNClientSessionPrivate
GSList *auth_mechanisms;
gboolean authenticated;
- gboolean search_received;
-
GHashTable *unseen_numbers;
GHashTable *recent_numbers;
GHashTable *received_numbers;
@@ -117,18 +115,12 @@ struct _MNClientSessionResponse
char *arguments;
};
-typedef struct
-{
- MNClientSessionPrivate *priv;
- gboolean error;
-} CheckReceivedInfo;
-
int mn_imap_mailbox_default_ports[MN_PI_MAILBOX_N_CONNECTION_TYPES] = { 143, 143, 993 };
/* variable taken from Evolution (camel-utf8.c) */
static char *utf7_alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,";
-#line 132 "mn-imap-mailbox.c"
+#line 124 "mn-imap-mailbox.c"
static const GEnumValue _mn_imap_mailbox_use_idle_values[] = {
{ MN_IMAP_MAILBOX_USE_IDLE_NEVER, (char *)"MN_IMAP_MAILBOX_USE_IDLE_NEVER", (char *)"never" },
{ MN_IMAP_MAILBOX_USE_IDLE_AUTODETECT, (char *)"MN_IMAP_MAILBOX_USE_IDLE_AUTODETECT", (char *)"autodetect" },
@@ -185,12 +177,11 @@ static int mn_imap_mailbox_handle_search_recent_cb (MNClientSession * session, M
static int mn_imap_mailbox_enter_fetch_cb (MNClientSession * session, MNClientSessionPrivate * priv) G_GNUC_UNUSED;
static void mn_imap_mailbox_build_fetch_set_cb (gpointer key, gpointer value, gpointer user_data) G_GNUC_UNUSED;
static int mn_imap_mailbox_handle_fetch_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv) G_GNUC_UNUSED;
-static void mn_imap_mailbox_check_received_cb (gpointer key, gpointer value, gpointer user_data) G_GNUC_UNUSED;
static int mn_imap_mailbox_enter_idle_cb (MNClientSession * session, MNClientSessionPrivate * priv) G_GNUC_UNUSED;
static int mn_imap_mailbox_handle_idle_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv) G_GNUC_UNUSED;
static int mn_imap_mailbox_enter_logout_cb (MNClientSession * session, MNClientSessionPrivate * priv) G_GNUC_UNUSED;
static int mn_imap_mailbox_handle_logout_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv) G_GNUC_UNUSED;
-static void ___1e_mn_imap_mailbox_authenticated_check (MNAuthenticatedMailbox * mailbox) G_GNUC_UNUSED;
+static void ___1d_mn_imap_mailbox_authenticated_check (MNAuthenticatedMailbox * mailbox) G_GNUC_UNUSED;
static MNClientSessionResponse * mn_imap_mailbox_response_new_cb (MNClientSession * session, const char * input, MNClientSessionPrivate * priv) G_GNUC_UNUSED;
static void mn_imap_mailbox_response_free_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv) G_GNUC_UNUSED;
static int mn_imap_mailbox_default_handler (MNClientSessionResponse * response, MNClientSessionPrivate * priv, int error_code_when_bye) G_GNUC_UNUSED;
@@ -198,7 +189,7 @@ static void mn_imap_mailbox_pre_read_cb (MNClientSession * session, MNClientSess
static void mn_imap_mailbox_post_read_cb (MNClientSession * session, MNClientSessionPrivate * priv) G_GNUC_UNUSED;
static gboolean mn_imap_mailbox_idle_inactivity_timeout_cb (gpointer data) G_GNUC_UNUSED;
static int mn_imap_mailbox_session_write (MNClientSessionPrivate * priv, const char * format, ...) G_GNUC_UNUSED;
-static gboolean mn_imap_mailbox_handle_capability_code (MNClientSessionPrivate * priv, MNClientSessionResponse * response) G_GNUC_UNUSED;
+static gboolean mn_imap_mailbox_session_handle_capability_code (MNClientSessionPrivate * priv, MNClientSessionResponse * response) G_GNUC_UNUSED;
static void mn_imap_mailbox_session_parse_capabilities (MNClientSessionPrivate * priv, const char * capabilities) G_GNUC_UNUSED;
static gboolean mn_imap_mailbox_session_has_capability (MNClientSessionPrivate * priv, const char * capability) G_GNUC_UNUSED;
static int mn_imap_mailbox_session_after_capability (MNClientSessionPrivate * priv) G_GNUC_UNUSED;
@@ -240,7 +231,6 @@ static MNPIMailboxClass *parent_class = NULL;
#define self_enter_fetch_cb mn_imap_mailbox_enter_fetch_cb
#define self_build_fetch_set_cb mn_imap_mailbox_build_fetch_set_cb
#define self_handle_fetch_cb mn_imap_mailbox_handle_fetch_cb
-#define self_check_received_cb mn_imap_mailbox_check_received_cb
#define self_enter_idle_cb mn_imap_mailbox_enter_idle_cb
#define self_handle_idle_cb mn_imap_mailbox_handle_idle_cb
#define self_enter_logout_cb mn_imap_mailbox_enter_logout_cb
@@ -252,7 +242,7 @@ static MNPIMailboxClass *parent_class = NULL;
#define self_post_read_cb mn_imap_mailbox_post_read_cb
#define self_idle_inactivity_timeout_cb mn_imap_mailbox_idle_inactivity_timeout_cb
#define self_session_write mn_imap_mailbox_session_write
-#define self_handle_capability_code mn_imap_mailbox_handle_capability_code
+#define self_session_handle_capability_code mn_imap_mailbox_session_handle_capability_code
#define self_session_parse_capabilities mn_imap_mailbox_session_parse_capabilities
#define self_session_has_capability mn_imap_mailbox_session_has_capability
#define self_session_after_capability mn_imap_mailbox_session_after_capability
@@ -316,19 +306,19 @@ ___finalize(GObject *obj_self)
gpointer priv G_GNUC_UNUSED = self->_priv;
if(G_OBJECT_CLASS(parent_class)->finalize) \
(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);
-#line 164 "mn-imap-mailbox.gob"
+#line 156 "mn-imap-mailbox.gob"
if(self->_priv->mutex) { g_mutex_free ((gpointer) self->_priv->mutex); self->_priv->mutex = NULL; }
-#line 322 "mn-imap-mailbox.c"
-#line 168 "mn-imap-mailbox.gob"
+#line 312 "mn-imap-mailbox.c"
+#line 160 "mn-imap-mailbox.gob"
if(self->mailbox) { g_free ((gpointer) self->mailbox); self->mailbox = NULL; }
-#line 325 "mn-imap-mailbox.c"
+#line 315 "mn-imap-mailbox.c"
}
#undef __GOB_FUNCTION__
-#line 183 "mn-imap-mailbox.gob"
+#line 175 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_class_init (MNIMAPMailboxClass * class G_GNUC_UNUSED)
-#line 332 "mn-imap-mailbox.c"
+#line 322 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::class_init"
GObjectClass *g_object_class G_GNUC_UNUSED = (GObjectClass*) class;
@@ -339,15 +329,15 @@ mn_imap_mailbox_class_init (MNIMAPMailboxClass * class G_GNUC_UNUSED)
parent_class = g_type_class_ref (MN_TYPE_PI_MAILBOX);
-#line 194 "mn-imap-mailbox.gob"
+#line 186 "mn-imap-mailbox.gob"
mn_mailbox_class->seal = ___3_mn_imap_mailbox_seal;
-#line 214 "mn-imap-mailbox.gob"
+#line 206 "mn-imap-mailbox.gob"
mn_mailbox_class->parse_uri = ___4_mn_imap_mailbox_parse_uri;
-#line 315 "mn-imap-mailbox.gob"
+#line 307 "mn-imap-mailbox.gob"
mn_mailbox_class->removed = ___6_mn_imap_mailbox_removed;
-#line 1009 "mn-imap-mailbox.gob"
- mn_authenticated_mailbox_class->authenticated_check = ___1e_mn_imap_mailbox_authenticated_check;
-#line 351 "mn-imap-mailbox.c"
+#line 999 "mn-imap-mailbox.gob"
+ mn_authenticated_mailbox_class->authenticated_check = ___1d_mn_imap_mailbox_authenticated_check;
+#line 341 "mn-imap-mailbox.c"
g_object_class->finalize = ___finalize;
g_object_class->get_property = ___object_get_property;
g_object_class->set_property = ___object_set_property;
@@ -375,31 +365,31 @@ mn_imap_mailbox_class_init (MNIMAPMailboxClass * class G_GNUC_UNUSED)
param_spec);
}
{
-#line 184 "mn-imap-mailbox.gob"
+#line 176 "mn-imap-mailbox.gob"
MN_MAILBOX_CLASS(class)->type = "imap";
MN_PI_MAILBOX_CLASS(class)->default_ports = mn_imap_mailbox_default_ports;
-#line 384 "mn-imap-mailbox.c"
+#line 374 "mn-imap-mailbox.c"
}
}
#undef __GOB_FUNCTION__
-#line 189 "mn-imap-mailbox.gob"
+#line 181 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_init (MNIMAPMailbox * self G_GNUC_UNUSED)
-#line 391 "mn-imap-mailbox.c"
+#line 381 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::init"
self->_priv = G_TYPE_INSTANCE_GET_PRIVATE(self,MN_TYPE_IMAP_MAILBOX,MNIMAPMailboxPrivate);
-#line 164 "mn-imap-mailbox.gob"
+#line 156 "mn-imap-mailbox.gob"
self->_priv->mutex = g_mutex_new();
-#line 397 "mn-imap-mailbox.c"
+#line 387 "mn-imap-mailbox.c"
{
-#line 190 "mn-imap-mailbox.gob"
+#line 182 "mn-imap-mailbox.gob"
mn_mailbox_set_format(MN_MAILBOX(self), "IMAP");
-#line 403 "mn-imap-mailbox.c"
+#line 393 "mn-imap-mailbox.c"
}
}
#undef __GOB_FUNCTION__
@@ -418,16 +408,16 @@ ___object_set_property (GObject *object,
switch (property_id) {
case PROP_MAILBOX:
{
-#line 169 "mn-imap-mailbox.gob"
+#line 161 "mn-imap-mailbox.gob"
{ char *old = self->mailbox; self->mailbox = g_value_dup_string (VAL); g_free (old); }
-#line 424 "mn-imap-mailbox.c"
+#line 414 "mn-imap-mailbox.c"
}
break;
case PROP_USE_IDLE_EXTENSION:
{
-#line 177 "mn-imap-mailbox.gob"
+#line 169 "mn-imap-mailbox.gob"
self->use_idle_extension = g_value_get_enum (VAL);
-#line 431 "mn-imap-mailbox.c"
+#line 421 "mn-imap-mailbox.c"
}
break;
default:
@@ -456,16 +446,16 @@ ___object_get_property (GObject *object,
switch (property_id) {
case PROP_MAILBOX:
{
-#line 169 "mn-imap-mailbox.gob"
+#line 161 "mn-imap-mailbox.gob"
g_value_set_string (VAL, self->mailbox);
-#line 462 "mn-imap-mailbox.c"
+#line 452 "mn-imap-mailbox.c"
}
break;
case PROP_USE_IDLE_EXTENSION:
{
-#line 177 "mn-imap-mailbox.gob"
+#line 169 "mn-imap-mailbox.gob"
g_value_set_enum (VAL, self->use_idle_extension);
-#line 469 "mn-imap-mailbox.c"
+#line 459 "mn-imap-mailbox.c"
}
break;
default:
@@ -482,17 +472,17 @@ g_value_set_enum (VAL, self->use_idle_extension);
-#line 194 "mn-imap-mailbox.gob"
+#line 186 "mn-imap-mailbox.gob"
static void
___3_mn_imap_mailbox_seal (MNMailbox * mailbox G_GNUC_UNUSED)
-#line 489 "mn-imap-mailbox.c"
+#line 479 "mn-imap-mailbox.c"
#define PARENT_HANDLER(___mailbox) \
{ if(MN_MAILBOX_CLASS(parent_class)->seal) \
(* MN_MAILBOX_CLASS(parent_class)->seal)(___mailbox); }
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::seal"
{
-#line 196 "mn-imap-mailbox.gob"
+#line 188 "mn-imap-mailbox.gob"
Self *self = SELF(mailbox);
@@ -503,14 +493,14 @@ ___3_mn_imap_mailbox_seal (MNMailbox * mailbox G_GNUC_UNUSED)
MN_PI_MAILBOX(mailbox)->hostname,
self->mailbox);
}}
-#line 507 "mn-imap-mailbox.c"
+#line 497 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 214 "mn-imap-mailbox.gob"
+#line 206 "mn-imap-mailbox.gob"
static MNMailbox *
___4_mn_imap_mailbox_parse_uri (MNMailbox * dummy G_GNUC_UNUSED, const char * uri)
-#line 514 "mn-imap-mailbox.c"
+#line 504 "mn-imap-mailbox.c"
#define PARENT_HANDLER(___dummy,___uri) \
((MN_MAILBOX_CLASS(parent_class)->parse_uri)? \
(* MN_MAILBOX_CLASS(parent_class)->parse_uri)(___dummy,___uri): \
@@ -518,7 +508,7 @@ ___4_mn_imap_mailbox_parse_uri (MNMailbox * dummy G_GNUC_UNUSED, const char * ur
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::parse_uri"
{
-#line 216 "mn-imap-mailbox.gob"
+#line 208 "mn-imap-mailbox.gob"
int len;
int buflen;
@@ -590,27 +580,27 @@ ___4_mn_imap_mailbox_parse_uri (MNMailbox * dummy G_GNUC_UNUSED, const char * ur
return mailbox;
}}
-#line 594 "mn-imap-mailbox.c"
+#line 584 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 288 "mn-imap-mailbox.gob"
+#line 280 "mn-imap-mailbox.gob"
static gboolean
mn_imap_mailbox_split_uri_location (const char * location, int maxlen, char * hostport, char * path, gboolean * has_path)
-#line 601 "mn-imap-mailbox.c"
+#line 591 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::split_uri_location"
-#line 288 "mn-imap-mailbox.gob"
+#line 280 "mn-imap-mailbox.gob"
g_return_val_if_fail (location != NULL, (gboolean )0);
-#line 288 "mn-imap-mailbox.gob"
+#line 280 "mn-imap-mailbox.gob"
g_return_val_if_fail (hostport != NULL, (gboolean )0);
-#line 288 "mn-imap-mailbox.gob"
+#line 280 "mn-imap-mailbox.gob"
g_return_val_if_fail (path != NULL, (gboolean )0);
-#line 288 "mn-imap-mailbox.gob"
+#line 280 "mn-imap-mailbox.gob"
g_return_val_if_fail (has_path != NULL, (gboolean )0);
-#line 612 "mn-imap-mailbox.c"
+#line 602 "mn-imap-mailbox.c"
{
-#line 294 "mn-imap-mailbox.gob"
+#line 286 "mn-imap-mailbox.gob"
char *pat;
int n;
@@ -631,23 +621,27 @@ mn_imap_mailbox_split_uri_location (const char * location, int maxlen, char * ho
return TRUE;
}}
-#line 635 "mn-imap-mailbox.c"
+#line 625 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 315 "mn-imap-mailbox.gob"
+#line 307 "mn-imap-mailbox.gob"
static void
___6_mn_imap_mailbox_removed (MNMailbox * mailbox G_GNUC_UNUSED)
-#line 641 "mn-imap-mailbox.c"
+#line 631 "mn-imap-mailbox.c"
#define PARENT_HANDLER(___mailbox) \
{ if(MN_MAILBOX_CLASS(parent_class)->removed) \
(* MN_MAILBOX_CLASS(parent_class)->removed)(___mailbox); }
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::removed"
{
-#line 317 "mn-imap-mailbox.gob"
+#line 309 "mn-imap-mailbox.gob"
Self *self = SELF(mailbox);
+ /*
+ * We do not use g_atomic_int_set() yet because it was only added
+ * in GLib 2.10.
+ */
g_atomic_int_inc(&selfp->removed);
g_mutex_lock(selfp->mutex);
@@ -660,18 +654,18 @@ ___6_mn_imap_mailbox_removed (MNMailbox * mailbox G_GNUC_UNUSED)
PARENT_HANDLER(mailbox);
}}
-#line 664 "mn-imap-mailbox.c"
+#line 658 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 333 "mn-imap-mailbox.gob"
+#line 329 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_greeting_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 671 "mn-imap-mailbox.c"
+#line 665 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_greeting_cb"
{
-#line 337 "mn-imap-mailbox.gob"
+#line 333 "mn-imap-mailbox.gob"
priv->session = session;
@@ -680,7 +674,7 @@ mn_imap_mailbox_handle_greeting_cb (MNClientSession * session, MNClientSessionRe
else if (! response->tag && IS_OK(response))
{
self_session_detect_imapd(session, response, priv);
- return self_handle_capability_code(priv, response)
+ return self_session_handle_capability_code(priv, response)
? self_session_after_capability(priv)
: STATE_CAPABILITY;
}
@@ -688,7 +682,7 @@ mn_imap_mailbox_handle_greeting_cb (MNClientSession * session, MNClientSessionRe
{
priv->authenticated = TRUE;
self_session_detect_imapd(session, response, priv);
- return self_handle_capability_code(priv, response)
+ return self_session_handle_capability_code(priv, response)
? self_session_after_capability(priv)
: STATE_CAPABILITY;
}
@@ -697,31 +691,31 @@ mn_imap_mailbox_handle_greeting_cb (MNClientSession * session, MNClientSessionRe
else
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
}}
-#line 701 "mn-imap-mailbox.c"
+#line 695 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 363 "mn-imap-mailbox.gob"
+#line 359 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_capability_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 707 "mn-imap-mailbox.c"
+#line 701 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_capability_cb"
{
-#line 366 "mn-imap-mailbox.gob"
+#line 362 "mn-imap-mailbox.gob"
return self_session_write(priv, "CAPABILITY");
}}
-#line 715 "mn-imap-mailbox.c"
+#line 709 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 370 "mn-imap-mailbox.gob"
+#line 366 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_capability_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 721 "mn-imap-mailbox.c"
+#line 715 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_capability_cb"
{
-#line 374 "mn-imap-mailbox.gob"
+#line 370 "mn-imap-mailbox.gob"
if (response->continuation)
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
@@ -752,17 +746,17 @@ mn_imap_mailbox_handle_capability_cb (MNClientSession * session, MNClientSession
return self_default_handler(response, priv, MN_CLIENT_SESSION_ERROR_OTHER);
}}
-#line 756 "mn-imap-mailbox.c"
+#line 750 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 405 "mn-imap-mailbox.gob"
+#line 401 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_starttls_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 762 "mn-imap-mailbox.c"
+#line 756 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_starttls_cb"
{
-#line 408 "mn-imap-mailbox.gob"
+#line 404 "mn-imap-mailbox.gob"
#if WITH_SSL
return self_session_write(priv, "STARTTLS");
@@ -771,17 +765,17 @@ mn_imap_mailbox_enter_starttls_cb (MNClientSession * session, MNClientSessionPri
return 0;
#endif /* WITH_SSL */
}}
-#line 775 "mn-imap-mailbox.c"
+#line 769 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 417 "mn-imap-mailbox.gob"
+#line 413 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_starttls_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 781 "mn-imap-mailbox.c"
+#line 775 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_starttls_cb"
{
-#line 421 "mn-imap-mailbox.gob"
+#line 417 "mn-imap-mailbox.gob"
#if WITH_SSL
if (response->continuation)
@@ -813,17 +807,17 @@ mn_imap_mailbox_handle_starttls_cb (MNClientSession * session, MNClientSessionRe
return 0;
#endif /* WITH_SSL */
}}
-#line 817 "mn-imap-mailbox.c"
+#line 811 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 453 "mn-imap-mailbox.gob"
+#line 449 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_authenticate_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 823 "mn-imap-mailbox.c"
+#line 817 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_authenticate_cb"
{
-#line 456 "mn-imap-mailbox.gob"
+#line 452 "mn-imap-mailbox.gob"
#if WITH_SASL
priv->sasl_mechanism = NULL;
@@ -853,17 +847,17 @@ mn_imap_mailbox_enter_authenticate_cb (MNClientSession * session, MNClientSessio
return 0;
#endif /* WITH_SASL */
}}
-#line 857 "mn-imap-mailbox.c"
+#line 851 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 486 "mn-imap-mailbox.gob"
+#line 482 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_authenticate_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 863 "mn-imap-mailbox.c"
+#line 857 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_authenticate_cb"
{
-#line 490 "mn-imap-mailbox.gob"
+#line 486 "mn-imap-mailbox.gob"
#if WITH_SASL
if (response->tag)
@@ -893,7 +887,7 @@ mn_imap_mailbox_handle_authenticate_cb (MNClientSession * session, MNClientSessi
* [SASL] requires the client to re-issue a
* CAPABILITY command in this case.
*/
- return self_handle_capability_code(priv, response) && mn_client_session_sasl_get_ssf(session)
+ return self_session_handle_capability_code(priv, response) && mn_client_session_sasl_get_ssf(session)
? STATE_EXAMINE
: STATE_CAPABILITY;
}
@@ -919,17 +913,17 @@ mn_imap_mailbox_handle_authenticate_cb (MNClientSession * session, MNClientSessi
return 0;
#endif /* WITH_SASL */
}}
-#line 923 "mn-imap-mailbox.c"
+#line 917 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 546 "mn-imap-mailbox.gob"
+#line 542 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_login_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 929 "mn-imap-mailbox.c"
+#line 923 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_login_cb"
{
-#line 549 "mn-imap-mailbox.gob"
+#line 545 "mn-imap-mailbox.gob"
if (self_session_has_capability(priv, "LOGINDISABLED"))
{
@@ -955,17 +949,17 @@ mn_imap_mailbox_enter_login_cb (MNClientSession * session, MNClientSessionPrivat
return result;
}
}}
-#line 959 "mn-imap-mailbox.c"
+#line 953 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 575 "mn-imap-mailbox.gob"
+#line 571 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_login_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 965 "mn-imap-mailbox.c"
+#line 959 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_login_cb"
{
-#line 579 "mn-imap-mailbox.gob"
+#line 575 "mn-imap-mailbox.gob"
if (response->continuation)
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
@@ -976,7 +970,7 @@ mn_imap_mailbox_handle_login_cb (MNClientSession * session, MNClientSessionRespo
if (IS_OK(response))
{
priv->authenticated = TRUE;
- return self_handle_capability_code(priv, response)
+ return self_session_handle_capability_code(priv, response)
? STATE_EXAMINE
: STATE_CAPABILITY;
}
@@ -989,17 +983,17 @@ mn_imap_mailbox_handle_login_cb (MNClientSession * session, MNClientSessionRespo
return self_default_handler(response, priv, MN_CLIENT_SESSION_ERROR_OTHER);
}}
-#line 993 "mn-imap-mailbox.c"
+#line 987 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 603 "mn-imap-mailbox.gob"
+#line 599 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_examine_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 999 "mn-imap-mailbox.c"
+#line 993 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_examine_cb"
{
-#line 606 "mn-imap-mailbox.gob"
+#line 602 "mn-imap-mailbox.gob"
char *utf7_mailbox;
char *quoted_mailbox;
@@ -1014,17 +1008,17 @@ mn_imap_mailbox_enter_examine_cb (MNClientSession * session, MNClientSessionPriv
return result;
}}
-#line 1018 "mn-imap-mailbox.c"
+#line 1012 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 621 "mn-imap-mailbox.gob"
+#line 617 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_examine_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 1024 "mn-imap-mailbox.c"
+#line 1018 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_examine_cb"
{
-#line 625 "mn-imap-mailbox.gob"
+#line 621 "mn-imap-mailbox.gob"
if (response->continuation)
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
@@ -1046,31 +1040,31 @@ mn_imap_mailbox_handle_examine_cb (MNClientSession * session, MNClientSessionRes
return self_default_handler(response, priv, MN_CLIENT_SESSION_ERROR_OTHER);
}}
-#line 1050 "mn-imap-mailbox.c"
+#line 1044 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 647 "mn-imap-mailbox.gob"
+#line 643 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_search_unseen_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 1056 "mn-imap-mailbox.c"
+#line 1050 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_search_unseen_cb"
{
-#line 650 "mn-imap-mailbox.gob"
+#line 646 "mn-imap-mailbox.gob"
return self_session_enter_search(session, priv, "UNSEEN", &priv->unseen_numbers);
}}
-#line 1064 "mn-imap-mailbox.c"
+#line 1058 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 654 "mn-imap-mailbox.gob"
+#line 650 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_search_unseen_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 1070 "mn-imap-mailbox.c"
+#line 1064 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_search_unseen_cb"
{
-#line 658 "mn-imap-mailbox.gob"
+#line 654 "mn-imap-mailbox.gob"
int result = self_session_handle_search(session, response, priv, priv->unseen_numbers);
@@ -1092,31 +1086,31 @@ mn_imap_mailbox_handle_search_unseen_cb (MNClientSession * session, MNClientSess
return result;
}}
-#line 1096 "mn-imap-mailbox.c"
+#line 1090 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 680 "mn-imap-mailbox.gob"
+#line 676 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_search_recent_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 1102 "mn-imap-mailbox.c"
+#line 1096 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_search_recent_cb"
{
-#line 683 "mn-imap-mailbox.gob"
+#line 679 "mn-imap-mailbox.gob"
return self_session_enter_search(session, priv, "RECENT", &priv->recent_numbers);
}}
-#line 1110 "mn-imap-mailbox.c"
+#line 1104 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 687 "mn-imap-mailbox.gob"
+#line 683 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_search_recent_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 1116 "mn-imap-mailbox.c"
+#line 1110 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_search_recent_cb"
{
-#line 691 "mn-imap-mailbox.gob"
+#line 687 "mn-imap-mailbox.gob"
int result = self_session_handle_search(session, response, priv, priv->recent_numbers);
@@ -1126,17 +1120,17 @@ mn_imap_mailbox_handle_search_recent_cb (MNClientSession * session, MNClientSess
return result;
}}
-#line 1130 "mn-imap-mailbox.c"
+#line 1124 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 701 "mn-imap-mailbox.gob"
+#line 697 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_fetch_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 1136 "mn-imap-mailbox.c"
+#line 1130 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_fetch_cb"
{
-#line 703 "mn-imap-mailbox.gob"
+#line 699 "mn-imap-mailbox.gob"
GString *string;
int result;
@@ -1158,17 +1152,17 @@ mn_imap_mailbox_enter_fetch_cb (MNClientSession * session, MNClientSessionPrivat
return result;
}}
-#line 1162 "mn-imap-mailbox.c"
+#line 1156 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 725 "mn-imap-mailbox.gob"
+#line 721 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_build_fetch_set_cb (gpointer key, gpointer value, gpointer user_data)
-#line 1168 "mn-imap-mailbox.c"
+#line 1162 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::build_fetch_set_cb"
{
-#line 727 "mn-imap-mailbox.gob"
+#line 723 "mn-imap-mailbox.gob"
GString *string = user_data;
@@ -1176,17 +1170,17 @@ mn_imap_mailbox_build_fetch_set_cb (gpointer key, gpointer value, gpointer user_
g_string_append_c(string, ',');
g_string_append_printf(string, "%i", GPOINTER_TO_INT(key));
}}
-#line 1180 "mn-imap-mailbox.c"
+#line 1174 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 735 "mn-imap-mailbox.gob"
+#line 731 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_fetch_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 1186 "mn-imap-mailbox.c"
+#line 1180 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_fetch_cb"
{
-#line 739 "mn-imap-mailbox.gob"
+#line 735 "mn-imap-mailbox.gob"
if (response->continuation)
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
@@ -1196,12 +1190,11 @@ mn_imap_mailbox_handle_fetch_cb (MNClientSession * session, MNClientSessionRespo
{
if (IS_OK(response))
{
- CheckReceivedInfo info = { priv, FALSE };
-
- g_hash_table_foreach(priv->unseen_numbers, self_check_received_cb, &info);
- if (info.error)
- /* compliance error */
- return mn_client_session_set_error(session, MN_CLIENT_SESSION_ERROR_OTHER, _("server did not send all the messages we requested"));
+ /*
+ * Note that in previous versions we required the
+ * fetch results to include all the unseen messages,
+ * but it caused problems in some cases (#20132).
+ */
GDK_THREADS_ENTER();
@@ -1232,8 +1225,9 @@ mn_imap_mailbox_handle_fetch_cb (MNClientSession * session, MNClientSessionRespo
}
else if (mn_str_isnumeric(response->response)
&& response->arguments
- && (mn_ascii_str_case_has_prefix(response->arguments, "FETCH (BODY[HEADER]")
- || mn_ascii_str_case_has_prefix(response->arguments, "FETCH (BODY[HEADER "))) /* [1] */
+ && mn_ascii_str_case_has_prefix(response->arguments, "FETCH ")
+ && (mn_ascii_strcasestr(response->arguments, "BODY[HEADER]")
+ || mn_ascii_strcasestr(response->arguments, "BODY[HEADER "))) /* [1] */
{
/*
* [1] Non-compliant response (see RFC 3501 BNF), sent by Binc
@@ -1259,12 +1253,15 @@ mn_imap_mailbox_handle_fetch_cb (MNClientSession * session, MNClientSessionRespo
if (p && sscanf(p, "{%d}", &len) == 1 && len >= 0)
{
gconstpointer buf;
+ MNMessage *message;
buf = mn_client_session_read(session, len);
if (! buf)
return MN_CLIENT_SESSION_RESULT_DISCONNECT;
- priv->messages = g_slist_prepend(priv->messages, mn_message_new_from_buffer(priv->mailbox, buf, len, flags, FALSE));
+ message = mn_message_new_from_buffer(priv->mailbox, buf, len, flags, FALSE);
+ if (message)
+ priv->messages = g_slist_prepend(priv->messages, message);
/* read end of line (after literal) */
if (! mn_client_session_read_line(session))
@@ -1279,34 +1276,17 @@ mn_imap_mailbox_handle_fetch_cb (MNClientSession * session, MNClientSessionRespo
return self_default_handler(response, priv, MN_CLIENT_SESSION_ERROR_OTHER);
}}
-#line 1283 "mn-imap-mailbox.c"
+#line 1280 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 832 "mn-imap-mailbox.gob"
-static void
-mn_imap_mailbox_check_received_cb (gpointer key, gpointer value, gpointer user_data)
-#line 1289 "mn-imap-mailbox.c"
-{
-#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::check_received_cb"
-{
-#line 834 "mn-imap-mailbox.gob"
-
- CheckReceivedInfo *info = user_data;
-
- if (! info->error && ! g_hash_table_lookup(info->priv->received_numbers, key))
- info->error = TRUE;
- }}
-#line 1300 "mn-imap-mailbox.c"
-#undef __GOB_FUNCTION__
-
-#line 841 "mn-imap-mailbox.gob"
+#line 831 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_idle_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 1306 "mn-imap-mailbox.c"
+#line 1286 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_idle_cb"
{
-#line 844 "mn-imap-mailbox.gob"
+#line 834 "mn-imap-mailbox.gob"
if (! REMOVED(priv->self))
{
@@ -1346,17 +1326,17 @@ mn_imap_mailbox_enter_idle_cb (MNClientSession * session, MNClientSessionPrivate
priv->idle_state = IDLE_STATE_PRE_IDLE;
return self_session_write(priv, "IDLE");
}}
-#line 1350 "mn-imap-mailbox.c"
+#line 1330 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 884 "mn-imap-mailbox.gob"
+#line 874 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_idle_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 1356 "mn-imap-mailbox.c"
+#line 1336 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_idle_cb"
{
-#line 888 "mn-imap-mailbox.gob"
+#line 878 "mn-imap-mailbox.gob"
switch (priv->idle_state)
{
@@ -1450,31 +1430,31 @@ mn_imap_mailbox_handle_idle_cb (MNClientSession * session, MNClientSessionRespon
return self_default_handler(response, priv, MN_CLIENT_SESSION_ERROR_OTHER);
}}
-#line 1454 "mn-imap-mailbox.c"
+#line 1434 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 982 "mn-imap-mailbox.gob"
+#line 972 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_logout_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 1460 "mn-imap-mailbox.c"
+#line 1440 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_logout_cb"
{
-#line 985 "mn-imap-mailbox.gob"
+#line 975 "mn-imap-mailbox.gob"
return self_session_write(priv, "LOGOUT");
}}
-#line 1468 "mn-imap-mailbox.c"
+#line 1448 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 989 "mn-imap-mailbox.gob"
+#line 979 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_logout_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 1474 "mn-imap-mailbox.c"
+#line 1454 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_logout_cb"
{
-#line 993 "mn-imap-mailbox.gob"
+#line 983 "mn-imap-mailbox.gob"
if (response->continuation)
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
@@ -1490,20 +1470,20 @@ mn_imap_mailbox_handle_logout_cb (MNClientSession * session, MNClientSessionResp
else
return MN_CLIENT_SESSION_RESULT_CONTINUE;
}}
-#line 1494 "mn-imap-mailbox.c"
+#line 1474 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1009 "mn-imap-mailbox.gob"
+#line 999 "mn-imap-mailbox.gob"
static void
-___1e_mn_imap_mailbox_authenticated_check (MNAuthenticatedMailbox * mailbox G_GNUC_UNUSED)
-#line 1500 "mn-imap-mailbox.c"
+___1d_mn_imap_mailbox_authenticated_check (MNAuthenticatedMailbox * mailbox G_GNUC_UNUSED)
+#line 1480 "mn-imap-mailbox.c"
#define PARENT_HANDLER(___mailbox) \
{ if(MN_AUTHENTICATED_MAILBOX_CLASS(parent_class)->authenticated_check) \
(* MN_AUTHENTICATED_MAILBOX_CLASS(parent_class)->authenticated_check)(___mailbox); }
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::authenticated_check"
{
-#line 1011 "mn-imap-mailbox.gob"
+#line 1001 "mn-imap-mailbox.gob"
Self *self = SELF(mailbox);
static const MNClientSessionState states[] = {
@@ -1615,18 +1595,18 @@ ___1e_mn_imap_mailbox_authenticated_check (MNAuthenticatedMailbox * mailbox G_GN
gdk_flush();
GDK_THREADS_LEAVE();
}}
-#line 1619 "mn-imap-mailbox.c"
+#line 1599 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 1123 "mn-imap-mailbox.gob"
+#line 1113 "mn-imap-mailbox.gob"
static MNClientSessionResponse *
mn_imap_mailbox_response_new_cb (MNClientSession * session, const char * input, MNClientSessionPrivate * priv)
-#line 1626 "mn-imap-mailbox.c"
+#line 1606 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::response_new_cb"
{
-#line 1127 "mn-imap-mailbox.gob"
+#line 1117 "mn-imap-mailbox.gob"
MNClientSessionResponse *response = NULL;
@@ -1698,17 +1678,17 @@ mn_imap_mailbox_response_new_cb (MNClientSession * session, const char * input,
return response;
}}
-#line 1702 "mn-imap-mailbox.c"
+#line 1682 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1199 "mn-imap-mailbox.gob"
+#line 1189 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_response_free_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 1708 "mn-imap-mailbox.c"
+#line 1688 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::response_free_cb"
{
-#line 1203 "mn-imap-mailbox.gob"
+#line 1193 "mn-imap-mailbox.gob"
g_free(response->continuation);
g_free(response->tag);
@@ -1717,39 +1697,39 @@ mn_imap_mailbox_response_free_cb (MNClientSession * session, MNClientSessionResp
g_free(response->arguments);
g_free(response);
}}
-#line 1721 "mn-imap-mailbox.c"
+#line 1701 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1212 "mn-imap-mailbox.gob"
+#line 1202 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_default_handler (MNClientSessionResponse * response, MNClientSessionPrivate * priv, int error_code_when_bye)
-#line 1727 "mn-imap-mailbox.c"
+#line 1707 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::default_handler"
-#line 1212 "mn-imap-mailbox.gob"
+#line 1202 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 1212 "mn-imap-mailbox.gob"
+#line 1202 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1734 "mn-imap-mailbox.c"
+#line 1714 "mn-imap-mailbox.c"
{
-#line 1216 "mn-imap-mailbox.gob"
+#line 1206 "mn-imap-mailbox.gob"
if (! response->tag && IS_BYE(response))
return mn_client_session_set_error_from_response(priv->session, error_code_when_bye, response->arguments);
else
return MN_CLIENT_SESSION_RESULT_CONTINUE;
}}
-#line 1743 "mn-imap-mailbox.c"
+#line 1723 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1223 "mn-imap-mailbox.gob"
+#line 1213 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_pre_read_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 1749 "mn-imap-mailbox.c"
+#line 1729 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::pre_read_cb"
{
-#line 1226 "mn-imap-mailbox.gob"
+#line 1216 "mn-imap-mailbox.gob"
if (priv->idle_state == IDLE_STATE_IDLE)
{
@@ -1767,17 +1747,17 @@ mn_imap_mailbox_pre_read_cb (MNClientSession * session, MNClientSessionPrivate *
g_mutex_unlock(selfp->mutex);
}
}}
-#line 1771 "mn-imap-mailbox.c"
+#line 1751 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1244 "mn-imap-mailbox.gob"
+#line 1234 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_post_read_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 1777 "mn-imap-mailbox.c"
+#line 1757 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::post_read_cb"
{
-#line 1247 "mn-imap-mailbox.gob"
+#line 1237 "mn-imap-mailbox.gob"
Self *self = priv->self;
@@ -1789,17 +1769,17 @@ mn_imap_mailbox_post_read_cb (MNClientSession * session, MNClientSessionPrivate
}
g_mutex_unlock(selfp->mutex);
}}
-#line 1793 "mn-imap-mailbox.c"
+#line 1773 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1259 "mn-imap-mailbox.gob"
+#line 1249 "mn-imap-mailbox.gob"
static gboolean
mn_imap_mailbox_idle_inactivity_timeout_cb (gpointer data)
-#line 1799 "mn-imap-mailbox.c"
+#line 1779 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::idle_inactivity_timeout_cb"
{
-#line 1261 "mn-imap-mailbox.gob"
+#line 1251 "mn-imap-mailbox.gob"
Self *self = data;
@@ -1815,22 +1795,22 @@ mn_imap_mailbox_idle_inactivity_timeout_cb (gpointer data)
return FALSE;
}}
-#line 1819 "mn-imap-mailbox.c"
+#line 1799 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1277 "mn-imap-mailbox.gob"
+#line 1267 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_session_write (MNClientSessionPrivate * priv, const char * format, ...)
-#line 1825 "mn-imap-mailbox.c"
+#line 1805 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_write"
-#line 1277 "mn-imap-mailbox.gob"
+#line 1267 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1277 "mn-imap-mailbox.gob"
+#line 1267 "mn-imap-mailbox.gob"
g_return_val_if_fail (format != NULL, (int )0);
-#line 1832 "mn-imap-mailbox.c"
+#line 1812 "mn-imap-mailbox.c"
{
-#line 1281 "mn-imap-mailbox.gob"
+#line 1271 "mn-imap-mailbox.gob"
va_list args;
char *command;
@@ -1849,22 +1829,22 @@ mn_imap_mailbox_session_write (MNClientSessionPrivate * priv, const char * forma
return result;
}}
-#line 1853 "mn-imap-mailbox.c"
+#line 1833 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1300 "mn-imap-mailbox.gob"
+#line 1290 "mn-imap-mailbox.gob"
static gboolean
-mn_imap_mailbox_handle_capability_code (MNClientSessionPrivate * priv, MNClientSessionResponse * response)
-#line 1859 "mn-imap-mailbox.c"
+mn_imap_mailbox_session_handle_capability_code (MNClientSessionPrivate * priv, MNClientSessionResponse * response)
+#line 1839 "mn-imap-mailbox.c"
{
-#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_capability_code"
-#line 1300 "mn-imap-mailbox.gob"
+#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_handle_capability_code"
+#line 1290 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (gboolean )0);
-#line 1300 "mn-imap-mailbox.gob"
+#line 1290 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (gboolean )0);
-#line 1866 "mn-imap-mailbox.c"
+#line 1846 "mn-imap-mailbox.c"
{
-#line 1303 "mn-imap-mailbox.gob"
+#line 1293 "mn-imap-mailbox.gob"
if (response->code)
{
@@ -1882,20 +1862,20 @@ mn_imap_mailbox_handle_capability_code (MNClientSessionPrivate * priv, MNClientS
return FALSE;
}}
-#line 1886 "mn-imap-mailbox.c"
+#line 1866 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1321 "mn-imap-mailbox.gob"
+#line 1311 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_session_parse_capabilities (MNClientSessionPrivate * priv, const char * capabilities)
-#line 1892 "mn-imap-mailbox.c"
+#line 1872 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_parse_capabilities"
-#line 1321 "mn-imap-mailbox.gob"
+#line 1311 "mn-imap-mailbox.gob"
g_return_if_fail (priv != NULL);
-#line 1897 "mn-imap-mailbox.c"
+#line 1877 "mn-imap-mailbox.c"
{
-#line 1324 "mn-imap-mailbox.gob"
+#line 1314 "mn-imap-mailbox.gob"
g_strfreev(priv->capabilities);
priv->capabilities = NULL;
@@ -1919,22 +1899,22 @@ mn_imap_mailbox_session_parse_capabilities (MNClientSessionPrivate * priv, const
else
priv->capabilities = g_new0(char *, 1);
}}
-#line 1923 "mn-imap-mailbox.c"
+#line 1903 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1348 "mn-imap-mailbox.gob"
+#line 1338 "mn-imap-mailbox.gob"
static gboolean
mn_imap_mailbox_session_has_capability (MNClientSessionPrivate * priv, const char * capability)
-#line 1929 "mn-imap-mailbox.c"
+#line 1909 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_has_capability"
-#line 1348 "mn-imap-mailbox.gob"
+#line 1338 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (gboolean )0);
-#line 1348 "mn-imap-mailbox.gob"
+#line 1338 "mn-imap-mailbox.gob"
g_return_val_if_fail (capability != NULL, (gboolean )0);
-#line 1936 "mn-imap-mailbox.c"
+#line 1916 "mn-imap-mailbox.c"
{
-#line 1351 "mn-imap-mailbox.gob"
+#line 1341 "mn-imap-mailbox.gob"
int i;
@@ -1946,20 +1926,20 @@ mn_imap_mailbox_session_has_capability (MNClientSessionPrivate * priv, const cha
return FALSE;
}}
-#line 1950 "mn-imap-mailbox.c"
+#line 1930 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1363 "mn-imap-mailbox.gob"
+#line 1353 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_session_after_capability (MNClientSessionPrivate * priv)
-#line 1956 "mn-imap-mailbox.c"
+#line 1936 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_after_capability"
-#line 1363 "mn-imap-mailbox.gob"
+#line 1353 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1961 "mn-imap-mailbox.c"
+#line 1941 "mn-imap-mailbox.c"
{
-#line 1365 "mn-imap-mailbox.gob"
+#line 1355 "mn-imap-mailbox.gob"
if (priv->authenticated)
return STATE_EXAMINE;
@@ -1981,20 +1961,20 @@ mn_imap_mailbox_session_after_capability (MNClientSessionPrivate * priv)
return self_session_authenticate(priv);
}
}}
-#line 1985 "mn-imap-mailbox.c"
+#line 1965 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1387 "mn-imap-mailbox.gob"
+#line 1377 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_session_authenticate (MNClientSessionPrivate * priv)
-#line 1991 "mn-imap-mailbox.c"
+#line 1971 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_authenticate"
-#line 1387 "mn-imap-mailbox.gob"
+#line 1377 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1996 "mn-imap-mailbox.c"
+#line 1976 "mn-imap-mailbox.c"
{
-#line 1389 "mn-imap-mailbox.gob"
+#line 1379 "mn-imap-mailbox.gob"
#if WITH_SASL
g_slist_free(priv->sasl_remaining_mechanisms);
@@ -2032,20 +2012,20 @@ mn_imap_mailbox_session_authenticate (MNClientSessionPrivate * priv)
return STATE_LOGIN;
}
}}
-#line 2036 "mn-imap-mailbox.c"
+#line 2016 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1427 "mn-imap-mailbox.gob"
+#line 1417 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_session_authenticate_fallback (MNClientSessionPrivate * priv, gboolean tried_login)
-#line 2042 "mn-imap-mailbox.c"
+#line 2022 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_authenticate_fallback"
-#line 1427 "mn-imap-mailbox.gob"
+#line 1417 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 2047 "mn-imap-mailbox.c"
+#line 2027 "mn-imap-mailbox.c"
{
-#line 1430 "mn-imap-mailbox.gob"
+#line 1420 "mn-imap-mailbox.gob"
if (! priv->pi_mailbox->authmech)
{
@@ -2088,24 +2068,24 @@ mn_imap_mailbox_session_authenticate_fallback (MNClientSessionPrivate * priv, gb
return STATE_LOGOUT;
}
}}
-#line 2092 "mn-imap-mailbox.c"
+#line 2072 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1473 "mn-imap-mailbox.gob"
+#line 1463 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_session_detect_imapd (MNClientSession * session, MNClientSessionResponse * greeting_response, MNClientSessionPrivate * priv)
-#line 2098 "mn-imap-mailbox.c"
+#line 2078 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_detect_imapd"
-#line 1473 "mn-imap-mailbox.gob"
+#line 1463 "mn-imap-mailbox.gob"
g_return_if_fail (session != NULL);
-#line 1473 "mn-imap-mailbox.gob"
+#line 1463 "mn-imap-mailbox.gob"
g_return_if_fail (greeting_response != NULL);
-#line 1473 "mn-imap-mailbox.gob"
+#line 1463 "mn-imap-mailbox.gob"
g_return_if_fail (priv != NULL);
-#line 2107 "mn-imap-mailbox.c"
+#line 2087 "mn-imap-mailbox.c"
{
-#line 1477 "mn-imap-mailbox.gob"
+#line 1467 "mn-imap-mailbox.gob"
if (greeting_response->arguments)
{
@@ -2125,55 +2105,53 @@ mn_imap_mailbox_session_detect_imapd (MNClientSession * session, MNClientSession
}
}
}}
-#line 2129 "mn-imap-mailbox.c"
+#line 2109 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1497 "mn-imap-mailbox.gob"
+#line 1487 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_session_enter_search (MNClientSession * session, MNClientSessionPrivate * priv, const char * what, GHashTable ** numbers)
-#line 2135 "mn-imap-mailbox.c"
+#line 2115 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_enter_search"
-#line 1497 "mn-imap-mailbox.gob"
+#line 1487 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 1497 "mn-imap-mailbox.gob"
+#line 1487 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1497 "mn-imap-mailbox.gob"
+#line 1487 "mn-imap-mailbox.gob"
g_return_val_if_fail (what != NULL, (int )0);
-#line 1497 "mn-imap-mailbox.gob"
+#line 1487 "mn-imap-mailbox.gob"
g_return_val_if_fail (numbers != NULL, (int )0);
-#line 2146 "mn-imap-mailbox.c"
+#line 2126 "mn-imap-mailbox.c"
{
-#line 1502 "mn-imap-mailbox.gob"
+#line 1492 "mn-imap-mailbox.gob"
- priv->search_received = FALSE;
-
if (*numbers)
g_hash_table_destroy(*numbers);
*numbers = g_hash_table_new(g_direct_hash, g_direct_equal);
return self_session_write(priv, "SEARCH %s", what);
}}
-#line 2158 "mn-imap-mailbox.c"
+#line 2136 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1512 "mn-imap-mailbox.gob"
+#line 1500 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_session_handle_search (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv, GHashTable * numbers)
-#line 2164 "mn-imap-mailbox.c"
+#line 2142 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_handle_search"
-#line 1512 "mn-imap-mailbox.gob"
+#line 1500 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 1512 "mn-imap-mailbox.gob"
+#line 1500 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 1512 "mn-imap-mailbox.gob"
+#line 1500 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1512 "mn-imap-mailbox.gob"
+#line 1500 "mn-imap-mailbox.gob"
g_return_val_if_fail (numbers != NULL, (int )0);
-#line 2175 "mn-imap-mailbox.c"
+#line 2153 "mn-imap-mailbox.c"
{
-#line 1517 "mn-imap-mailbox.gob"
+#line 1505 "mn-imap-mailbox.gob"
if (response->continuation)
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
@@ -2182,12 +2160,12 @@ mn_imap_mailbox_session_handle_search (MNClientSession * session, MNClientSessio
if (HAS_CURRENT_TAG(response, priv))
{
if (IS_OK(response))
- {
- if (priv->search_received)
- return 0; /* success; caller must switch state itself */
- else /* compliance error */
- return mn_client_session_set_error(session, MN_CLIENT_SESSION_ERROR_OTHER, _("server did not send search results"));
- }
+ /*
+ * Some uncompliant IMAP server implementations do not
+ * send an untagged SEARCH response when there are no
+ * search results (#18876). We are tolerant.
+ */
+ return 0; /* success; caller must switch state itself */
else if (IS_NO(response) || IS_BAD(response))
{
mn_client_session_set_error_from_response(session, MN_CLIENT_SESSION_ERROR_OTHER, response->arguments);
@@ -2216,13 +2194,12 @@ mn_imap_mailbox_session_handle_search (MNClientSession * session, MNClientSessio
g_strfreev(strings);
}
- priv->search_received = TRUE;
return MN_CLIENT_SESSION_RESULT_CONTINUE;
}
return self_default_handler(response, priv, MN_CLIENT_SESSION_ERROR_OTHER);
}}
-#line 2226 "mn-imap-mailbox.c"
+#line 2203 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
/**
@@ -2233,17 +2210,17 @@ mn_imap_mailbox_session_handle_search (MNClientSession * session, MNClientSessio
*
* Return value: the quoted string.
**/
-#line 1574 "mn-imap-mailbox.gob"
+#line 1561 "mn-imap-mailbox.gob"
static char *
mn_imap_mailbox_quote (const char * str)
-#line 2240 "mn-imap-mailbox.c"
+#line 2217 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::quote"
-#line 1574 "mn-imap-mailbox.gob"
+#line 1561 "mn-imap-mailbox.gob"
g_return_val_if_fail (str != NULL, (char * )0);
-#line 2245 "mn-imap-mailbox.c"
+#line 2222 "mn-imap-mailbox.c"
{
-#line 1576 "mn-imap-mailbox.gob"
+#line 1563 "mn-imap-mailbox.gob"
GString *quoted;
int i;
@@ -2258,7 +2235,7 @@ mn_imap_mailbox_quote (const char * str)
return g_string_free(quoted, FALSE);
}}
-#line 2262 "mn-imap-mailbox.c"
+#line 2239 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
/**
@@ -2269,17 +2246,17 @@ mn_imap_mailbox_quote (const char * str)
*
* Return value: the string converted to modified UTF-7.
**/
-#line 1599 "mn-imap-mailbox.gob"
+#line 1586 "mn-imap-mailbox.gob"
static char *
mn_imap_mailbox_utf8_to_imap_utf7 (const char * str)
-#line 2276 "mn-imap-mailbox.c"
+#line 2253 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::utf8_to_imap_utf7"
-#line 1599 "mn-imap-mailbox.gob"
+#line 1586 "mn-imap-mailbox.gob"
g_return_val_if_fail (str != NULL, (char * )0);
-#line 2281 "mn-imap-mailbox.c"
+#line 2258 "mn-imap-mailbox.c"
{
-#line 1601 "mn-imap-mailbox.gob"
+#line 1588 "mn-imap-mailbox.gob"
gunichar c;
guint32 x, v = 0;
@@ -2336,20 +2313,20 @@ mn_imap_mailbox_utf8_to_imap_utf7 (const char * str)
return g_string_free(out, FALSE);
}}
-#line 2340 "mn-imap-mailbox.c"
+#line 2317 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1658 "mn-imap-mailbox.gob"
+#line 1645 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_imap_utf7_closeb64 (GString * out, guint32 v, guint32 i)
-#line 2346 "mn-imap-mailbox.c"
+#line 2323 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::imap_utf7_closeb64"
-#line 1658 "mn-imap-mailbox.gob"
+#line 1645 "mn-imap-mailbox.gob"
g_return_if_fail (out != NULL);
-#line 2351 "mn-imap-mailbox.c"
+#line 2328 "mn-imap-mailbox.c"
{
-#line 1660 "mn-imap-mailbox.gob"
+#line 1647 "mn-imap-mailbox.gob"
/*
* Taken from the Ximian Evolution sources (camel-utf8.c) and
@@ -2366,20 +2343,20 @@ mn_imap_mailbox_imap_utf7_closeb64 (GString * out, guint32 v, guint32 i)
g_string_append_c(out, '-');
}}
-#line 2370 "mn-imap-mailbox.c"
+#line 2347 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1677 "mn-imap-mailbox.gob"
+#line 1664 "mn-imap-mailbox.gob"
char *
mn_imap_mailbox_build_name (const char * username, const char * server, const char * mailbox)
-#line 2376 "mn-imap-mailbox.c"
+#line 2353 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::build_name"
-#line 1677 "mn-imap-mailbox.gob"
+#line 1664 "mn-imap-mailbox.gob"
g_return_val_if_fail (server != NULL, (char * )0);
-#line 2381 "mn-imap-mailbox.c"
+#line 2358 "mn-imap-mailbox.c"
{
-#line 1681 "mn-imap-mailbox.gob"
+#line 1668 "mn-imap-mailbox.gob"
GString *name;
@@ -2395,5 +2372,5 @@ mn_imap_mailbox_build_name (const char * username, const char * server, const ch
return g_string_free(name, FALSE);
}}
-#line 2399 "mn-imap-mailbox.c"
+#line 2376 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-imap-mailbox.gob b/src/mn-imap-mailbox.gob
@@ -106,8 +106,6 @@ struct _MNClientSessionPrivate
GSList *auth_mechanisms;
gboolean authenticated;
- gboolean search_received;
-
GHashTable *unseen_numbers;
GHashTable *recent_numbers;
GHashTable *received_numbers;
@@ -137,12 +135,6 @@ struct _MNClientSessionResponse
char *arguments;
};
-typedef struct
-{
- MNClientSessionPrivate *priv;
- gboolean error;
-} CheckReceivedInfo;
-
int mn_imap_mailbox_default_ports[MN_PI_MAILBOX_N_CONNECTION_TYPES] = { 143, 143, 993 };
/* variable taken from Evolution (camel-utf8.c) */
@@ -317,6 +309,10 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
{
Self *self = SELF(mailbox);
+ /*
+ * We do not use g_atomic_int_set() yet because it was only added
+ * in GLib 2.10.
+ */
g_atomic_int_inc(&selfp->removed);
g_mutex_lock(selfp->mutex);
@@ -342,7 +338,7 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
else if (! response->tag && IS_OK(response))
{
self_session_detect_imapd(session, response, priv);
- return self_handle_capability_code(priv, response)
+ return self_session_handle_capability_code(priv, response)
? self_session_after_capability(priv)
: STATE_CAPABILITY;
}
@@ -350,7 +346,7 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
{
priv->authenticated = TRUE;
self_session_detect_imapd(session, response, priv);
- return self_handle_capability_code(priv, response)
+ return self_session_handle_capability_code(priv, response)
? self_session_after_capability(priv)
: STATE_CAPABILITY;
}
@@ -516,7 +512,7 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
* [SASL] requires the client to re-issue a
* CAPABILITY command in this case.
*/
- return self_handle_capability_code(priv, response) && mn_client_session_sasl_get_ssf(session)
+ return self_session_handle_capability_code(priv, response) && mn_client_session_sasl_get_ssf(session)
? STATE_EXAMINE
: STATE_CAPABILITY;
}
@@ -586,7 +582,7 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
if (IS_OK(response))
{
priv->authenticated = TRUE;
- return self_handle_capability_code(priv, response)
+ return self_session_handle_capability_code(priv, response)
? STATE_EXAMINE
: STATE_CAPABILITY;
}
@@ -745,12 +741,11 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
{
if (IS_OK(response))
{
- CheckReceivedInfo info = { priv, FALSE };
-
- g_hash_table_foreach(priv->unseen_numbers, self_check_received_cb, &info);
- if (info.error)
- /* compliance error */
- return mn_client_session_set_error(session, MN_CLIENT_SESSION_ERROR_OTHER, _("server did not send all the messages we requested"));
+ /*
+ * Note that in previous versions we required the
+ * fetch results to include all the unseen messages,
+ * but it caused problems in some cases (#20132).
+ */
GDK_THREADS_ENTER();
@@ -781,8 +776,9 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
}
else if (mn_str_isnumeric(response->response)
&& response->arguments
- && (mn_ascii_str_case_has_prefix(response->arguments, "FETCH (BODY[HEADER]")
- || mn_ascii_str_case_has_prefix(response->arguments, "FETCH (BODY[HEADER "))) /* [1] */
+ && mn_ascii_str_case_has_prefix(response->arguments, "FETCH ")
+ && (mn_ascii_strcasestr(response->arguments, "BODY[HEADER]")
+ || mn_ascii_strcasestr(response->arguments, "BODY[HEADER "))) /* [1] */
{
/*
* [1] Non-compliant response (see RFC 3501 BNF), sent by Binc
@@ -808,12 +804,15 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
if (p && sscanf(p, "{%d}", &len) == 1 && len >= 0)
{
gconstpointer buf;
+ MNMessage *message;
buf = mn_client_session_read(session, len);
if (! buf)
return MN_CLIENT_SESSION_RESULT_DISCONNECT;
- priv->messages = g_slist_prepend(priv->messages, mn_message_new_from_buffer(priv->mailbox, buf, len, flags, FALSE));
+ message = mn_message_new_from_buffer(priv->mailbox, buf, len, flags, FALSE);
+ if (message)
+ priv->messages = g_slist_prepend(priv->messages, message);
/* read end of line (after literal) */
if (! mn_client_session_read_line(session))
@@ -829,15 +828,6 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
return self_default_handler(response, priv, MN_CLIENT_SESSION_ERROR_OTHER);
}
- private void
- check_received_cb (gpointer key, gpointer value, gpointer user_data)
- {
- CheckReceivedInfo *info = user_data;
-
- if (! info->error && ! g_hash_table_lookup(info->priv->received_numbers, key))
- info->error = TRUE;
- }
-
private int
enter_idle_cb (MNClientSession *session,
MNClientSessionPrivate *priv)
@@ -1298,8 +1288,8 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
}
private gboolean
- handle_capability_code (MNClientSessionPrivate *priv (check null),
- MNClientSessionResponse *response (check null))
+ session_handle_capability_code (MNClientSessionPrivate *priv (check null),
+ MNClientSessionResponse *response (check null))
{
if (response->code)
{
@@ -1500,8 +1490,6 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
const char *what (check null),
GHashTable **numbers (check null))
{
- priv->search_received = FALSE;
-
if (*numbers)
g_hash_table_destroy(*numbers);
*numbers = g_hash_table_new(g_direct_hash, g_direct_equal);
@@ -1522,12 +1510,12 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
if (HAS_CURRENT_TAG(response, priv))
{
if (IS_OK(response))
- {
- if (priv->search_received)
- return 0; /* success; caller must switch state itself */
- else /* compliance error */
- return mn_client_session_set_error(session, MN_CLIENT_SESSION_ERROR_OTHER, _("server did not send search results"));
- }
+ /*
+ * Some uncompliant IMAP server implementations do not
+ * send an untagged SEARCH response when there are no
+ * search results (#18876). We are tolerant.
+ */
+ return 0; /* success; caller must switch state itself */
else if (IS_NO(response) || IS_BAD(response))
{
mn_client_session_set_error_from_response(session, MN_CLIENT_SESSION_ERROR_OTHER, response->arguments);
@@ -1556,7 +1544,6 @@ class MN:IMAP:Mailbox from MN:PI:Mailbox
g_strfreev(strings);
}
- priv->search_received = TRUE;
return MN_CLIENT_SESSION_RESULT_CONTINUE;
}
diff --git a/src/mn-mailbox-private.h b/src/mn-mailbox-private.h
@@ -31,15 +31,15 @@ typedef enum
struct _MNMailboxPrivate {
#line 99 "mn-mailbox.gob"
gboolean added;
-#line 150 "mn-mailbox.gob"
+#line 153 "mn-mailbox.gob"
MNLockedGSource * check_timeout_source;
-#line 159 "mn-mailbox.gob"
+#line 162 "mn-mailbox.gob"
gboolean poll;
-#line 192 "mn-mailbox.gob"
+#line 195 "mn-mailbox.gob"
GSList * unfiltered_messages;
-#line 194 "mn-mailbox.gob"
+#line 197 "mn-mailbox.gob"
GHashTable * messages_marked_as_read;
-#line 216 "mn-mailbox.gob"
+#line 219 "mn-mailbox.gob"
GHashTable * messages_hash_table;
#line 45 "mn-mailbox-private.h"
};
diff --git a/src/mn-mailbox-properties-dialog.c b/src/mn-mailbox-properties-dialog.c
@@ -630,8 +630,7 @@ mn_mailbox_properties_dialog_set_active_properties (MNMailboxPropertiesDialog *
gboolean valid;
GtkTreeIter iter;
- valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(selfp->store), &iter);
- while (valid)
+ MN_TREE_MODEL_FOREACH(valid, &iter, GTK_TREE_MODEL(selfp->store))
{
MNMailboxProperties *these_properties;
@@ -643,26 +642,24 @@ mn_mailbox_properties_dialog_set_active_properties (MNMailboxPropertiesDialog *
gtk_combo_box_set_active_iter(GTK_COMBO_BOX(selfp->mailbox_type_combo), &iter);
break;
}
-
- valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(selfp->store), &iter);
}
}}
-#line 651 "mn-mailbox-properties-dialog.c"
+#line 648 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 360 "mn-mailbox-properties-dialog.gob"
+#line 357 "mn-mailbox-properties-dialog.gob"
static MNMailboxProperties *
mn_mailbox_properties_dialog_get_active_properties (MNMailboxPropertiesDialog * self)
-#line 657 "mn-mailbox-properties-dialog.c"
+#line 654 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::get_active_properties"
-#line 360 "mn-mailbox-properties-dialog.gob"
+#line 357 "mn-mailbox-properties-dialog.gob"
g_return_val_if_fail (self != NULL, (MNMailboxProperties * )0);
-#line 360 "mn-mailbox-properties-dialog.gob"
+#line 357 "mn-mailbox-properties-dialog.gob"
g_return_val_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self), (MNMailboxProperties * )0);
-#line 664 "mn-mailbox-properties-dialog.c"
+#line 661 "mn-mailbox-properties-dialog.c"
{
-#line 362 "mn-mailbox-properties-dialog.gob"
+#line 359 "mn-mailbox-properties-dialog.gob"
GtkTreeIter iter;
MNMailboxProperties *properties = NULL;
@@ -672,30 +669,29 @@ mn_mailbox_properties_dialog_get_active_properties (MNMailboxPropertiesDialog *
return properties;
}}
-#line 676 "mn-mailbox-properties-dialog.c"
+#line 673 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 372 "mn-mailbox-properties-dialog.gob"
+#line 369 "mn-mailbox-properties-dialog.gob"
static MNMailboxProperties *
mn_mailbox_properties_dialog_get_properties_by_type (MNMailboxPropertiesDialog * self, const char * type)
-#line 682 "mn-mailbox-properties-dialog.c"
+#line 679 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::get_properties_by_type"
-#line 372 "mn-mailbox-properties-dialog.gob"
+#line 369 "mn-mailbox-properties-dialog.gob"
g_return_val_if_fail (self != NULL, (MNMailboxProperties * )0);
-#line 372 "mn-mailbox-properties-dialog.gob"
+#line 369 "mn-mailbox-properties-dialog.gob"
g_return_val_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self), (MNMailboxProperties * )0);
-#line 372 "mn-mailbox-properties-dialog.gob"
+#line 369 "mn-mailbox-properties-dialog.gob"
g_return_val_if_fail (type != NULL, (MNMailboxProperties * )0);
-#line 691 "mn-mailbox-properties-dialog.c"
+#line 688 "mn-mailbox-properties-dialog.c"
{
-#line 374 "mn-mailbox-properties-dialog.gob"
+#line 371 "mn-mailbox-properties-dialog.gob"
gboolean valid;
GtkTreeIter iter;
- valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(selfp->store), &iter);
- while (valid)
+ MN_TREE_MODEL_FOREACH(valid, &iter, GTK_TREE_MODEL(selfp->store))
{
MNMailboxProperties *properties;
MNMailboxPropertiesClass *class;
@@ -708,36 +704,33 @@ mn_mailbox_properties_dialog_get_properties_by_type (MNMailboxPropertiesDialog *
return properties;
g_object_unref(properties);
-
- valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(selfp->store), &iter);
}
return NULL;
}}
-#line 718 "mn-mailbox-properties-dialog.c"
+#line 712 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 399 "mn-mailbox-properties-dialog.gob"
+#line 393 "mn-mailbox-properties-dialog.gob"
static MNMailboxProperties *
mn_mailbox_properties_dialog_get_properties_by_g_type (MNMailboxPropertiesDialog * self, GType type)
-#line 724 "mn-mailbox-properties-dialog.c"
+#line 718 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::get_properties_by_g_type"
-#line 399 "mn-mailbox-properties-dialog.gob"
+#line 393 "mn-mailbox-properties-dialog.gob"
g_return_val_if_fail (self != NULL, (MNMailboxProperties * )0);
-#line 399 "mn-mailbox-properties-dialog.gob"
+#line 393 "mn-mailbox-properties-dialog.gob"
g_return_val_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self), (MNMailboxProperties * )0);
-#line 399 "mn-mailbox-properties-dialog.gob"
+#line 393 "mn-mailbox-properties-dialog.gob"
g_return_val_if_fail (type != 0, (MNMailboxProperties * )0);
-#line 733 "mn-mailbox-properties-dialog.c"
+#line 727 "mn-mailbox-properties-dialog.c"
{
-#line 401 "mn-mailbox-properties-dialog.gob"
+#line 395 "mn-mailbox-properties-dialog.gob"
gboolean valid;
GtkTreeIter iter;
- valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(selfp->store), &iter);
- while (valid)
+ MN_TREE_MODEL_FOREACH(valid, &iter, GTK_TREE_MODEL(selfp->store))
{
MNMailboxProperties *properties;
@@ -747,28 +740,26 @@ mn_mailbox_properties_dialog_get_properties_by_g_type (MNMailboxPropertiesDialog
return properties;
g_object_unref(properties);
-
- valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(selfp->store), &iter);
}
return NULL;
}}
-#line 757 "mn-mailbox-properties-dialog.c"
+#line 748 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 423 "mn-mailbox-properties-dialog.gob"
+#line 414 "mn-mailbox-properties-dialog.gob"
MNMailbox *
mn_mailbox_properties_dialog_get_current_mailbox (MNMailboxPropertiesDialog * self)
-#line 763 "mn-mailbox-properties-dialog.c"
+#line 754 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::get_current_mailbox"
-#line 423 "mn-mailbox-properties-dialog.gob"
+#line 414 "mn-mailbox-properties-dialog.gob"
g_return_val_if_fail (self != NULL, (MNMailbox * )0);
-#line 423 "mn-mailbox-properties-dialog.gob"
+#line 414 "mn-mailbox-properties-dialog.gob"
g_return_val_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self), (MNMailbox * )0);
-#line 770 "mn-mailbox-properties-dialog.c"
+#line 761 "mn-mailbox-properties-dialog.c"
{
-#line 425 "mn-mailbox-properties-dialog.gob"
+#line 416 "mn-mailbox-properties-dialog.gob"
MNMailboxProperties *properties;
MNMailbox *mailbox;
@@ -792,22 +783,22 @@ mn_mailbox_properties_dialog_get_current_mailbox (MNMailboxPropertiesDialog * se
return mailbox;
}}
-#line 796 "mn-mailbox-properties-dialog.c"
+#line 787 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 449 "mn-mailbox-properties-dialog.gob"
+#line 440 "mn-mailbox-properties-dialog.gob"
void
mn_mailbox_properties_dialog_apply (MNMailboxPropertiesDialog * self)
-#line 802 "mn-mailbox-properties-dialog.c"
+#line 793 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::apply"
-#line 449 "mn-mailbox-properties-dialog.gob"
+#line 440 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (self != NULL);
-#line 449 "mn-mailbox-properties-dialog.gob"
+#line 440 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self));
-#line 809 "mn-mailbox-properties-dialog.c"
+#line 800 "mn-mailbox-properties-dialog.c"
{
-#line 451 "mn-mailbox-properties-dialog.gob"
+#line 442 "mn-mailbox-properties-dialog.gob"
MNMailbox *new_mailbox;
@@ -822,22 +813,22 @@ mn_mailbox_properties_dialog_apply (MNMailboxPropertiesDialog * self)
self_set_mailbox(self, new_mailbox);
g_object_unref(new_mailbox);
}}
-#line 826 "mn-mailbox-properties-dialog.c"
+#line 817 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 466 "mn-mailbox-properties-dialog.gob"
+#line 457 "mn-mailbox-properties-dialog.gob"
static void
mn_mailbox_properties_dialog_update_complete (MNMailboxPropertiesDialog * self)
-#line 832 "mn-mailbox-properties-dialog.c"
+#line 823 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::update_complete"
-#line 466 "mn-mailbox-properties-dialog.gob"
+#line 457 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (self != NULL);
-#line 466 "mn-mailbox-properties-dialog.gob"
+#line 457 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self));
-#line 839 "mn-mailbox-properties-dialog.c"
+#line 830 "mn-mailbox-properties-dialog.c"
{
-#line 468 "mn-mailbox-properties-dialog.gob"
+#line 459 "mn-mailbox-properties-dialog.gob"
MNMailboxProperties *properties;
@@ -863,22 +854,22 @@ mn_mailbox_properties_dialog_update_complete (MNMailboxPropertiesDialog * self)
gtk_widget_set_sensitive(selfp->accept_button, complete);
}
}}
-#line 867 "mn-mailbox-properties-dialog.c"
+#line 858 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 494 "mn-mailbox-properties-dialog.gob"
+#line 485 "mn-mailbox-properties-dialog.gob"
static void
mn_mailbox_properties_dialog_update_default_name (MNMailboxPropertiesDialog * self)
-#line 873 "mn-mailbox-properties-dialog.c"
+#line 864 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::update_default_name"
-#line 494 "mn-mailbox-properties-dialog.gob"
+#line 485 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (self != NULL);
-#line 494 "mn-mailbox-properties-dialog.gob"
+#line 485 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self));
-#line 880 "mn-mailbox-properties-dialog.c"
+#line 871 "mn-mailbox-properties-dialog.c"
{
-#line 496 "mn-mailbox-properties-dialog.gob"
+#line 487 "mn-mailbox-properties-dialog.gob"
MNMailboxProperties *properties;
@@ -904,22 +895,22 @@ mn_mailbox_properties_dialog_update_default_name (MNMailboxPropertiesDialog * se
gtk_widget_set_sensitive(selfp->mailbox_name_default_button, selfp->has_custom_name = FALSE);
}
}}
-#line 908 "mn-mailbox-properties-dialog.c"
+#line 899 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 522 "mn-mailbox-properties-dialog.gob"
+#line 513 "mn-mailbox-properties-dialog.gob"
static void
mn_mailbox_properties_dialog_update_default_check_delay (MNMailboxPropertiesDialog * self)
-#line 914 "mn-mailbox-properties-dialog.c"
+#line 905 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::update_default_check_delay"
-#line 522 "mn-mailbox-properties-dialog.gob"
+#line 513 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (self != NULL);
-#line 522 "mn-mailbox-properties-dialog.gob"
+#line 513 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self));
-#line 921 "mn-mailbox-properties-dialog.c"
+#line 912 "mn-mailbox-properties-dialog.c"
{
-#line 524 "mn-mailbox-properties-dialog.gob"
+#line 515 "mn-mailbox-properties-dialog.gob"
MNMailboxProperties *properties;
@@ -946,59 +937,59 @@ mn_mailbox_properties_dialog_update_default_check_delay (MNMailboxPropertiesDial
gtk_widget_set_sensitive(selfp->delay_default_button, selfp->has_custom_check_delay = FALSE);
}
}}
-#line 950 "mn-mailbox-properties-dialog.c"
+#line 941 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 551 "mn-mailbox-properties-dialog.gob"
+#line 542 "mn-mailbox-properties-dialog.gob"
void
mn_mailbox_properties_dialog_set_help_section (GtkWidget * page, const char * section)
-#line 956 "mn-mailbox-properties-dialog.c"
+#line 947 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::set_help_section"
-#line 551 "mn-mailbox-properties-dialog.gob"
+#line 542 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (page != NULL);
-#line 551 "mn-mailbox-properties-dialog.gob"
+#line 542 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (GTK_IS_WIDGET (page));
-#line 551 "mn-mailbox-properties-dialog.gob"
+#line 542 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (section != NULL);
-#line 965 "mn-mailbox-properties-dialog.c"
+#line 956 "mn-mailbox-properties-dialog.c"
{
-#line 554 "mn-mailbox-properties-dialog.gob"
+#line 545 "mn-mailbox-properties-dialog.gob"
g_object_set_data_full(G_OBJECT(page), HELP_SECTION, g_strdup(section), g_free);
}}
-#line 971 "mn-mailbox-properties-dialog.c"
+#line 962 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 558 "mn-mailbox-properties-dialog.gob"
+#line 549 "mn-mailbox-properties-dialog.gob"
GtkWidget *
mn_mailbox_properties_dialog_new (GtkWindow * parent, MNMailbox * mailbox)
-#line 977 "mn-mailbox-properties-dialog.c"
+#line 968 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::new"
{
-#line 560 "mn-mailbox-properties-dialog.gob"
+#line 551 "mn-mailbox-properties-dialog.gob"
return GTK_WIDGET(GET_NEW_VARG(MN_MAILBOX_PROPERTIES_DIALOG_PROP_DIALOG_PARENT(parent),
MN_MAILBOX_PROPERTIES_DIALOG_PROP_MAILBOX(mailbox),
NULL));
}}
-#line 987 "mn-mailbox-properties-dialog.c"
+#line 978 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 568 "mn-mailbox-properties-dialog.gob"
+#line 559 "mn-mailbox-properties-dialog.gob"
void
mn_mailbox_properties_dialog_type_changed_h (MNMailboxPropertiesDialog * self, GtkComboBox * combobox)
-#line 993 "mn-mailbox-properties-dialog.c"
+#line 984 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::type_changed_h"
-#line 568 "mn-mailbox-properties-dialog.gob"
+#line 559 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (self != NULL);
-#line 568 "mn-mailbox-properties-dialog.gob"
+#line 559 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self));
-#line 1000 "mn-mailbox-properties-dialog.c"
+#line 991 "mn-mailbox-properties-dialog.c"
{
-#line 570 "mn-mailbox-properties-dialog.gob"
+#line 561 "mn-mailbox-properties-dialog.gob"
if (selfp->active_properties)
{
@@ -1030,22 +1021,22 @@ mn_mailbox_properties_dialog_type_changed_h (MNMailboxPropertiesDialog * self, G
self_update_default_name(self);
self_update_default_check_delay(self);
}}
-#line 1034 "mn-mailbox-properties-dialog.c"
+#line 1025 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 602 "mn-mailbox-properties-dialog.gob"
+#line 593 "mn-mailbox-properties-dialog.gob"
void
mn_mailbox_properties_dialog_name_changed_h (MNMailboxPropertiesDialog * self, GtkEditable * editable)
-#line 1040 "mn-mailbox-properties-dialog.c"
+#line 1031 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::name_changed_h"
-#line 602 "mn-mailbox-properties-dialog.gob"
+#line 593 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (self != NULL);
-#line 602 "mn-mailbox-properties-dialog.gob"
+#line 593 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self));
-#line 1047 "mn-mailbox-properties-dialog.c"
+#line 1038 "mn-mailbox-properties-dialog.c"
{
-#line 604 "mn-mailbox-properties-dialog.gob"
+#line 595 "mn-mailbox-properties-dialog.gob"
const char *name;
@@ -1054,41 +1045,41 @@ mn_mailbox_properties_dialog_name_changed_h (MNMailboxPropertiesDialog * self, G
gtk_widget_set_sensitive(selfp->mailbox_name_default_button, selfp->has_custom_name);
}}
-#line 1058 "mn-mailbox-properties-dialog.c"
+#line 1049 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 613 "mn-mailbox-properties-dialog.gob"
+#line 604 "mn-mailbox-properties-dialog.gob"
void
mn_mailbox_properties_dialog_name_default_button_clicked_h (MNMailboxPropertiesDialog * self, GtkButton * button)
-#line 1064 "mn-mailbox-properties-dialog.c"
+#line 1055 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::name_default_button_clicked_h"
-#line 613 "mn-mailbox-properties-dialog.gob"
+#line 604 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (self != NULL);
-#line 613 "mn-mailbox-properties-dialog.gob"
+#line 604 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self));
-#line 1071 "mn-mailbox-properties-dialog.c"
+#line 1062 "mn-mailbox-properties-dialog.c"
{
-#line 615 "mn-mailbox-properties-dialog.gob"
+#line 606 "mn-mailbox-properties-dialog.gob"
self_update_default_name(self);
}}
-#line 1077 "mn-mailbox-properties-dialog.c"
+#line 1068 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 619 "mn-mailbox-properties-dialog.gob"
+#line 610 "mn-mailbox-properties-dialog.gob"
void
mn_mailbox_properties_dialog_delay_changed_h (MNMailboxPropertiesDialog * self, GtkEditable * editable)
-#line 1083 "mn-mailbox-properties-dialog.c"
+#line 1074 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::delay_changed_h"
-#line 619 "mn-mailbox-properties-dialog.gob"
+#line 610 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (self != NULL);
-#line 619 "mn-mailbox-properties-dialog.gob"
+#line 610 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self));
-#line 1090 "mn-mailbox-properties-dialog.c"
+#line 1081 "mn-mailbox-properties-dialog.c"
{
-#line 621 "mn-mailbox-properties-dialog.gob"
+#line 612 "mn-mailbox-properties-dialog.gob"
int minutes;
int seconds;
@@ -1099,41 +1090,41 @@ mn_mailbox_properties_dialog_delay_changed_h (MNMailboxPropertiesDialog * self,
selfp->has_custom_check_delay = minutes * 60 + seconds != selfp->default_check_delay;
gtk_widget_set_sensitive(selfp->delay_default_button, selfp->has_custom_check_delay);
}}
-#line 1103 "mn-mailbox-properties-dialog.c"
+#line 1094 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 632 "mn-mailbox-properties-dialog.gob"
+#line 623 "mn-mailbox-properties-dialog.gob"
void
mn_mailbox_properties_dialog_delay_default_button_clicked_h (MNMailboxPropertiesDialog * self, GtkButton * button)
-#line 1109 "mn-mailbox-properties-dialog.c"
+#line 1100 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::delay_default_button_clicked_h"
-#line 632 "mn-mailbox-properties-dialog.gob"
+#line 623 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (self != NULL);
-#line 632 "mn-mailbox-properties-dialog.gob"
+#line 623 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self));
-#line 1116 "mn-mailbox-properties-dialog.c"
+#line 1107 "mn-mailbox-properties-dialog.c"
{
-#line 634 "mn-mailbox-properties-dialog.gob"
+#line 625 "mn-mailbox-properties-dialog.gob"
self_update_default_check_delay(self);
}}
-#line 1122 "mn-mailbox-properties-dialog.c"
+#line 1113 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
-#line 638 "mn-mailbox-properties-dialog.gob"
+#line 629 "mn-mailbox-properties-dialog.gob"
void
mn_mailbox_properties_dialog_entry_activate_h (MNMailboxPropertiesDialog * self, GtkEntry * entry)
-#line 1128 "mn-mailbox-properties-dialog.c"
+#line 1119 "mn-mailbox-properties-dialog.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:Properties:Dialog::entry_activate_h"
-#line 638 "mn-mailbox-properties-dialog.gob"
+#line 629 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (self != NULL);
-#line 638 "mn-mailbox-properties-dialog.gob"
+#line 629 "mn-mailbox-properties-dialog.gob"
g_return_if_fail (MN_IS_MAILBOX_PROPERTIES_DIALOG (self));
-#line 1135 "mn-mailbox-properties-dialog.c"
+#line 1126 "mn-mailbox-properties-dialog.c"
{
-#line 640 "mn-mailbox-properties-dialog.gob"
+#line 631 "mn-mailbox-properties-dialog.gob"
if (GTK_WIDGET_IS_SENSITIVE(GTK_WINDOW(self)->default_widget))
gtk_window_activate_default(GTK_WINDOW(self));
@@ -1175,5 +1166,5 @@ mn_mailbox_properties_dialog_entry_activate_h (MNMailboxPropertiesDialog * self,
gtk_widget_grab_focus(next);
}
}}
-#line 1179 "mn-mailbox-properties-dialog.c"
+#line 1170 "mn-mailbox-properties-dialog.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-mailbox-properties-dialog.gob b/src/mn-mailbox-properties-dialog.gob
@@ -339,8 +339,7 @@ class MN:Mailbox:Properties:Dialog from MN:Dialog
gboolean valid;
GtkTreeIter iter;
- valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(selfp->store), &iter);
- while (valid)
+ MN_TREE_MODEL_FOREACH(valid, &iter, GTK_TREE_MODEL(selfp->store))
{
MNMailboxProperties *these_properties;
@@ -352,8 +351,6 @@ class MN:Mailbox:Properties:Dialog from MN:Dialog
gtk_combo_box_set_active_iter(GTK_COMBO_BOX(selfp->mailbox_type_combo), &iter);
break;
}
-
- valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(selfp->store), &iter);
}
}
@@ -375,8 +372,7 @@ class MN:Mailbox:Properties:Dialog from MN:Dialog
gboolean valid;
GtkTreeIter iter;
- valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(selfp->store), &iter);
- while (valid)
+ MN_TREE_MODEL_FOREACH(valid, &iter, GTK_TREE_MODEL(selfp->store))
{
MNMailboxProperties *properties;
MNMailboxPropertiesClass *class;
@@ -389,8 +385,6 @@ class MN:Mailbox:Properties:Dialog from MN:Dialog
return properties;
g_object_unref(properties);
-
- valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(selfp->store), &iter);
}
return NULL;
@@ -402,8 +396,7 @@ class MN:Mailbox:Properties:Dialog from MN:Dialog
gboolean valid;
GtkTreeIter iter;
- valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(selfp->store), &iter);
- while (valid)
+ MN_TREE_MODEL_FOREACH(valid, &iter, GTK_TREE_MODEL(selfp->store))
{
MNMailboxProperties *properties;
@@ -413,8 +406,6 @@ class MN:Mailbox:Properties:Dialog from MN:Dialog
return properties;
g_object_unref(properties);
-
- valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(selfp->store), &iter);
}
return NULL;
diff --git a/src/mn-mailbox-view.c b/src/mn-mailbox-view.c
@@ -1244,9 +1244,8 @@ mn_mailbox_view_find_mailbox (MNMailboxView * self, MNMailbox * mailbox, GtkTree
gboolean valid;
model = gtk_tree_view_get_model(GTK_TREE_VIEW(self));
- valid = gtk_tree_model_get_iter_first(model, &our_iter);
- while (valid)
+ MN_TREE_MODEL_FOREACH(valid, &our_iter, model)
{
MNMailbox *this_mailbox;
gboolean is;
@@ -1260,28 +1259,26 @@ mn_mailbox_view_find_mailbox (MNMailboxView * self, MNMailbox * mailbox, GtkTree
*iter = our_iter;
return TRUE;
}
-
- valid = gtk_tree_model_iter_next(model, &our_iter);
}
return FALSE;
}}
-#line 1270 "mn-mailbox-view.c"
+#line 1267 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 656 "mn-mailbox-view.gob"
+#line 653 "mn-mailbox-view.gob"
static void
mn_mailbox_view_update_sensitivity (MNMailboxView * self)
-#line 1276 "mn-mailbox-view.c"
+#line 1273 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::update_sensitivity"
-#line 656 "mn-mailbox-view.gob"
+#line 653 "mn-mailbox-view.gob"
g_return_if_fail (self != NULL);
-#line 656 "mn-mailbox-view.gob"
+#line 653 "mn-mailbox-view.gob"
g_return_if_fail (MN_IS_MAILBOX_VIEW (self));
-#line 1283 "mn-mailbox-view.c"
+#line 1280 "mn-mailbox-view.c"
{
-#line 658 "mn-mailbox-view.gob"
+#line 655 "mn-mailbox-view.gob"
GtkTreeSelection *selection;
SensitivityInfo info = { FALSE, FALSE };
@@ -1295,17 +1292,17 @@ mn_mailbox_view_update_sensitivity (MNMailboxView * self)
gtk_widget_set_sensitive(selfp->cut_item, info.has_selection);
gtk_widget_set_sensitive(selfp->copy_item, info.has_selection);
}}
-#line 1299 "mn-mailbox-view.c"
+#line 1296 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 672 "mn-mailbox-view.gob"
+#line 669 "mn-mailbox-view.gob"
static void
mn_mailbox_view_update_sensitivity_cb (GtkTreeModel * model, GtkTreePath * path, GtkTreeIter * iter, gpointer data)
-#line 1305 "mn-mailbox-view.c"
+#line 1302 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::update_sensitivity_cb"
{
-#line 677 "mn-mailbox-view.gob"
+#line 674 "mn-mailbox-view.gob"
SensitivityInfo *info = data;
@@ -1320,39 +1317,39 @@ mn_mailbox_view_update_sensitivity_cb (GtkTreeModel * model, GtkTreePath * path,
g_object_unref(mailbox);
}
}}
-#line 1324 "mn-mailbox-view.c"
+#line 1321 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 692 "mn-mailbox-view.gob"
+#line 689 "mn-mailbox-view.gob"
static void
mn_mailbox_view_remove_mailbox (MNMailboxView * self)
-#line 1330 "mn-mailbox-view.c"
+#line 1327 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::remove_mailbox"
-#line 692 "mn-mailbox-view.gob"
+#line 689 "mn-mailbox-view.gob"
g_return_if_fail (self != NULL);
-#line 692 "mn-mailbox-view.gob"
+#line 689 "mn-mailbox-view.gob"
g_return_if_fail (MN_IS_MAILBOX_VIEW (self));
-#line 1337 "mn-mailbox-view.c"
+#line 1334 "mn-mailbox-view.c"
{
-#line 694 "mn-mailbox-view.gob"
+#line 691 "mn-mailbox-view.gob"
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
gtk_tree_selection_selected_foreach(selection, self_remove_mailbox_cb, NULL);
}}
-#line 1346 "mn-mailbox-view.c"
+#line 1343 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 701 "mn-mailbox-view.gob"
+#line 698 "mn-mailbox-view.gob"
static void
mn_mailbox_view_remove_mailbox_cb (GtkTreeModel * model, GtkTreePath * path, GtkTreeIter * iter, gpointer data)
-#line 1352 "mn-mailbox-view.c"
+#line 1349 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::remove_mailbox_cb"
{
-#line 706 "mn-mailbox-view.gob"
+#line 703 "mn-mailbox-view.gob"
MNMailbox *mailbox;
@@ -1360,22 +1357,22 @@ mn_mailbox_view_remove_mailbox_cb (GtkTreeModel * model, GtkTreePath * path, Gtk
mn_mailboxes_queue_remove(mn_shell->mailboxes, mailbox);
g_object_unref(mailbox);
}}
-#line 1364 "mn-mailbox-view.c"
+#line 1361 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 714 "mn-mailbox-view.gob"
+#line 711 "mn-mailbox-view.gob"
static void
mn_mailbox_view_copy_mailbox (MNMailboxView * self)
-#line 1370 "mn-mailbox-view.c"
+#line 1367 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::copy_mailbox"
-#line 714 "mn-mailbox-view.gob"
+#line 711 "mn-mailbox-view.gob"
g_return_if_fail (self != NULL);
-#line 714 "mn-mailbox-view.gob"
+#line 711 "mn-mailbox-view.gob"
g_return_if_fail (MN_IS_MAILBOX_VIEW (self));
-#line 1377 "mn-mailbox-view.c"
+#line 1374 "mn-mailbox-view.c"
{
-#line 716 "mn-mailbox-view.gob"
+#line 713 "mn-mailbox-view.gob"
GSList *configurations = NULL;
GtkTreeSelection *selection;
@@ -1395,17 +1392,17 @@ mn_mailbox_view_copy_mailbox (MNMailboxView * self)
configurations);
g_assert(status == TRUE);
}}
-#line 1399 "mn-mailbox-view.c"
+#line 1396 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 736 "mn-mailbox-view.gob"
+#line 733 "mn-mailbox-view.gob"
static void
mn_mailbox_view_copy_mailbox_cb (GtkTreeModel * model, GtkTreePath * path, GtkTreeIter * iter, gpointer data)
-#line 1405 "mn-mailbox-view.c"
+#line 1402 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::copy_mailbox_cb"
{
-#line 741 "mn-mailbox-view.gob"
+#line 738 "mn-mailbox-view.gob"
GSList **configurations = data;
MNMailbox *mailbox;
@@ -1414,17 +1411,17 @@ mn_mailbox_view_copy_mailbox_cb (GtkTreeModel * model, GtkTreePath * path, GtkTr
*configurations = g_slist_append(*configurations, mn_mailbox_get_configuration(mailbox));
g_object_unref(mailbox);
}}
-#line 1418 "mn-mailbox-view.c"
+#line 1415 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 750 "mn-mailbox-view.gob"
+#line 747 "mn-mailbox-view.gob"
static void
mn_mailbox_view_get_clipboard_cb (GtkClipboard * clipboard, GtkSelectionData * selection_data, unsigned int info, gpointer user_data_or_owner)
-#line 1424 "mn-mailbox-view.c"
+#line 1421 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::get_clipboard_cb"
{
-#line 755 "mn-mailbox-view.gob"
+#line 752 "mn-mailbox-view.gob"
const GSList *configurations = user_data_or_owner;
unsigned char buf[sizeof(configurations)];
@@ -1436,55 +1433,55 @@ mn_mailbox_view_get_clipboard_cb (GtkClipboard * clipboard, GtkSelectionData * s
buf,
sizeof(buf));
}}
-#line 1440 "mn-mailbox-view.c"
+#line 1437 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 767 "mn-mailbox-view.gob"
+#line 764 "mn-mailbox-view.gob"
static void
mn_mailbox_view_clear_clipboard_cb (GtkClipboard * clipboard, gpointer user_data_or_owner)
-#line 1446 "mn-mailbox-view.c"
+#line 1443 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::clear_clipboard_cb"
{
-#line 769 "mn-mailbox-view.gob"
+#line 766 "mn-mailbox-view.gob"
GSList *configurations = user_data_or_owner;
eel_g_slist_free_deep_custom(configurations, (GFunc) mn_mailbox_configuration_free, NULL);
}}
-#line 1456 "mn-mailbox-view.c"
+#line 1453 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 775 "mn-mailbox-view.gob"
+#line 772 "mn-mailbox-view.gob"
static void
mn_mailbox_view_select_all (MNMailboxView * self)
-#line 1462 "mn-mailbox-view.c"
+#line 1459 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::select_all"
-#line 775 "mn-mailbox-view.gob"
+#line 772 "mn-mailbox-view.gob"
g_return_if_fail (self != NULL);
-#line 775 "mn-mailbox-view.gob"
+#line 772 "mn-mailbox-view.gob"
g_return_if_fail (MN_IS_MAILBOX_VIEW (self));
-#line 1469 "mn-mailbox-view.c"
+#line 1466 "mn-mailbox-view.c"
{
-#line 777 "mn-mailbox-view.gob"
+#line 774 "mn-mailbox-view.gob"
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
gtk_tree_selection_select_all(selection);
}}
-#line 1478 "mn-mailbox-view.c"
+#line 1475 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 784 "mn-mailbox-view.gob"
+#line 781 "mn-mailbox-view.gob"
static void
mn_mailbox_view_properties_add_response_h (GtkDialog * dialog, int response, gpointer user_data)
-#line 1484 "mn-mailbox-view.c"
+#line 1481 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::properties_add_response_h"
{
-#line 788 "mn-mailbox-view.gob"
+#line 785 "mn-mailbox-view.gob"
if (response == GTK_RESPONSE_CANCEL)
gtk_widget_destroy(GTK_WIDGET(dialog));
@@ -1502,54 +1499,54 @@ mn_mailbox_view_properties_add_response_h (GtkDialog * dialog, int response, gpo
gtk_widget_destroy(GTK_WIDGET(dialog));
}
}}
-#line 1506 "mn-mailbox-view.c"
+#line 1503 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 806 "mn-mailbox-view.gob"
+#line 803 "mn-mailbox-view.gob"
static void
mn_mailbox_view_properties_edit_response_h (GtkDialog * dialog, int response, gpointer user_data)
-#line 1512 "mn-mailbox-view.c"
+#line 1509 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::properties_edit_response_h"
{
-#line 810 "mn-mailbox-view.gob"
+#line 807 "mn-mailbox-view.gob"
if (response == GTK_RESPONSE_APPLY || response == GTK_RESPONSE_OK)
mn_mailbox_properties_dialog_apply(MN_MAILBOX_PROPERTIES_DIALOG(dialog));
if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_OK)
gtk_widget_destroy(GTK_WIDGET(dialog));
}}
-#line 1523 "mn-mailbox-view.c"
+#line 1520 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 817 "mn-mailbox-view.gob"
+#line 814 "mn-mailbox-view.gob"
static void
mn_mailbox_view_popup_menu (MNMailboxView * self, unsigned int button, guint32 activate_time)
-#line 1529 "mn-mailbox-view.c"
+#line 1526 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::popup_menu"
-#line 817 "mn-mailbox-view.gob"
+#line 814 "mn-mailbox-view.gob"
g_return_if_fail (self != NULL);
-#line 817 "mn-mailbox-view.gob"
+#line 814 "mn-mailbox-view.gob"
g_return_if_fail (MN_IS_MAILBOX_VIEW (self));
-#line 1536 "mn-mailbox-view.c"
+#line 1533 "mn-mailbox-view.c"
{
-#line 819 "mn-mailbox-view.gob"
+#line 816 "mn-mailbox-view.gob"
gtk_clipboard_request_targets(global_clipboard, self_popup_menu_targets_received_cb, self);
gtk_menu_popup(GTK_MENU(selfp->menu), NULL, NULL, NULL, NULL, button, activate_time);
}}
-#line 1543 "mn-mailbox-view.c"
+#line 1540 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 824 "mn-mailbox-view.gob"
+#line 821 "mn-mailbox-view.gob"
static void
mn_mailbox_view_popup_menu_targets_received_cb (GtkClipboard * clipboard, GdkAtom * atoms, int n_atoms, gpointer data)
-#line 1549 "mn-mailbox-view.c"
+#line 1546 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::popup_menu_targets_received_cb"
{
-#line 829 "mn-mailbox-view.gob"
+#line 826 "mn-mailbox-view.gob"
Self *self = data;
int i;
@@ -1565,17 +1562,17 @@ mn_mailbox_view_popup_menu_targets_received_cb (GtkClipboard * clipboard, GdkAto
gtk_widget_set_sensitive(selfp->paste_item, can_paste);
}}
-#line 1569 "mn-mailbox-view.c"
+#line 1566 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 845 "mn-mailbox-view.gob"
+#line 842 "mn-mailbox-view.gob"
static gboolean
mn_mailbox_view_popup_menu_h (GtkWidget * widget, gpointer user_data)
-#line 1575 "mn-mailbox-view.c"
+#line 1572 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::popup_menu_h"
{
-#line 847 "mn-mailbox-view.gob"
+#line 844 "mn-mailbox-view.gob"
Self *self = SELF(widget);
@@ -1584,51 +1581,51 @@ mn_mailbox_view_popup_menu_h (GtkWidget * widget, gpointer user_data)
return TRUE; /* a menu was activated */
}}
-#line 1588 "mn-mailbox-view.c"
+#line 1585 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 856 "mn-mailbox-view.gob"
+#line 853 "mn-mailbox-view.gob"
static gboolean
mn_mailbox_view_button_press_event_h (GtkWidget * widget, GdkEventButton * event, gpointer user_data)
-#line 1594 "mn-mailbox-view.c"
+#line 1591 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::button_press_event_h"
{
-#line 860 "mn-mailbox-view.gob"
+#line 857 "mn-mailbox-view.gob"
if (event->button == 3)
self_popup_menu(SELF(widget), event->button, event->time);
return FALSE; /* propagate event */
}}
-#line 1605 "mn-mailbox-view.c"
+#line 1602 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 867 "mn-mailbox-view.gob"
+#line 864 "mn-mailbox-view.gob"
static void
mn_mailbox_view_row_activated_h (GtkTreeView * treeview, GtkTreePath * path, GtkTreeViewColumn * column, gpointer user_data)
-#line 1611 "mn-mailbox-view.c"
+#line 1608 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::row_activated_h"
{
-#line 872 "mn-mailbox-view.gob"
+#line 869 "mn-mailbox-view.gob"
self_activate_properties(SELF(treeview));
}}
-#line 1619 "mn-mailbox-view.c"
+#line 1616 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
-#line 876 "mn-mailbox-view.gob"
+#line 873 "mn-mailbox-view.gob"
GtkWidget *
mn_mailbox_view_new (void)
-#line 1625 "mn-mailbox-view.c"
+#line 1622 "mn-mailbox-view.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox:View::new"
{
-#line 878 "mn-mailbox-view.gob"
+#line 875 "mn-mailbox-view.gob"
g_return_val_if_fail(mn_shell != NULL, NULL);
return GTK_WIDGET(GET_NEW);
}}
-#line 1634 "mn-mailbox-view.c"
+#line 1631 "mn-mailbox-view.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-mailbox-view.gob b/src/mn-mailbox-view.gob
@@ -630,9 +630,8 @@ class MN:Mailbox:View from Gtk:Tree:View
gboolean valid;
model = gtk_tree_view_get_model(GTK_TREE_VIEW(self));
- valid = gtk_tree_model_get_iter_first(model, &our_iter);
- while (valid)
+ MN_TREE_MODEL_FOREACH(valid, &our_iter, model)
{
MNMailbox *this_mailbox;
gboolean is;
@@ -646,8 +645,6 @@ class MN:Mailbox:View from Gtk:Tree:View
*iter = our_iter;
return TRUE;
}
-
- valid = gtk_tree_model_iter_next(model, &our_iter);
}
return FALSE;
diff --git a/src/mn-mailbox.c b/src/mn-mailbox.c
@@ -157,6 +157,7 @@ enum {
PROP_OPEN_COMMAND,
PROP_MARK_AS_READ_COMMAND,
PROP_MARK_AS_SPAM_COMMAND,
+ PROP_DELETE_COMMAND,
PROP_STOCK_ID,
PROP_FORMAT,
PROP_CHECK_DELAY,
@@ -259,45 +260,48 @@ ___finalize(GObject *obj_self)
#define __GOB_FUNCTION__ "MN:Mailbox::finalize"
MNMailbox *self G_GNUC_UNUSED = MN_MAILBOX (obj_self);
gpointer priv G_GNUC_UNUSED = self->_priv;
-#line 450 "mn-mailbox.gob"
+#line 453 "mn-mailbox.gob"
___15_mn_mailbox_finalize(obj_self);
-#line 265 "mn-mailbox.c"
+#line 266 "mn-mailbox.c"
#line 130 "mn-mailbox.gob"
if(self->runtime_name) { g_free ((gpointer) self->runtime_name); self->runtime_name = NULL; }
-#line 268 "mn-mailbox.c"
+#line 269 "mn-mailbox.c"
#line 132 "mn-mailbox.gob"
if(self->name) { g_free ((gpointer) self->name); self->name = NULL; }
-#line 271 "mn-mailbox.c"
+#line 272 "mn-mailbox.c"
#line 135 "mn-mailbox.gob"
if(self->open_command) { g_free ((gpointer) self->open_command); self->open_command = NULL; }
-#line 274 "mn-mailbox.c"
+#line 275 "mn-mailbox.c"
#line 138 "mn-mailbox.gob"
if(self->mark_as_read_command) { g_free ((gpointer) self->mark_as_read_command); self->mark_as_read_command = NULL; }
-#line 277 "mn-mailbox.c"
+#line 278 "mn-mailbox.c"
#line 141 "mn-mailbox.gob"
if(self->mark_as_spam_command) { g_free ((gpointer) self->mark_as_spam_command); self->mark_as_spam_command = NULL; }
-#line 280 "mn-mailbox.c"
+#line 281 "mn-mailbox.c"
#line 144 "mn-mailbox.gob"
- if(self->stock_id) { g_free ((gpointer) self->stock_id); self->stock_id = NULL; }
-#line 283 "mn-mailbox.c"
+ if(self->delete_command) { g_free ((gpointer) self->delete_command); self->delete_command = NULL; }
+#line 284 "mn-mailbox.c"
#line 147 "mn-mailbox.gob"
+ if(self->stock_id) { g_free ((gpointer) self->stock_id); self->stock_id = NULL; }
+#line 287 "mn-mailbox.c"
+#line 150 "mn-mailbox.gob"
if(self->format) { g_free ((gpointer) self->format); self->format = NULL; }
-#line 286 "mn-mailbox.c"
-#line 192 "mn-mailbox.gob"
+#line 290 "mn-mailbox.c"
+#line 195 "mn-mailbox.gob"
if(self->_priv->unfiltered_messages) { mn_g_object_slist_free ((gpointer) self->_priv->unfiltered_messages); self->_priv->unfiltered_messages = NULL; }
-#line 289 "mn-mailbox.c"
-#line 194 "mn-mailbox.gob"
- if(self->_priv->messages_marked_as_read) { g_hash_table_destroy ((gpointer) self->_priv->messages_marked_as_read); self->_priv->messages_marked_as_read = NULL; }
-#line 292 "mn-mailbox.c"
+#line 293 "mn-mailbox.c"
#line 197 "mn-mailbox.gob"
+ if(self->_priv->messages_marked_as_read) { g_hash_table_destroy ((gpointer) self->_priv->messages_marked_as_read); self->_priv->messages_marked_as_read = NULL; }
+#line 296 "mn-mailbox.c"
+#line 200 "mn-mailbox.gob"
if(self->messages) { mn_g_object_slist_free ((gpointer) self->messages); self->messages = NULL; }
-#line 295 "mn-mailbox.c"
-#line 216 "mn-mailbox.gob"
+#line 299 "mn-mailbox.c"
+#line 219 "mn-mailbox.gob"
if(self->_priv->messages_hash_table) { g_hash_table_destroy ((gpointer) self->_priv->messages_hash_table); self->_priv->messages_hash_table = NULL; }
-#line 298 "mn-mailbox.c"
-#line 362 "mn-mailbox.gob"
+#line 302 "mn-mailbox.c"
+#line 365 "mn-mailbox.gob"
if(self->error) { g_free ((gpointer) self->error); self->error = NULL; }
-#line 301 "mn-mailbox.c"
+#line 305 "mn-mailbox.c"
}
#undef __GOB_FUNCTION__
@@ -310,7 +314,7 @@ mn_mailbox_class_init (MNMailboxClass * c G_GNUC_UNUSED)
g_type_class_add_private(c,sizeof(MNMailboxPrivate));
#line 53 "mn-mailbox.gob"
c->default_check_delay = -1;
-#line 314 "mn-mailbox.c"
+#line 318 "mn-mailbox.c"
parent_class = g_type_class_ref (G_TYPE_OBJECT);
@@ -340,24 +344,24 @@ mn_mailbox_class_init (MNMailboxClass * c G_GNUC_UNUSED)
G_TYPE_NONE, 1,
G_TYPE_BOOLEAN);
if ___GOB_UNLIKELY(sizeof(gboolean ) != sizeof(gboolean ) || parent_class == NULL /* avoid warning */) {
- g_error("mn-mailbox.gob line 359: Type mismatch of \"messages_changed\" signal signature");
+ g_error("mn-mailbox.gob line 362: Type mismatch of \"messages_changed\" signal signature");
}
#line 108 "mn-mailbox.gob"
c->added = ___real_mn_mailbox_added;
#line 124 "mn-mailbox.gob"
c->removed = ___real_mn_mailbox_removed;
-#line 351 "mn-mailbox.c"
+#line 355 "mn-mailbox.c"
c->messages_changed = NULL;
-#line 450 "mn-mailbox.gob"
+#line 453 "mn-mailbox.gob"
g_object_class->finalize = ___finalize;
-#line 916 "mn-mailbox.gob"
+#line 919 "mn-mailbox.gob"
c->seal = ___real_mn_mailbox_seal;
-#line 357 "mn-mailbox.c"
+#line 361 "mn-mailbox.c"
c->parse_uri = NULL;
-#line 933 "mn-mailbox.gob"
+#line 936 "mn-mailbox.gob"
c->check = ___real_mn_mailbox_check;
-#line 361 "mn-mailbox.c"
+#line 365 "mn-mailbox.c"
g_object_class->get_property = ___object_get_property;
g_object_class->set_property = ___object_set_property;
{
@@ -400,6 +404,15 @@ mn_mailbox_class_init (MNMailboxClass * c G_GNUC_UNUSED)
PROP_MARK_AS_SPAM_COMMAND,
param_spec);
param_spec = g_param_spec_string
+ ("delete_command" /* name */,
+ NULL /* nick */,
+ NULL /* blurb */,
+ NULL /* default_value */,
+ (GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | MN_MAILBOX_PARAM_PERMANENT));
+ g_object_class_install_property (g_object_class,
+ PROP_DELETE_COMMAND,
+ param_spec);
+ param_spec = g_param_spec_string
("stock_id" /* name */,
NULL /* nick */,
NULL /* blurb */,
@@ -457,25 +470,25 @@ mn_mailbox_class_init (MNMailboxClass * c G_GNUC_UNUSED)
}
}
#undef __GOB_FUNCTION__
-#line 445 "mn-mailbox.gob"
+#line 448 "mn-mailbox.gob"
static void
mn_mailbox_init (MNMailbox * self G_GNUC_UNUSED)
-#line 464 "mn-mailbox.c"
+#line 477 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::init"
self->_priv = G_TYPE_INSTANCE_GET_PRIVATE(self,MN_TYPE_MAILBOX,MNMailboxPrivate);
#line 126 "mn-mailbox.gob"
self->_priv->poll = TRUE;
-#line 470 "mn-mailbox.c"
-#line 194 "mn-mailbox.gob"
+#line 483 "mn-mailbox.c"
+#line 197 "mn-mailbox.gob"
self->_priv->messages_marked_as_read = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify) g_object_unref);
-#line 473 "mn-mailbox.c"
+#line 486 "mn-mailbox.c"
{
-#line 446 "mn-mailbox.gob"
+#line 449 "mn-mailbox.gob"
mn_g_object_gconf_notification_add_gdk_locked(self, MN_CONF_DISPLAY_SEEN_MAIL, self_notify_display_seen_messages_cb, self);
-#line 479 "mn-mailbox.c"
+#line 492 "mn-mailbox.c"
}
}
#undef __GOB_FUNCTION__
@@ -496,54 +509,61 @@ ___object_set_property (GObject *object,
{
#line 133 "mn-mailbox.gob"
{ char *old = self->name; self->name = g_value_dup_string (VAL); g_free (old); }
-#line 500 "mn-mailbox.c"
+#line 513 "mn-mailbox.c"
}
break;
case PROP_OPEN_COMMAND:
{
#line 136 "mn-mailbox.gob"
{ char *old = self->open_command; self->open_command = g_value_dup_string (VAL); g_free (old); }
-#line 507 "mn-mailbox.c"
+#line 520 "mn-mailbox.c"
}
break;
case PROP_MARK_AS_READ_COMMAND:
{
#line 139 "mn-mailbox.gob"
{ char *old = self->mark_as_read_command; self->mark_as_read_command = g_value_dup_string (VAL); g_free (old); }
-#line 514 "mn-mailbox.c"
+#line 527 "mn-mailbox.c"
}
break;
case PROP_MARK_AS_SPAM_COMMAND:
{
#line 142 "mn-mailbox.gob"
{ char *old = self->mark_as_spam_command; self->mark_as_spam_command = g_value_dup_string (VAL); g_free (old); }
-#line 521 "mn-mailbox.c"
+#line 534 "mn-mailbox.c"
}
break;
- case PROP_STOCK_ID:
+ case PROP_DELETE_COMMAND:
{
#line 145 "mn-mailbox.gob"
+{ char *old = self->delete_command; self->delete_command = g_value_dup_string (VAL); g_free (old); }
+#line 541 "mn-mailbox.c"
+ }
+ break;
+ case PROP_STOCK_ID:
+ {
+#line 148 "mn-mailbox.gob"
{ char *old = self->stock_id; self->stock_id = g_value_dup_string (VAL); g_free (old); }
-#line 528 "mn-mailbox.c"
+#line 548 "mn-mailbox.c"
}
break;
case PROP_FORMAT:
{
-#line 148 "mn-mailbox.gob"
+#line 151 "mn-mailbox.gob"
{ char *old = self->format; self->format = g_value_dup_string (VAL); g_free (old); }
-#line 535 "mn-mailbox.c"
+#line 555 "mn-mailbox.c"
}
break;
case PROP_CHECK_DELAY:
{
-#line 155 "mn-mailbox.gob"
+#line 158 "mn-mailbox.gob"
self->check_delay = g_value_get_int (VAL);
-#line 542 "mn-mailbox.c"
+#line 562 "mn-mailbox.c"
}
break;
case PROP_POLL:
{
-#line 162 "mn-mailbox.gob"
+#line 165 "mn-mailbox.gob"
gboolean new_poll = g_value_get_boolean(VAL);
@@ -558,24 +578,24 @@ self->check_delay = g_value_get_int (VAL);
self_update_check_timeout(self);
}
-#line 562 "mn-mailbox.c"
+#line 582 "mn-mailbox.c"
}
break;
case PROP_MESSAGES:
{
-#line 205 "mn-mailbox.gob"
+#line 208 "mn-mailbox.gob"
mn_g_object_slist_free(selfp->unfiltered_messages);
selfp->unfiltered_messages = mn_g_object_slist_copy(g_value_get_pointer(VAL));
self_filter_messages(self);
-#line 574 "mn-mailbox.c"
+#line 594 "mn-mailbox.c"
}
break;
case PROP_ERROR:
{
-#line 365 "mn-mailbox.gob"
+#line 368 "mn-mailbox.gob"
g_free(self->error);
self->error = g_value_dup_string(VAL);
@@ -584,7 +604,7 @@ self->check_delay = g_value_get_int (VAL);
if (self->error)
self_set_messages(self, NULL);
-#line 588 "mn-mailbox.c"
+#line 608 "mn-mailbox.c"
}
break;
default:
@@ -615,76 +635,83 @@ ___object_get_property (GObject *object,
{
#line 133 "mn-mailbox.gob"
g_value_set_string (VAL, self->name);
-#line 619 "mn-mailbox.c"
+#line 639 "mn-mailbox.c"
}
break;
case PROP_OPEN_COMMAND:
{
#line 136 "mn-mailbox.gob"
g_value_set_string (VAL, self->open_command);
-#line 626 "mn-mailbox.c"
+#line 646 "mn-mailbox.c"
}
break;
case PROP_MARK_AS_READ_COMMAND:
{
#line 139 "mn-mailbox.gob"
g_value_set_string (VAL, self->mark_as_read_command);
-#line 633 "mn-mailbox.c"
+#line 653 "mn-mailbox.c"
}
break;
case PROP_MARK_AS_SPAM_COMMAND:
{
#line 142 "mn-mailbox.gob"
g_value_set_string (VAL, self->mark_as_spam_command);
-#line 640 "mn-mailbox.c"
+#line 660 "mn-mailbox.c"
}
break;
- case PROP_STOCK_ID:
+ case PROP_DELETE_COMMAND:
{
#line 145 "mn-mailbox.gob"
+g_value_set_string (VAL, self->delete_command);
+#line 667 "mn-mailbox.c"
+ }
+ break;
+ case PROP_STOCK_ID:
+ {
+#line 148 "mn-mailbox.gob"
g_value_set_string (VAL, self->stock_id);
-#line 647 "mn-mailbox.c"
+#line 674 "mn-mailbox.c"
}
break;
case PROP_FORMAT:
{
-#line 148 "mn-mailbox.gob"
+#line 151 "mn-mailbox.gob"
g_value_set_string (VAL, self->format);
-#line 654 "mn-mailbox.c"
+#line 681 "mn-mailbox.c"
}
break;
case PROP_CHECK_DELAY:
{
-#line 155 "mn-mailbox.gob"
+#line 158 "mn-mailbox.gob"
g_value_set_int (VAL, self->check_delay);
-#line 661 "mn-mailbox.c"
+#line 688 "mn-mailbox.c"
}
break;
case PROP_POLL:
{
-#line 177 "mn-mailbox.gob"
+#line 180 "mn-mailbox.gob"
g_value_set_boolean(VAL, selfp->poll);
-#line 670 "mn-mailbox.c"
+#line 697 "mn-mailbox.c"
}
break;
case PROP_MESSAGES:
{
-#line 212 "mn-mailbox.gob"
+#line 215 "mn-mailbox.gob"
g_value_set_pointer(VAL, self->messages);
-#line 679 "mn-mailbox.c"
+#line 706 "mn-mailbox.c"
}
break;
case PROP_ERROR:
{
-#line 374 "mn-mailbox.gob"
+#line 377 "mn-mailbox.gob"
g_value_set_string(VAL, self->error);
-#line 688 "mn-mailbox.c"
+#line 715 "mn-mailbox.c"
}
break;
default:
@@ -710,7 +737,7 @@ g_value_set_int (VAL, self->check_delay);
#line 108 "mn-mailbox.gob"
void
mn_mailbox_added (MNMailbox * self)
-#line 714 "mn-mailbox.c"
+#line 741 "mn-mailbox.c"
{
GValue ___param_values[1];
GValue ___return_val;
@@ -722,7 +749,7 @@ memset (&___param_values, 0, sizeof (___param_values));
g_return_if_fail (self != NULL);
#line 108 "mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 726 "mn-mailbox.c"
+#line 753 "mn-mailbox.c"
___param_values[0].g_type = 0;
g_value_init (&___param_values[0], G_TYPE_FROM_INSTANCE (self));
@@ -738,7 +765,7 @@ memset (&___param_values, 0, sizeof (___param_values));
#line 108 "mn-mailbox.gob"
static void
___real_mn_mailbox_added (MNMailbox * self G_GNUC_UNUSED)
-#line 742 "mn-mailbox.c"
+#line 769 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::added"
{
@@ -749,7 +776,7 @@ ___real_mn_mailbox_added (MNMailbox * self G_GNUC_UNUSED)
self_update_check_timeout(self);
self_check(self);
}}
-#line 753 "mn-mailbox.c"
+#line 780 "mn-mailbox.c"
#undef __GOB_FUNCTION__
/**
@@ -762,7 +789,7 @@ ___real_mn_mailbox_added (MNMailbox * self G_GNUC_UNUSED)
#line 124 "mn-mailbox.gob"
void
mn_mailbox_removed (MNMailbox * self)
-#line 766 "mn-mailbox.c"
+#line 793 "mn-mailbox.c"
{
GValue ___param_values[1];
GValue ___return_val;
@@ -774,7 +801,7 @@ memset (&___param_values, 0, sizeof (___param_values));
g_return_if_fail (self != NULL);
#line 124 "mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 778 "mn-mailbox.c"
+#line 805 "mn-mailbox.c"
___param_values[0].g_type = 0;
g_value_init (&___param_values[0], G_TYPE_FROM_INSTANCE (self));
@@ -790,7 +817,7 @@ memset (&___param_values, 0, sizeof (___param_values));
#line 124 "mn-mailbox.gob"
static void
___real_mn_mailbox_removed (MNMailbox * self G_GNUC_UNUSED)
-#line 794 "mn-mailbox.c"
+#line 821 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::removed"
{
@@ -798,100 +825,100 @@ ___real_mn_mailbox_removed (MNMailbox * self G_GNUC_UNUSED)
mn_locked_g_source_clear(&selfp->check_timeout_source);
}}
-#line 802 "mn-mailbox.c"
+#line 829 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 145 "mn-mailbox.gob"
+#line 148 "mn-mailbox.gob"
gchar *
mn_mailbox_get_stock_id (MNMailbox * self)
-#line 808 "mn-mailbox.c"
+#line 835 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::get_stock_id"
{
-#line 145 "mn-mailbox.gob"
+#line 148 "mn-mailbox.gob"
gchar* val; g_object_get (G_OBJECT (self), "stock_id", &val, NULL); return val;
}}
-#line 815 "mn-mailbox.c"
+#line 842 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 145 "mn-mailbox.gob"
+#line 148 "mn-mailbox.gob"
void
mn_mailbox_set_stock_id (MNMailbox * self, gchar * val)
-#line 821 "mn-mailbox.c"
+#line 848 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::set_stock_id"
{
-#line 145 "mn-mailbox.gob"
+#line 148 "mn-mailbox.gob"
g_object_set (G_OBJECT (self), "stock_id", val, NULL);
}}
-#line 828 "mn-mailbox.c"
+#line 855 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 148 "mn-mailbox.gob"
+#line 151 "mn-mailbox.gob"
gchar *
mn_mailbox_get_format (MNMailbox * self)
-#line 834 "mn-mailbox.c"
+#line 861 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::get_format"
{
-#line 148 "mn-mailbox.gob"
+#line 151 "mn-mailbox.gob"
gchar* val; g_object_get (G_OBJECT (self), "format", &val, NULL); return val;
}}
-#line 841 "mn-mailbox.c"
+#line 868 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 148 "mn-mailbox.gob"
+#line 151 "mn-mailbox.gob"
void
mn_mailbox_set_format (MNMailbox * self, gchar * val)
-#line 847 "mn-mailbox.c"
+#line 874 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::set_format"
{
-#line 148 "mn-mailbox.gob"
+#line 151 "mn-mailbox.gob"
g_object_set (G_OBJECT (self), "format", val, NULL);
}}
-#line 854 "mn-mailbox.c"
+#line 881 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 177 "mn-mailbox.gob"
+#line 180 "mn-mailbox.gob"
gboolean
mn_mailbox_get_poll (MNMailbox * self)
-#line 860 "mn-mailbox.c"
+#line 887 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::get_poll"
{
-#line 160 "mn-mailbox.gob"
+#line 163 "mn-mailbox.gob"
gboolean val; g_object_get (G_OBJECT (self), "poll", &val, NULL); return val;
}}
-#line 867 "mn-mailbox.c"
+#line 894 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 162 "mn-mailbox.gob"
+#line 165 "mn-mailbox.gob"
void
mn_mailbox_set_poll (MNMailbox * self, gboolean val)
-#line 873 "mn-mailbox.c"
+#line 900 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::set_poll"
{
-#line 160 "mn-mailbox.gob"
+#line 163 "mn-mailbox.gob"
g_object_set (G_OBJECT (self), "poll", val, NULL);
}}
-#line 880 "mn-mailbox.c"
+#line 907 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 181 "mn-mailbox.gob"
+#line 184 "mn-mailbox.gob"
static void
mn_mailbox_update_check_timeout (MNMailbox * self)
-#line 886 "mn-mailbox.c"
+#line 913 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::update_check_timeout"
-#line 181 "mn-mailbox.gob"
+#line 184 "mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 181 "mn-mailbox.gob"
+#line 184 "mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 893 "mn-mailbox.c"
+#line 920 "mn-mailbox.c"
{
-#line 183 "mn-mailbox.gob"
+#line 186 "mn-mailbox.gob"
g_assert(selfp->added == TRUE);
@@ -899,33 +926,33 @@ mn_mailbox_update_check_timeout (MNMailbox * self)
if (selfp->poll && self->runtime_check_delay > 0)
selfp->check_timeout_source = mn_g_timeout_add_gdk_locked(self->runtime_check_delay * 1000, self_check_timeout_cb, self);
}}
-#line 903 "mn-mailbox.c"
+#line 930 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 212 "mn-mailbox.gob"
+#line 215 "mn-mailbox.gob"
const GSList *
mn_mailbox_get_messages (MNMailbox * self)
-#line 909 "mn-mailbox.c"
+#line 936 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::get_messages"
{
-#line 203 "mn-mailbox.gob"
+#line 206 "mn-mailbox.gob"
const GSList* val; g_object_get (G_OBJECT (self), "messages", &val, NULL); return val;
}}
-#line 916 "mn-mailbox.c"
+#line 943 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 205 "mn-mailbox.gob"
+#line 208 "mn-mailbox.gob"
void
mn_mailbox_set_messages (MNMailbox * self, const GSList * val)
-#line 922 "mn-mailbox.c"
+#line 949 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::set_messages"
{
-#line 203 "mn-mailbox.gob"
+#line 206 "mn-mailbox.gob"
g_object_set (G_OBJECT (self), "messages", val, NULL);
}}
-#line 929 "mn-mailbox.c"
+#line 956 "mn-mailbox.c"
#undef __GOB_FUNCTION__
/**
@@ -937,19 +964,19 @@ mn_mailbox_set_messages (MNMailbox * self, const GSList * val)
* @self->messages. Additionally, if @self->messages has changed,
* emit the "messages-changed" signal.
**/
-#line 227 "mn-mailbox.gob"
+#line 230 "mn-mailbox.gob"
static void
mn_mailbox_filter_messages (MNMailbox * self)
-#line 944 "mn-mailbox.c"
+#line 971 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::filter_messages"
-#line 227 "mn-mailbox.gob"
+#line 230 "mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 227 "mn-mailbox.gob"
+#line 230 "mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 951 "mn-mailbox.c"
+#line 978 "mn-mailbox.c"
{
-#line 229 "mn-mailbox.gob"
+#line 232 "mn-mailbox.gob"
gboolean display_seen_mail;
GSList *messages = NULL;
@@ -1017,21 +1044,21 @@ mn_mailbox_filter_messages (MNMailbox * self)
if (changed)
self_messages_changed(self, has_new);
}}
-#line 1021 "mn-mailbox.c"
+#line 1048 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 297 "mn-mailbox.gob"
+#line 300 "mn-mailbox.gob"
static gboolean
mn_mailbox_clean_messages_marked_as_read_cb (const char * id, MNMessage * message, GHashTable * messages)
-#line 1027 "mn-mailbox.c"
+#line 1054 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::clean_messages_marked_as_read_cb"
{
-#line 301 "mn-mailbox.gob"
+#line 304 "mn-mailbox.gob"
return g_hash_table_lookup(messages, id) == NULL;
}}
-#line 1035 "mn-mailbox.c"
+#line 1062 "mn-mailbox.c"
#undef __GOB_FUNCTION__
/**
@@ -1044,14 +1071,14 @@ mn_mailbox_clean_messages_marked_as_read_cb (const char * id, MNMessage * messag
* Return value: %TRUE if @messages1 contains messages not present
* in @messages2, %FALSE otherwise.
**/
-#line 315 "mn-mailbox.gob"
+#line 318 "mn-mailbox.gob"
static gboolean
mn_mailbox_compare_messages (GHashTable * messages1, GHashTable * messages2)
-#line 1051 "mn-mailbox.c"
+#line 1078 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::compare_messages"
{
-#line 317 "mn-mailbox.gob"
+#line 320 "mn-mailbox.gob"
if (messages1)
{
@@ -1071,28 +1098,28 @@ mn_mailbox_compare_messages (GHashTable * messages1, GHashTable * messages2)
else
return FALSE;
}}
-#line 1075 "mn-mailbox.c"
+#line 1102 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 337 "mn-mailbox.gob"
+#line 340 "mn-mailbox.gob"
static void
mn_mailbox_compare_messages_cb (const char * id, MNMessage * message, CompareMessagesInfo * info)
-#line 1081 "mn-mailbox.c"
+#line 1108 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::compare_messages_cb"
{
-#line 341 "mn-mailbox.gob"
+#line 344 "mn-mailbox.gob"
if (! info->changed && ! g_hash_table_lookup(info->other, id))
info->changed = TRUE;
}}
-#line 1090 "mn-mailbox.c"
+#line 1117 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 359 "mn-mailbox.gob"
+#line 362 "mn-mailbox.gob"
static void
mn_mailbox_messages_changed (MNMailbox * self, gboolean has_new)
-#line 1096 "mn-mailbox.c"
+#line 1123 "mn-mailbox.c"
{
GValue ___param_values[2];
GValue ___return_val;
@@ -1100,11 +1127,11 @@ mn_mailbox_messages_changed (MNMailbox * self, gboolean has_new)
memset (&___return_val, 0, sizeof (___return_val));
memset (&___param_values, 0, sizeof (___param_values));
-#line 359 "mn-mailbox.gob"
+#line 362 "mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 359 "mn-mailbox.gob"
+#line 362 "mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 1108 "mn-mailbox.c"
+#line 1135 "mn-mailbox.c"
___param_values[0].g_type = 0;
g_value_init (&___param_values[0], G_TYPE_FROM_INSTANCE (self));
@@ -1123,19 +1150,19 @@ memset (&___param_values, 0, sizeof (___param_values));
g_value_unset (&___param_values[1]);
}
-#line 378 "mn-mailbox.gob"
+#line 381 "mn-mailbox.gob"
void
mn_mailbox_set_error (MNMailbox * self, const char * format, ...)
-#line 1130 "mn-mailbox.c"
+#line 1157 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::set_error"
-#line 378 "mn-mailbox.gob"
+#line 381 "mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 378 "mn-mailbox.gob"
+#line 381 "mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 1137 "mn-mailbox.c"
+#line 1164 "mn-mailbox.c"
{
-#line 380 "mn-mailbox.gob"
+#line 383 "mn-mailbox.gob"
va_list args;
char *error = NULL;
@@ -1150,17 +1177,17 @@ mn_mailbox_set_error (MNMailbox * self, const char * format, ...)
g_object_set(G_OBJECT(self), MN_MAILBOX_PROP_ERROR(error), NULL);
g_free(error);
}}
-#line 1154 "mn-mailbox.c"
+#line 1181 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 395 "mn-mailbox.gob"
+#line 398 "mn-mailbox.gob"
void
mn_mailbox_init_types (void)
-#line 1160 "mn-mailbox.c"
+#line 1187 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::init_types"
{
-#line 397 "mn-mailbox.gob"
+#line 400 "mn-mailbox.gob"
int i = 0;
@@ -1187,17 +1214,17 @@ mn_mailbox_init_types (void)
#endif
mn_mailbox_types[i] = 0;
}}
-#line 1191 "mn-mailbox.c"
+#line 1218 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 424 "mn-mailbox.gob"
+#line 427 "mn-mailbox.gob"
GType
mn_mailbox_get_type_from_name (const char * type)
-#line 1197 "mn-mailbox.c"
+#line 1224 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::get_type_from_name"
{
-#line 426 "mn-mailbox.gob"
+#line 429 "mn-mailbox.gob"
int i;
@@ -1216,21 +1243,21 @@ mn_mailbox_get_type_from_name (const char * type)
return 0;
}}
-#line 1220 "mn-mailbox.c"
+#line 1247 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 450 "mn-mailbox.gob"
+#line 453 "mn-mailbox.gob"
static void
___15_mn_mailbox_finalize (GObject * object G_GNUC_UNUSED)
-#line 1227 "mn-mailbox.c"
+#line 1254 "mn-mailbox.c"
#define PARENT_HANDLER(___object) \
{ if(G_OBJECT_CLASS(parent_class)->finalize) \
(* G_OBJECT_CLASS(parent_class)->finalize)(___object); }
{
#define __GOB_FUNCTION__ "MN:Mailbox::finalize"
{
-#line 452 "mn-mailbox.gob"
+#line 455 "mn-mailbox.gob"
Self *self = SELF(object);
@@ -1244,37 +1271,37 @@ ___15_mn_mailbox_finalize (GObject * object G_GNUC_UNUSED)
PARENT_HANDLER(object);
}}
-#line 1248 "mn-mailbox.c"
+#line 1275 "mn-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 466 "mn-mailbox.gob"
+#line 469 "mn-mailbox.gob"
static void
mn_mailbox_notify_display_seen_messages_cb (GConfClient * client, unsigned int cnxn_id, GConfEntry * entry, gpointer user_data)
-#line 1255 "mn-mailbox.c"
+#line 1282 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::notify_display_seen_messages_cb"
{
-#line 471 "mn-mailbox.gob"
+#line 474 "mn-mailbox.gob"
Self *self = user_data;
self_filter_messages(self);
}}
-#line 1265 "mn-mailbox.c"
+#line 1292 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 477 "mn-mailbox.gob"
+#line 480 "mn-mailbox.gob"
MNMailbox *
mn_mailbox_new (const char * type, const char * first, ...)
-#line 1271 "mn-mailbox.c"
+#line 1298 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::new"
-#line 477 "mn-mailbox.gob"
+#line 480 "mn-mailbox.gob"
g_return_val_if_fail (type != NULL, (MNMailbox * )0);
-#line 1276 "mn-mailbox.c"
+#line 1303 "mn-mailbox.c"
{
-#line 479 "mn-mailbox.gob"
+#line 482 "mn-mailbox.gob"
va_list args;
GType type_id;
@@ -1290,20 +1317,20 @@ mn_mailbox_new (const char * type, const char * first, ...)
return SELF(object);
}}
-#line 1294 "mn-mailbox.c"
+#line 1321 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 495 "mn-mailbox.gob"
+#line 498 "mn-mailbox.gob"
MNMailbox *
mn_mailbox_new_from_xml_node (xmlNode * node, GError ** err)
-#line 1300 "mn-mailbox.c"
+#line 1327 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::new_from_xml_node"
-#line 495 "mn-mailbox.gob"
+#line 498 "mn-mailbox.gob"
g_return_val_if_fail (node != NULL, (MNMailbox * )0);
-#line 1305 "mn-mailbox.c"
+#line 1332 "mn-mailbox.c"
{
-#line 497 "mn-mailbox.gob"
+#line 500 "mn-mailbox.gob"
char *type;
Self *self = NULL;
@@ -1334,22 +1361,22 @@ mn_mailbox_new_from_xml_node (xmlNode * node, GError ** err)
g_free(type);
return self;
}}
-#line 1338 "mn-mailbox.c"
+#line 1365 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 528 "mn-mailbox.gob"
+#line 531 "mn-mailbox.gob"
xmlNode *
mn_mailbox_xml_node_new (MNMailbox * self)
-#line 1344 "mn-mailbox.c"
+#line 1371 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::xml_node_new"
-#line 528 "mn-mailbox.gob"
+#line 531 "mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (xmlNode * )0);
-#line 528 "mn-mailbox.gob"
+#line 531 "mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (xmlNode * )0);
-#line 1351 "mn-mailbox.c"
+#line 1378 "mn-mailbox.c"
{
-#line 530 "mn-mailbox.gob"
+#line 533 "mn-mailbox.gob"
xmlNode *node;
@@ -1359,20 +1386,20 @@ mn_mailbox_xml_node_new (MNMailbox * self)
return node;
}}
-#line 1363 "mn-mailbox.c"
+#line 1390 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 540 "mn-mailbox.gob"
+#line 543 "mn-mailbox.gob"
MNMailbox *
mn_mailbox_new_from_uri (const char * uri)
-#line 1369 "mn-mailbox.c"
+#line 1396 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::new_from_uri"
-#line 540 "mn-mailbox.gob"
+#line 543 "mn-mailbox.gob"
g_return_val_if_fail (uri != NULL, (MNMailbox * )0);
-#line 1374 "mn-mailbox.c"
+#line 1401 "mn-mailbox.c"
{
-#line 542 "mn-mailbox.gob"
+#line 545 "mn-mailbox.gob"
int i;
@@ -1391,39 +1418,39 @@ mn_mailbox_new_from_uri (const char * uri)
return NULL;
}}
-#line 1395 "mn-mailbox.c"
+#line 1422 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 561 "mn-mailbox.gob"
+#line 564 "mn-mailbox.gob"
MNMailbox *
mn_mailbox_new_from_configuration (MNMailboxConfiguration * config)
-#line 1401 "mn-mailbox.c"
+#line 1428 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::new_from_configuration"
-#line 561 "mn-mailbox.gob"
+#line 564 "mn-mailbox.gob"
g_return_val_if_fail (config != NULL, (MNMailbox * )0);
-#line 1406 "mn-mailbox.c"
+#line 1433 "mn-mailbox.c"
{
-#line 563 "mn-mailbox.gob"
+#line 566 "mn-mailbox.gob"
return g_object_newv(config->type, config->n_parameters, config->parameters);
}}
-#line 1412 "mn-mailbox.c"
+#line 1439 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 567 "mn-mailbox.gob"
+#line 570 "mn-mailbox.gob"
MNMailboxConfiguration *
mn_mailbox_get_configuration (MNMailbox * self)
-#line 1418 "mn-mailbox.c"
+#line 1445 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::get_configuration"
-#line 567 "mn-mailbox.gob"
+#line 570 "mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (MNMailboxConfiguration * )0);
-#line 567 "mn-mailbox.gob"
+#line 570 "mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (MNMailboxConfiguration * )0);
-#line 1425 "mn-mailbox.c"
+#line 1452 "mn-mailbox.c"
{
-#line 569 "mn-mailbox.gob"
+#line 572 "mn-mailbox.gob"
GObject *object = G_OBJECT(self);
GArray *parameters;
@@ -1456,20 +1483,20 @@ mn_mailbox_get_configuration (MNMailbox * self)
return config;
}}
-#line 1460 "mn-mailbox.c"
+#line 1487 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 602 "mn-mailbox.gob"
+#line 605 "mn-mailbox.gob"
void
mn_mailbox_configuration_free (MNMailboxConfiguration * config)
-#line 1466 "mn-mailbox.c"
+#line 1493 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::configuration_free"
-#line 602 "mn-mailbox.gob"
+#line 605 "mn-mailbox.gob"
g_return_if_fail (config != NULL);
-#line 1471 "mn-mailbox.c"
+#line 1498 "mn-mailbox.c"
{
-#line 604 "mn-mailbox.gob"
+#line 607 "mn-mailbox.gob"
int i;
@@ -1479,20 +1506,20 @@ mn_mailbox_configuration_free (MNMailboxConfiguration * config)
g_free(config->parameters);
g_free(config);
}}
-#line 1483 "mn-mailbox.c"
+#line 1510 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 614 "mn-mailbox.gob"
+#line 617 "mn-mailbox.gob"
MNMailbox *
mn_mailbox_new_from_obsolete_uri (const char * uri)
-#line 1489 "mn-mailbox.c"
+#line 1516 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::new_from_obsolete_uri"
-#line 614 "mn-mailbox.gob"
+#line 617 "mn-mailbox.gob"
g_return_val_if_fail (uri != NULL, (MNMailbox * )0);
-#line 1494 "mn-mailbox.c"
+#line 1521 "mn-mailbox.c"
{
-#line 616 "mn-mailbox.gob"
+#line 619 "mn-mailbox.gob"
char *real_uri;
char *scheme;
@@ -1524,20 +1551,20 @@ mn_mailbox_new_from_obsolete_uri (const char * uri)
return self;
}}
-#line 1528 "mn-mailbox.c"
+#line 1555 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 648 "mn-mailbox.gob"
+#line 651 "mn-mailbox.gob"
static MNMailbox *
mn_mailbox_parse_obsolete_uri (const char * uri)
-#line 1534 "mn-mailbox.c"
+#line 1561 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::parse_obsolete_uri"
-#line 648 "mn-mailbox.gob"
+#line 651 "mn-mailbox.gob"
g_return_val_if_fail (uri != NULL, (MNMailbox * )0);
-#line 1539 "mn-mailbox.c"
+#line 1566 "mn-mailbox.c"
{
-#line 650 "mn-mailbox.gob"
+#line 653 "mn-mailbox.gob"
int len;
int buflen;
@@ -1757,17 +1784,17 @@ mn_mailbox_parse_obsolete_uri (const char * uri)
return self;
}}
-#line 1761 "mn-mailbox.c"
+#line 1788 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 870 "mn-mailbox.gob"
+#line 873 "mn-mailbox.gob"
static gboolean
mn_mailbox_check_timeout_cb (gpointer data)
-#line 1767 "mn-mailbox.c"
+#line 1794 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::check_timeout_cb"
{
-#line 872 "mn-mailbox.gob"
+#line 875 "mn-mailbox.gob"
Self *self = data;
@@ -1775,22 +1802,22 @@ mn_mailbox_check_timeout_cb (gpointer data)
return TRUE; /* continue */
}}
-#line 1779 "mn-mailbox.c"
+#line 1806 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 880 "mn-mailbox.gob"
+#line 883 "mn-mailbox.gob"
static gboolean
mn_mailbox_validate (MNMailbox * self, GError ** err)
-#line 1785 "mn-mailbox.c"
+#line 1812 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::validate"
-#line 880 "mn-mailbox.gob"
+#line 883 "mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 880 "mn-mailbox.gob"
+#line 883 "mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (gboolean )0);
-#line 1792 "mn-mailbox.c"
+#line 1819 "mn-mailbox.c"
{
-#line 882 "mn-mailbox.gob"
+#line 885 "mn-mailbox.gob"
GParamSpec **properties;
unsigned int n_properties;
@@ -1824,33 +1851,33 @@ mn_mailbox_validate (MNMailbox * self, GError ** err)
return TRUE;
}}
-#line 1828 "mn-mailbox.c"
+#line 1855 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 916 "mn-mailbox.gob"
+#line 919 "mn-mailbox.gob"
void
mn_mailbox_seal (MNMailbox * self)
-#line 1834 "mn-mailbox.c"
+#line 1861 "mn-mailbox.c"
{
MNMailboxClass *klass;
-#line 916 "mn-mailbox.gob"
+#line 919 "mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 916 "mn-mailbox.gob"
+#line 919 "mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 1841 "mn-mailbox.c"
+#line 1868 "mn-mailbox.c"
klass = MN_MAILBOX_GET_CLASS(self);
if(klass->seal)
(*klass->seal)(self);
}
-#line 916 "mn-mailbox.gob"
+#line 919 "mn-mailbox.gob"
static void
___real_mn_mailbox_seal (MNMailbox * self G_GNUC_UNUSED)
-#line 1850 "mn-mailbox.c"
+#line 1877 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::seal"
{
-#line 918 "mn-mailbox.gob"
+#line 921 "mn-mailbox.gob"
if (self->name)
{
@@ -1862,20 +1889,20 @@ ___real_mn_mailbox_seal (MNMailbox * self G_GNUC_UNUSED)
? self->check_delay
: SELF_GET_CLASS(self)->default_check_delay;
}}
-#line 1866 "mn-mailbox.c"
+#line 1893 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 930 "mn-mailbox.gob"
+#line 933 "mn-mailbox.gob"
static MNMailbox *
mn_mailbox_parse_uri (MNMailbox * self, const char * uri)
-#line 1872 "mn-mailbox.c"
+#line 1899 "mn-mailbox.c"
{
MNMailboxClass *klass;
-#line 930 "mn-mailbox.gob"
+#line 933 "mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (MNMailbox * )0);
-#line 930 "mn-mailbox.gob"
+#line 933 "mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (MNMailbox * )0);
-#line 1879 "mn-mailbox.c"
+#line 1906 "mn-mailbox.c"
klass = MN_MAILBOX_GET_CLASS(self);
if(klass->parse_uri)
@@ -1884,51 +1911,51 @@ mn_mailbox_parse_uri (MNMailbox * self, const char * uri)
return (MNMailbox * )(0);
}
-#line 933 "mn-mailbox.gob"
+#line 936 "mn-mailbox.gob"
void
mn_mailbox_check (MNMailbox * self)
-#line 1891 "mn-mailbox.c"
+#line 1918 "mn-mailbox.c"
{
MNMailboxClass *klass;
-#line 933 "mn-mailbox.gob"
+#line 936 "mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 933 "mn-mailbox.gob"
+#line 936 "mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 1898 "mn-mailbox.c"
+#line 1925 "mn-mailbox.c"
klass = MN_MAILBOX_GET_CLASS(self);
if(klass->check)
(*klass->check)(self);
}
-#line 933 "mn-mailbox.gob"
+#line 936 "mn-mailbox.gob"
static void
___real_mn_mailbox_check (MNMailbox * self G_GNUC_UNUSED)
-#line 1907 "mn-mailbox.c"
+#line 1934 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::check"
{
-#line 935 "mn-mailbox.gob"
+#line 938 "mn-mailbox.gob"
g_assert(selfp->added == TRUE);
}}
-#line 1915 "mn-mailbox.c"
+#line 1942 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 939 "mn-mailbox.gob"
+#line 942 "mn-mailbox.gob"
void
mn_mailbox_notice (MNMailbox * self, const char * format, ...)
-#line 1921 "mn-mailbox.c"
+#line 1948 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::notice"
-#line 939 "mn-mailbox.gob"
+#line 942 "mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 939 "mn-mailbox.gob"
+#line 942 "mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 939 "mn-mailbox.gob"
+#line 942 "mn-mailbox.gob"
g_return_if_fail (format != NULL);
-#line 1930 "mn-mailbox.c"
+#line 1957 "mn-mailbox.c"
{
-#line 941 "mn-mailbox.gob"
+#line 944 "mn-mailbox.gob"
va_list args;
char *message;
@@ -1940,24 +1967,24 @@ mn_mailbox_notice (MNMailbox * self, const char * format, ...)
mn_info("%s: %s", self->runtime_name, message);
g_free(message);
}}
-#line 1944 "mn-mailbox.c"
+#line 1971 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 953 "mn-mailbox.gob"
+#line 956 "mn-mailbox.gob"
void
mn_mailbox_warning (MNMailbox * self, const char * format, ...)
-#line 1950 "mn-mailbox.c"
+#line 1977 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::warning"
-#line 953 "mn-mailbox.gob"
+#line 956 "mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 953 "mn-mailbox.gob"
+#line 956 "mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 953 "mn-mailbox.gob"
+#line 956 "mn-mailbox.gob"
g_return_if_fail (format != NULL);
-#line 1959 "mn-mailbox.c"
+#line 1986 "mn-mailbox.c"
{
-#line 955 "mn-mailbox.gob"
+#line 958 "mn-mailbox.gob"
va_list args;
char *message;
@@ -1969,17 +1996,17 @@ mn_mailbox_warning (MNMailbox * self, const char * format, ...)
g_warning("%s: %s", self->runtime_name, message);
g_free(message);
}}
-#line 1973 "mn-mailbox.c"
+#line 2000 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 973 "mn-mailbox.gob"
+#line 976 "mn-mailbox.gob"
void
mn_mailbox_mark_as_read (gpointer _message)
-#line 1979 "mn-mailbox.c"
+#line 2006 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::mark_as_read"
{
-#line 975 "mn-mailbox.gob"
+#line 978 "mn-mailbox.gob"
MNMessage *message;
Self *self;
@@ -1994,24 +2021,24 @@ mn_mailbox_mark_as_read (gpointer _message)
self_filter_messages(self);
}}
-#line 1998 "mn-mailbox.c"
+#line 2025 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 990 "mn-mailbox.gob"
+#line 993 "mn-mailbox.gob"
char *
mn_mailbox_get_command (MNMailbox * self, const char * id)
-#line 2004 "mn-mailbox.c"
+#line 2031 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::get_command"
-#line 990 "mn-mailbox.gob"
+#line 993 "mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (char * )0);
-#line 990 "mn-mailbox.gob"
+#line 993 "mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (char * )0);
-#line 990 "mn-mailbox.gob"
+#line 993 "mn-mailbox.gob"
g_return_val_if_fail (id != NULL, (char * )0);
-#line 2013 "mn-mailbox.c"
+#line 2040 "mn-mailbox.c"
{
-#line 992 "mn-mailbox.gob"
+#line 995 "mn-mailbox.gob"
char *prop;
char *command;
@@ -2028,24 +2055,24 @@ mn_mailbox_get_command (MNMailbox * self, const char * id)
return command;
}}
-#line 2032 "mn-mailbox.c"
+#line 2059 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1009 "mn-mailbox.gob"
+#line 1012 "mn-mailbox.gob"
gboolean
mn_mailbox_has_command (MNMailbox * self, const char * id)
-#line 2038 "mn-mailbox.c"
+#line 2065 "mn-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:Mailbox::has_command"
-#line 1009 "mn-mailbox.gob"
+#line 1012 "mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 1009 "mn-mailbox.gob"
+#line 1012 "mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (gboolean )0);
-#line 1009 "mn-mailbox.gob"
+#line 1012 "mn-mailbox.gob"
g_return_val_if_fail (id != NULL, (gboolean )0);
-#line 2047 "mn-mailbox.c"
+#line 2074 "mn-mailbox.c"
{
-#line 1011 "mn-mailbox.gob"
+#line 1014 "mn-mailbox.gob"
char *command;
gboolean has;
@@ -2056,5 +2083,5 @@ mn_mailbox_has_command (MNMailbox * self, const char * id)
return has;
}}
-#line 2060 "mn-mailbox.c"
+#line 2087 "mn-mailbox.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-mailbox.gob b/src/mn-mailbox.gob
@@ -141,6 +141,9 @@ class MN:Mailbox from G:Object (abstract)
public char *mark_as_spam_command destroywith g_free;
property STRING mark_as_spam_command (link, flags = MN_MAILBOX_PARAM_PERMANENT);
+ public char *delete_command destroywith g_free;
+ property STRING delete_command (link, flags = MN_MAILBOX_PARAM_PERMANENT);
+
public char *stock_id destroywith g_free;
property STRING stock_id (link, export);
diff --git a/src/mn-mailbox.h b/src/mn-mailbox.h
@@ -53,6 +53,7 @@ struct _MNMailbox {
char * open_command;
char * mark_as_read_command;
char * mark_as_spam_command;
+ char * delete_command;
char * stock_id;
char * format;
int runtime_check_delay;
@@ -159,6 +160,8 @@ gboolean mn_mailbox_has_command (MNMailbox * self,
#define MN_MAILBOX_GET_PROP_MARK_AS_READ_COMMAND(arg) "mark_as_read_command", __extension__ ({gchar **z = (arg); z;})
#define MN_MAILBOX_PROP_MARK_AS_SPAM_COMMAND(arg) "mark_as_spam_command", __extension__ ({gchar *z = (arg); z;})
#define MN_MAILBOX_GET_PROP_MARK_AS_SPAM_COMMAND(arg) "mark_as_spam_command", __extension__ ({gchar **z = (arg); z;})
+#define MN_MAILBOX_PROP_DELETE_COMMAND(arg) "delete_command", __extension__ ({gchar *z = (arg); z;})
+#define MN_MAILBOX_GET_PROP_DELETE_COMMAND(arg) "delete_command", __extension__ ({gchar **z = (arg); z;})
#define MN_MAILBOX_PROP_STOCK_ID(arg) "stock_id", __extension__ ({gchar *z = (arg); z;})
#define MN_MAILBOX_GET_PROP_STOCK_ID(arg) "stock_id", __extension__ ({gchar **z = (arg); z;})
#define MN_MAILBOX_PROP_FORMAT(arg) "format", __extension__ ({gchar *z = (arg); z;})
@@ -180,6 +183,8 @@ gboolean mn_mailbox_has_command (MNMailbox * self,
#define MN_MAILBOX_GET_PROP_MARK_AS_READ_COMMAND(arg) "mark_as_read_command",(gchar **)(arg)
#define MN_MAILBOX_PROP_MARK_AS_SPAM_COMMAND(arg) "mark_as_spam_command",(gchar *)(arg)
#define MN_MAILBOX_GET_PROP_MARK_AS_SPAM_COMMAND(arg) "mark_as_spam_command",(gchar **)(arg)
+#define MN_MAILBOX_PROP_DELETE_COMMAND(arg) "delete_command",(gchar *)(arg)
+#define MN_MAILBOX_GET_PROP_DELETE_COMMAND(arg) "delete_command",(gchar **)(arg)
#define MN_MAILBOX_PROP_STOCK_ID(arg) "stock_id",(gchar *)(arg)
#define MN_MAILBOX_GET_PROP_STOCK_ID(arg) "stock_id",(gchar **)(arg)
#define MN_MAILBOX_PROP_FORMAT(arg) "format",(gchar *)(arg)
diff --git a/src/mn-maildir-mailbox-backend.c b/src/mn-maildir-mailbox-backend.c
@@ -128,9 +128,9 @@ mn_maildir_mailbox_backend_class_init (MNMaildirMailboxBackendClass * class G_GN
mn_vfs_mailbox_backend_class->monitor_cb = ___2_mn_maildir_mailbox_backend_monitor_cb;
#line 69 "mn-maildir-mailbox-backend.gob"
mn_vfs_mailbox_backend_class->is = ___3_mn_maildir_mailbox_backend_is;
-#line 187 "mn-maildir-mailbox-backend.gob"
+#line 190 "mn-maildir-mailbox-backend.gob"
mn_vfs_mailbox_backend_class->check = ___6_mn_maildir_mailbox_backend_check;
-#line 231 "mn-maildir-mailbox-backend.gob"
+#line 234 "mn-maildir-mailbox-backend.gob"
mn_vfs_mailbox_backend_class->mark_as_read = ___8_mn_maildir_mailbox_backend_mark_as_read;
#line 136 "mn-maildir-mailbox-backend.c"
{
@@ -283,6 +283,7 @@ mn_maildir_mailbox_backend_scan_directory (MNMaildirMailboxBackend * self, unsig
if (file_info->name[0] != '.')
{
MNMessageFlags flags = 0;
+ MNMessage *message;
if (mn_reentrant_mailbox_check_aborted(MN_REENTRANT_MAILBOX(backend->mailbox), check_id))
{
@@ -305,11 +306,13 @@ mn_maildir_mailbox_backend_scan_directory (MNMaildirMailboxBackend * self, unsig
continue; /* no info, or message seen/trashed: ignore it */
}
- *messages = g_slist_prepend(*messages, mn_vfs_message_new(backend,
- uri,
- file_info->name,
- flags,
- FALSE));
+ message = mn_vfs_message_new(backend,
+ uri,
+ file_info->name,
+ flags,
+ FALSE);
+ if (message)
+ *messages = g_slist_prepend(*messages, message);
}
gnome_vfs_uri_unref(uri);
gnome_vfs_file_info_unref(file_info);
@@ -330,20 +333,20 @@ mn_maildir_mailbox_backend_scan_directory (MNMaildirMailboxBackend * self, unsig
return FALSE;
}}
-#line 334 "mn-maildir-mailbox-backend.c"
+#line 337 "mn-maildir-mailbox-backend.c"
#undef __GOB_FUNCTION__
-#line 187 "mn-maildir-mailbox-backend.gob"
+#line 190 "mn-maildir-mailbox-backend.gob"
static void
___6_mn_maildir_mailbox_backend_check (MNVFSMailboxBackend * backend G_GNUC_UNUSED, unsigned long check_id)
-#line 340 "mn-maildir-mailbox-backend.c"
+#line 343 "mn-maildir-mailbox-backend.c"
#define PARENT_HANDLER(___backend,___check_id) \
{ if(MN_VFS_MAILBOX_BACKEND_CLASS(parent_class)->check) \
(* MN_VFS_MAILBOX_BACKEND_CLASS(parent_class)->check)(___backend,___check_id); }
{
#define __GOB_FUNCTION__ "MN:Maildir:Mailbox:Backend::check"
{
-#line 189 "mn-maildir-mailbox-backend.gob"
+#line 192 "mn-maildir-mailbox-backend.gob"
Self *self = SELF(backend);
GSList *messages = NULL;
@@ -374,18 +377,18 @@ ___6_mn_maildir_mailbox_backend_check (MNVFSMailboxBackend * backend G_GNUC_UNUS
if (err)
g_error_free(err);
}}
-#line 378 "mn-maildir-mailbox-backend.c"
+#line 381 "mn-maildir-mailbox-backend.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 220 "mn-maildir-mailbox-backend.gob"
+#line 223 "mn-maildir-mailbox-backend.gob"
static int
mn_maildir_mailbox_backend_flags_sort_cb (const void * a, const void * b)
-#line 385 "mn-maildir-mailbox-backend.c"
+#line 388 "mn-maildir-mailbox-backend.c"
{
#define __GOB_FUNCTION__ "MN:Maildir:Mailbox:Backend::flags_sort_cb"
{
-#line 222 "mn-maildir-mailbox-backend.gob"
+#line 225 "mn-maildir-mailbox-backend.gob"
char ca = *((char *) a);
char cb = *((char *) b);
@@ -394,13 +397,13 @@ mn_maildir_mailbox_backend_flags_sort_cb (const void * a, const void * b)
return ca - cb;
}}
-#line 398 "mn-maildir-mailbox-backend.c"
+#line 401 "mn-maildir-mailbox-backend.c"
#undef __GOB_FUNCTION__
-#line 231 "mn-maildir-mailbox-backend.gob"
+#line 234 "mn-maildir-mailbox-backend.gob"
static gboolean
___8_mn_maildir_mailbox_backend_mark_as_read (MNVFSMailboxBackend * dummy G_GNUC_UNUSED, MNVFSMessage * message, GError ** err)
-#line 404 "mn-maildir-mailbox-backend.c"
+#line 407 "mn-maildir-mailbox-backend.c"
#define PARENT_HANDLER(___dummy,___message,___err) \
((MN_VFS_MAILBOX_BACKEND_CLASS(parent_class)->mark_as_read)? \
(* MN_VFS_MAILBOX_BACKEND_CLASS(parent_class)->mark_as_read)(___dummy,___message,___err): \
@@ -408,7 +411,7 @@ ___8_mn_maildir_mailbox_backend_mark_as_read (MNVFSMailboxBackend * dummy G_GNUC
{
#define __GOB_FUNCTION__ "MN:Maildir:Mailbox:Backend::mark_as_read"
{
-#line 235 "mn-maildir-mailbox-backend.gob"
+#line 238 "mn-maildir-mailbox-backend.gob"
char *old_flags;
char *old_filename;
@@ -465,6 +468,6 @@ ___8_mn_maildir_mailbox_backend_mark_as_read (MNVFSMailboxBackend * dummy G_GNUC
return status;
}}
-#line 469 "mn-maildir-mailbox-backend.c"
+#line 472 "mn-maildir-mailbox-backend.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
diff --git a/src/mn-maildir-mailbox-backend.gob b/src/mn-maildir-mailbox-backend.gob
@@ -136,6 +136,7 @@ class MN:Maildir:Mailbox:Backend from MN:VFS:Mailbox:Backend
if (file_info->name[0] != '.')
{
MNMessageFlags flags = 0;
+ MNMessage *message;
if (mn_reentrant_mailbox_check_aborted(MN_REENTRANT_MAILBOX(backend->mailbox), check_id))
{
@@ -158,11 +159,13 @@ class MN:Maildir:Mailbox:Backend from MN:VFS:Mailbox:Backend
continue; /* no info, or message seen/trashed: ignore it */
}
- *messages = g_slist_prepend(*messages, mn_vfs_message_new(backend,
- uri,
- file_info->name,
- flags,
- FALSE));
+ message = mn_vfs_message_new(backend,
+ uri,
+ file_info->name,
+ flags,
+ FALSE);
+ if (message)
+ *messages = g_slist_prepend(*messages, message);
}
gnome_vfs_uri_unref(uri);
gnome_vfs_file_info_unref(file_info);
diff --git a/src/mn-main.c b/src/mn-main.c
@@ -20,6 +20,7 @@
#include "config.h"
#include <stdlib.h>
#include <signal.h>
+#include <glib/gi18n.h>
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libnotify/notify.h>
@@ -257,81 +258,82 @@ main (int argc, char **argv)
gboolean arg_print_summary = FALSE;
gboolean arg_unset_obsolete_configuration = FALSE;
gboolean arg_quit = FALSE;
- const struct poptOption popt_options[] = {
+ const GOptionEntry options[] = {
{
"version",
'v',
- POPT_ARG_NONE,
- &arg_version,
0,
+ G_OPTION_ARG_NONE,
+ &arg_version,
N_("Show version information"),
NULL
},
{
"enable-info",
'i',
- POPT_ARG_NONE,
- &arg_enable_info,
0,
+ G_OPTION_ARG_NONE,
+ &arg_enable_info,
N_("Enable informational output"),
NULL
},
{
"display-properties",
'p',
- POPT_ARG_NONE,
- &arg_display_properties,
0,
+ G_OPTION_ARG_NONE,
+ &arg_display_properties,
N_("Display the properties dialog"),
NULL
},
{
"display-about",
'a',
- POPT_ARG_NONE,
- &arg_display_about,
0,
+ G_OPTION_ARG_NONE,
+ &arg_display_about,
N_("Display the about dialog"),
NULL
},
{
"update",
'u',
- POPT_ARG_NONE,
- &arg_update,
0,
+ G_OPTION_ARG_NONE,
+ &arg_update,
N_("Update the mail status"),
NULL
},
{
"print-summary",
's',
- POPT_ARG_NONE,
- &arg_print_summary,
0,
+ G_OPTION_ARG_NONE,
+ &arg_print_summary,
N_("Print a XML mail summary"),
NULL
},
{
"unset-obsolete-configuration",
'\0',
- POPT_ARG_NONE,
- &arg_unset_obsolete_configuration,
0,
+ G_OPTION_ARG_NONE,
+ &arg_unset_obsolete_configuration,
N_("Unset obsolete GConf configuration"),
NULL
},
{
"quit",
'q',
- POPT_ARG_NONE,
- &arg_quit,
0,
+ G_OPTION_ARG_NONE,
+ &arg_quit,
N_("Quit Mail Notification"),
NULL
},
- POPT_TABLEEND
+ { NULL }
};
+ GOptionContext *option_context;
BonoboGenericFactory *automation_factory;
GClosure *automation_factory_closure;
Bonobo_RegistrationResult result;
@@ -356,6 +358,11 @@ main (int argc, char **argv)
g_critical(_("multi-threading is not available"));
gdk_threads_init();
+ GDK_THREADS_ENTER();
+
+ option_context = g_option_context_new(NULL);
+ g_option_context_add_main_entries(option_context, options, GETTEXT_PACKAGE);
+
gnome_program_init(PACKAGE,
VERSION,
LIBGNOMEUI_MODULE,
@@ -363,23 +370,21 @@ main (int argc, char **argv)
argv,
GNOME_PARAM_HUMAN_READABLE_NAME, _("Mail Notification"),
GNOME_PROGRAM_STANDARD_PROPERTIES,
- GNOME_PARAM_POPT_TABLE, popt_options,
+ GNOME_PARAM_GOPTION_CONTEXT, option_context,
NULL);
if (arg_version)
{
mn_main_print_version();
- exit(0);
+ goto end;
}
if (arg_unset_obsolete_configuration)
{
mn_conf_unset_obsolete();
- exit(0);
+ goto end;
}
- GDK_THREADS_ENTER();
-
mn_main_ensure_icon_path();
gtk_window_set_default_icon_name("mail-notification");
@@ -528,6 +533,7 @@ main (int argc, char **argv)
if (result != Bonobo_ACTIVATION_REG_ALREADY_ACTIVE && ! arg_quit)
gtk_main();
+ end:
GDK_THREADS_LEAVE();
return 0;
diff --git a/src/mn-message-mime.c b/src/mn-message-mime.c
@@ -23,10 +23,12 @@
#include <libgnomevfs/gnome-vfs.h>
#include "mn-message-mime.h"
#include "mn-gmime-stream-vfs.h"
+#include "mn-util.h"
/*** functions ***************************************************************/
static char *mn_message_mime_header_decode_text (const char *str);
+static gboolean mn_message_mime_is_spam (GMimeMessage *mime_message);
/*** implementation **********************************************************/
@@ -52,6 +54,26 @@ mn_message_mime_header_decode_text (const char *str)
}
}
+static gboolean
+mn_message_mime_is_spam (GMimeMessage *mime_message)
+{
+ const char *spam;
+
+ g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE);
+
+ /* SpamAssassin */
+ spam = g_mime_message_get_header(mime_message, "X-Spam-Status");
+ if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
+ return TRUE;
+
+ /* bogofilter */
+ spam = g_mime_message_get_header(mime_message, "X-Bogosity");
+ if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
+ return TRUE;
+
+ return FALSE;
+}
+
MNMessage *
mn_message_new_from_mime_message (MNMailbox *mailbox,
GMimeMessage *mime_message,
@@ -87,6 +109,9 @@ mn_message_new_from_mime_message_full (GType type,
g_return_val_if_fail(mailbox == NULL || MN_IS_MAILBOX(mailbox), NULL);
g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), NULL);
+ if (mn_message_mime_is_spam(mime_message))
+ return NULL;
+
if (handle_status)
{
const char *status;
@@ -219,7 +244,7 @@ mn_message_new_from_uri_full (GType type,
if (result == GNOME_VFS_OK)
return message;
else
- g_object_unref(message);
+ mn_g_object_null_unref(message); /* message can be null */
}
else
gnome_vfs_close(handle);
diff --git a/src/mn-message-mime.h b/src/mn-message-mime.h
@@ -23,6 +23,14 @@
#include <gmime/gmime.h>
#include "mn-message.h"
+/*
+ * The following functions return a NULL message if one of the
+ * following conditions is true:
+ *
+ * - handle_status is TRUE and the message is marked as read
+ * - the message is marked as spam
+ */
+
MNMessage *mn_message_new_from_mime_message (MNMailbox *mailbox,
GMimeMessage *mime_message,
const char *uri,
diff --git a/src/mn-message-view.c b/src/mn-message-view.c
@@ -57,9 +57,8 @@ static void ___object_set_property (GObject *object, guint property_id, const GV
static void mn_message_view_init (MNMessageView * o) G_GNUC_UNUSED;
static void mn_message_view_class_init (MNMessageViewClass * class) G_GNUC_UNUSED;
static void ___3_mn_message_view_finalize (GObject * object) G_GNUC_UNUSED;
-static void ___4_mn_message_view_realize (GtkWidget * widget) G_GNUC_UNUSED;
static void mn_message_view_update (MNMessageView * self, GSList * messages) G_GNUC_UNUSED;
-static void ___6_mn_message_view_clear (MNTextTable * table) G_GNUC_UNUSED;
+static void ___5_mn_message_view_clear (MNTextTable * table) G_GNUC_UNUSED;
static void mn_message_view_clear_past_time_cells (MNMessageView * self) G_GNUC_UNUSED;
static gboolean mn_message_view_update_past_time_cells_cb (gpointer data) G_GNUC_UNUSED;
static void mn_message_view_update_past_time_cell (PastTimeCell * pcell, time_t now) G_GNUC_UNUSED;
@@ -130,7 +129,7 @@ ___finalize(GObject *obj_self)
gpointer priv G_GNUC_UNUSED = self->_priv;
#line 61 "mn-message-view.gob"
___3_mn_message_view_finalize(obj_self);
-#line 134 "mn-message-view.c"
+#line 133 "mn-message-view.c"
}
#undef __GOB_FUNCTION__
@@ -144,11 +143,10 @@ mn_message_view_init (MNMessageView * o G_GNUC_UNUSED)
#line 56 "mn-message-view.gob"
static void
mn_message_view_class_init (MNMessageViewClass * class G_GNUC_UNUSED)
-#line 148 "mn-message-view.c"
+#line 147 "mn-message-view.c"
{
#define __GOB_FUNCTION__ "MN:Message:View::class_init"
GObjectClass *g_object_class G_GNUC_UNUSED = (GObjectClass*) class;
- GtkWidgetClass *gtk_widget_class = (GtkWidgetClass *)class;
MNTextTableClass *mn_text_table_class = (MNTextTableClass *)class;
g_type_class_add_private(class,sizeof(MNMessageViewPrivate));
@@ -157,13 +155,11 @@ mn_message_view_class_init (MNMessageViewClass * class G_GNUC_UNUSED)
#line 61 "mn-message-view.gob"
g_object_class->finalize = ___finalize;
-#line 71 "mn-message-view.gob"
- gtk_widget_class->realize = ___4_mn_message_view_realize;
-#line 163 "mn-message-view.c"
+#line 159 "mn-message-view.c"
class->update = NULL;
-#line 92 "mn-message-view.gob"
- mn_text_table_class->clear = ___6_mn_message_view_clear;
-#line 167 "mn-message-view.c"
+#line 74 "mn-message-view.gob"
+ mn_text_table_class->clear = ___5_mn_message_view_clear;
+#line 163 "mn-message-view.c"
g_object_class->set_property = ___object_set_property;
{
GParamSpec *param_spec;
@@ -182,7 +178,7 @@ mn_message_view_class_init (MNMessageViewClass * class G_GNUC_UNUSED)
past_time_cells = g_queue_new();
-#line 186 "mn-message-view.c"
+#line 182 "mn-message-view.c"
}
}
#undef __GOB_FUNCTION__
@@ -205,7 +201,7 @@ ___object_set_property (GObject *object,
self_update(self, g_value_get_pointer(VAL));
-#line 209 "mn-message-view.c"
+#line 205 "mn-message-view.c"
}
break;
default:
@@ -224,21 +220,21 @@ ___object_set_property (GObject *object,
#line 52 "mn-message-view.gob"
void
mn_message_view_set_messages (MNMessageView * self, gpointer val)
-#line 228 "mn-message-view.c"
+#line 224 "mn-message-view.c"
{
#define __GOB_FUNCTION__ "MN:Message:View::set_messages"
{
#line 50 "mn-message-view.gob"
g_object_set (G_OBJECT (self), "messages", val, NULL);
}}
-#line 235 "mn-message-view.c"
+#line 231 "mn-message-view.c"
#undef __GOB_FUNCTION__
#line 61 "mn-message-view.gob"
static void
___3_mn_message_view_finalize (GObject * object G_GNUC_UNUSED)
-#line 242 "mn-message-view.c"
+#line 238 "mn-message-view.c"
#define PARENT_HANDLER(___object) \
{ if(G_OBJECT_CLASS(parent_class)->finalize) \
(* G_OBJECT_CLASS(parent_class)->finalize)(___object); }
@@ -253,90 +249,60 @@ ___3_mn_message_view_finalize (GObject * object G_GNUC_UNUSED)
PARENT_HANDLER(object);
}}
-#line 257 "mn-message-view.c"
+#line 253 "mn-message-view.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
#line 71 "mn-message-view.gob"
static void
-___4_mn_message_view_realize (GtkWidget * widget G_GNUC_UNUSED)
-#line 264 "mn-message-view.c"
-#define PARENT_HANDLER(___widget) \
- { if(GTK_WIDGET_CLASS(parent_class)->realize) \
- (* GTK_WIDGET_CLASS(parent_class)->realize)(___widget); }
-{
-#define __GOB_FUNCTION__ "MN:Message:View::realize"
-{
-#line 73 "mn-message-view.gob"
-
- GtkWidget *toplevel;
- GtkStateType state;
-
- PARENT_HANDLER(widget);
-
- /* set a transparent background */
-
- toplevel = gtk_widget_get_toplevel(widget);
- g_assert(toplevel != NULL);
- g_assert(toplevel->style != NULL);
-
- for (state = GTK_STATE_NORMAL; state <= GTK_STATE_INSENSITIVE; state++)
- gtk_widget_modify_bg(widget, state, &toplevel->style->bg[state]);
- }}
-#line 287 "mn-message-view.c"
-#undef __GOB_FUNCTION__
-#undef PARENT_HANDLER
-
-#line 89 "mn-message-view.gob"
-static void
mn_message_view_update (MNMessageView * self, GSList * messages)
-#line 294 "mn-message-view.c"
+#line 260 "mn-message-view.c"
{
MNMessageViewClass *klass;
-#line 89 "mn-message-view.gob"
+#line 71 "mn-message-view.gob"
g_return_if_fail (self != NULL);
-#line 89 "mn-message-view.gob"
+#line 71 "mn-message-view.gob"
g_return_if_fail (MN_IS_MESSAGE_VIEW (self));
-#line 301 "mn-message-view.c"
+#line 267 "mn-message-view.c"
klass = MN_MESSAGE_VIEW_GET_CLASS(self);
if(klass->update)
(*klass->update)(self,messages);
}
-#line 92 "mn-message-view.gob"
+#line 74 "mn-message-view.gob"
static void
-___6_mn_message_view_clear (MNTextTable * table G_GNUC_UNUSED)
-#line 311 "mn-message-view.c"
+___5_mn_message_view_clear (MNTextTable * table G_GNUC_UNUSED)
+#line 277 "mn-message-view.c"
#define PARENT_HANDLER(___table) \
{ if(MN_TEXT_TABLE_CLASS(parent_class)->clear) \
(* MN_TEXT_TABLE_CLASS(parent_class)->clear)(___table); }
{
#define __GOB_FUNCTION__ "MN:Message:View::clear"
{
-#line 94 "mn-message-view.gob"
+#line 76 "mn-message-view.gob"
self_clear_past_time_cells(SELF(table));
PARENT_HANDLER(table);
}}
-#line 324 "mn-message-view.c"
+#line 290 "mn-message-view.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 100 "mn-message-view.gob"
+#line 82 "mn-message-view.gob"
void
mn_message_view_append_past_time_cell (MNMessageView * self, time_t past_time, time_t now)
-#line 331 "mn-message-view.c"
+#line 297 "mn-message-view.c"
{
#define __GOB_FUNCTION__ "MN:Message:View::append_past_time_cell"
-#line 100 "mn-message-view.gob"
+#line 82 "mn-message-view.gob"
g_return_if_fail (self != NULL);
-#line 100 "mn-message-view.gob"
+#line 82 "mn-message-view.gob"
g_return_if_fail (MN_IS_MESSAGE_VIEW (self));
-#line 338 "mn-message-view.c"
+#line 304 "mn-message-view.c"
{
-#line 102 "mn-message-view.gob"
+#line 84 "mn-message-view.gob"
PastTimeCell *pcell;
@@ -355,22 +321,22 @@ mn_message_view_append_past_time_cell (MNMessageView * self, time_t past_time, t
if (! past_time_cells_timeout_source)
past_time_cells_timeout_source = mn_g_timeout_add_gdk_locked(500, self_update_past_time_cells_cb, NULL);
}}
-#line 359 "mn-message-view.c"
+#line 325 "mn-message-view.c"
#undef __GOB_FUNCTION__
-#line 121 "mn-message-view.gob"
+#line 103 "mn-message-view.gob"
static void
mn_message_view_clear_past_time_cells (MNMessageView * self)
-#line 365 "mn-message-view.c"
+#line 331 "mn-message-view.c"
{
#define __GOB_FUNCTION__ "MN:Message:View::clear_past_time_cells"
-#line 121 "mn-message-view.gob"
+#line 103 "mn-message-view.gob"
g_return_if_fail (self != NULL);
-#line 121 "mn-message-view.gob"
+#line 103 "mn-message-view.gob"
g_return_if_fail (MN_IS_MESSAGE_VIEW (self));
-#line 372 "mn-message-view.c"
+#line 338 "mn-message-view.c"
{
-#line 123 "mn-message-view.gob"
+#line 105 "mn-message-view.gob"
GSList *l;
@@ -390,17 +356,17 @@ mn_message_view_clear_past_time_cells (MNMessageView * self)
if (g_queue_is_empty(past_time_cells))
mn_locked_g_source_clear(&past_time_cells_timeout_source);
}}
-#line 394 "mn-message-view.c"
+#line 360 "mn-message-view.c"
#undef __GOB_FUNCTION__
-#line 143 "mn-message-view.gob"
+#line 125 "mn-message-view.gob"
static gboolean
mn_message_view_update_past_time_cells_cb (gpointer data)
-#line 400 "mn-message-view.c"
+#line 366 "mn-message-view.c"
{
#define __GOB_FUNCTION__ "MN:Message:View::update_past_time_cells_cb"
{
-#line 145 "mn-message-view.gob"
+#line 127 "mn-message-view.gob"
time_t now;
GList *l;
@@ -411,20 +377,20 @@ mn_message_view_update_past_time_cells_cb (gpointer data)
return TRUE; /* keep source */
}}
-#line 415 "mn-message-view.c"
+#line 381 "mn-message-view.c"
#undef __GOB_FUNCTION__
-#line 156 "mn-message-view.gob"
+#line 138 "mn-message-view.gob"
static void
mn_message_view_update_past_time_cell (PastTimeCell * pcell, time_t now)
-#line 421 "mn-message-view.c"
+#line 387 "mn-message-view.c"
{
#define __GOB_FUNCTION__ "MN:Message:View::update_past_time_cell"
-#line 156 "mn-message-view.gob"
+#line 138 "mn-message-view.gob"
g_return_if_fail (pcell != NULL);
-#line 426 "mn-message-view.c"
+#line 392 "mn-message-view.c"
{
-#line 158 "mn-message-view.gob"
+#line 140 "mn-message-view.gob"
char *formatted;
@@ -432,5 +398,5 @@ mn_message_view_update_past_time_cell (PastTimeCell * pcell, time_t now)
mn_text_table_cell_set_text(MN_TEXT_TABLE(pcell->self), pcell->cell, formatted);
g_free(formatted);
}}
-#line 436 "mn-message-view.c"
+#line 402 "mn-message-view.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-message-view.gob b/src/mn-message-view.gob
@@ -68,24 +68,6 @@ class MN:Message:View from MN:Text:Table (abstract)
PARENT_HANDLER(object);
}
- override (Gtk:Widget) void
- realize (GtkWidget *widget)
- {
- GtkWidget *toplevel;
- GtkStateType state;
-
- PARENT_HANDLER(widget);
-
- /* set a transparent background */
-
- toplevel = gtk_widget_get_toplevel(widget);
- g_assert(toplevel != NULL);
- g_assert(toplevel->style != NULL);
-
- for (state = GTK_STATE_NORMAL; state <= GTK_STATE_INSENSITIVE; state++)
- gtk_widget_modify_bg(widget, state, &toplevel->style->bg[state]);
- }
-
virtual private void
update (self, GSList *messages);
diff --git a/src/mn-message.c b/src/mn-message.c
@@ -26,11 +26,12 @@
#include "config.h"
#include <errno.h>
+#include <glib/gi18n.h>
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include "mn-util.h"
-#line 34 "mn-message.c"
+#line 35 "mn-message.c"
/* self casting macros */
#define SELF(x) MN_MESSAGE(x)
#define SELF_CONST(x) MN_MESSAGE_CONST(x)
@@ -67,6 +68,11 @@ static gboolean ___real_mn_message_can_mark_as_spam_impl (MNMessage * self);
static gboolean mn_message_can_mark_as_spam_impl (MNMessage * self) G_GNUC_UNUSED;
static gboolean mn_message_mark_as_spam_real (MNMessage * self, GError ** err) G_GNUC_UNUSED;
static gboolean mn_message_mark_as_spam_impl (MNMessage * self, GError ** err) G_GNUC_UNUSED;
+static gboolean ___real_mn_message_can_delete (MNMessage * self);
+static gboolean ___real_mn_message_can_delete_impl (MNMessage * self);
+static gboolean mn_message_can_delete_impl (MNMessage * self) G_GNUC_UNUSED;
+static gboolean mn_message_delete_real (MNMessage * self, GError ** err) G_GNUC_UNUSED;
+static gboolean mn_message_delete_impl (MNMessage * self, GError ** err) G_GNUC_UNUSED;
enum {
PROP_0,
@@ -103,6 +109,11 @@ static GObjectClass *parent_class = NULL;
#define self_mark_as_spam_real mn_message_mark_as_spam_real
#define self_mark_as_spam mn_message_mark_as_spam
#define self_mark_as_spam_impl mn_message_mark_as_spam_impl
+#define self_can_delete mn_message_can_delete
+#define self_can_delete_impl mn_message_can_delete_impl
+#define self_delete_real mn_message_delete_real
+#define self_delete mn_message_delete
+#define self_delete_impl mn_message_delete_impl
#define self_new mn_message_new
#define self_new_from_error mn_message_new_from_error
#define self_xml_node_new mn_message_xml_node_new
@@ -156,21 +167,21 @@ ___finalize(GObject *obj_self)
MNMessage *self G_GNUC_UNUSED = MN_MESSAGE (obj_self);
if(G_OBJECT_CLASS(parent_class)->finalize) \
(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);
-#line 67 "mn-message.gob"
+#line 68 "mn-message.gob"
if(self->error) { g_free ((gpointer) self->error); self->error = NULL; }
-#line 162 "mn-message.c"
-#line 75 "mn-message.gob"
+#line 173 "mn-message.c"
+#line 76 "mn-message.gob"
if(self->id) { g_free ((gpointer) self->id); self->id = NULL; }
-#line 165 "mn-message.c"
-#line 79 "mn-message.gob"
+#line 176 "mn-message.c"
+#line 80 "mn-message.gob"
if(self->from) { g_free ((gpointer) self->from); self->from = NULL; }
-#line 168 "mn-message.c"
-#line 83 "mn-message.gob"
+#line 179 "mn-message.c"
+#line 84 "mn-message.gob"
if(self->subject) { g_free ((gpointer) self->subject); self->subject = NULL; }
-#line 171 "mn-message.c"
-#line 87 "mn-message.gob"
+#line 182 "mn-message.c"
+#line 88 "mn-message.gob"
if(self->uri) { g_free ((gpointer) self->uri); self->uri = NULL; }
-#line 174 "mn-message.c"
+#line 185 "mn-message.c"
}
#undef __GOB_FUNCTION__
@@ -188,22 +199,28 @@ mn_message_class_init (MNMessageClass * c G_GNUC_UNUSED)
parent_class = g_type_class_ref (G_TYPE_OBJECT);
-#line 99 "mn-message.gob"
+#line 100 "mn-message.gob"
g_object_class->constructor = ___1_mn_message_constructor;
-#line 326 "mn-message.gob"
+#line 327 "mn-message.gob"
c->can_open_impl = ___real_mn_message_can_open_impl;
-#line 346 "mn-message.gob"
+#line 347 "mn-message.gob"
c->open_impl = ___real_mn_message_open_impl;
-#line 358 "mn-message.gob"
+#line 359 "mn-message.gob"
c->can_mark_as_read_impl = ___real_mn_message_can_mark_as_read_impl;
-#line 200 "mn-message.c"
+#line 211 "mn-message.c"
c->mark_as_read_impl = NULL;
-#line 390 "mn-message.gob"
+#line 391 "mn-message.gob"
c->can_mark_as_spam = ___real_mn_message_can_mark_as_spam;
-#line 396 "mn-message.gob"
+#line 397 "mn-message.gob"
c->can_mark_as_spam_impl = ___real_mn_message_can_mark_as_spam_impl;
-#line 206 "mn-message.c"
+#line 217 "mn-message.c"
c->mark_as_spam_impl = NULL;
+#line 429 "mn-message.gob"
+ c->can_delete = ___real_mn_message_can_delete;
+#line 435 "mn-message.gob"
+ c->can_delete_impl = ___real_mn_message_can_delete_impl;
+#line 223 "mn-message.c"
+ c->delete_impl = NULL;
g_object_class->finalize = ___finalize;
g_object_class->get_property = ___object_get_property;
g_object_class->set_property = ___object_set_property;
@@ -312,58 +329,58 @@ ___object_set_property (GObject *object,
switch (property_id) {
case PROP_MAILBOX:
{
-#line 64 "mn-message.gob"
+#line 65 "mn-message.gob"
self->mailbox = g_value_get_pointer (VAL);
-#line 318 "mn-message.c"
+#line 335 "mn-message.c"
}
break;
case PROP_ERROR:
{
-#line 68 "mn-message.gob"
+#line 69 "mn-message.gob"
{ char *old = self->error; self->error = g_value_dup_string (VAL); g_free (old); }
-#line 325 "mn-message.c"
+#line 342 "mn-message.c"
}
break;
case PROP_SENT_TIME:
{
-#line 72 "mn-message.gob"
+#line 73 "mn-message.gob"
self->sent_time = g_value_get_ulong (VAL);
-#line 332 "mn-message.c"
+#line 349 "mn-message.c"
}
break;
case PROP_ID:
{
-#line 76 "mn-message.gob"
+#line 77 "mn-message.gob"
{ char *old = self->id; self->id = g_value_dup_string (VAL); g_free (old); }
-#line 339 "mn-message.c"
+#line 356 "mn-message.c"
}
break;
case PROP_FROM:
{
-#line 80 "mn-message.gob"
+#line 81 "mn-message.gob"
{ char *old = self->from; self->from = g_value_dup_string (VAL); g_free (old); }
-#line 346 "mn-message.c"
+#line 363 "mn-message.c"
}
break;
case PROP_SUBJECT:
{
-#line 84 "mn-message.gob"
+#line 85 "mn-message.gob"
{ char *old = self->subject; self->subject = g_value_dup_string (VAL); g_free (old); }
-#line 353 "mn-message.c"
+#line 370 "mn-message.c"
}
break;
case PROP_URI:
{
-#line 88 "mn-message.gob"
+#line 89 "mn-message.gob"
{ char *old = self->uri; self->uri = g_value_dup_string (VAL); g_free (old); }
-#line 360 "mn-message.c"
+#line 377 "mn-message.c"
}
break;
case PROP_FLAGS:
{
-#line 97 "mn-message.gob"
+#line 98 "mn-message.gob"
self->flags = g_value_get_uint (VAL);
-#line 367 "mn-message.c"
+#line 384 "mn-message.c"
}
break;
default:
@@ -392,67 +409,67 @@ ___object_get_property (GObject *object,
switch (property_id) {
case PROP_MAILBOX:
{
-#line 64 "mn-message.gob"
+#line 65 "mn-message.gob"
g_value_set_pointer (VAL, self->mailbox);
-#line 398 "mn-message.c"
+#line 415 "mn-message.c"
}
break;
case PROP_ERROR:
{
-#line 68 "mn-message.gob"
+#line 69 "mn-message.gob"
g_value_set_string (VAL, self->error);
-#line 405 "mn-message.c"
+#line 422 "mn-message.c"
}
break;
case PROP_SENT_TIME:
{
-#line 72 "mn-message.gob"
+#line 73 "mn-message.gob"
g_value_set_ulong (VAL, self->sent_time);
-#line 412 "mn-message.c"
+#line 429 "mn-message.c"
}
break;
case PROP_ID:
{
-#line 76 "mn-message.gob"
+#line 77 "mn-message.gob"
g_value_set_string (VAL, self->id);
-#line 419 "mn-message.c"
+#line 436 "mn-message.c"
}
break;
case PROP_FROM:
{
-#line 80 "mn-message.gob"
+#line 81 "mn-message.gob"
g_value_set_string (VAL, self->from);
-#line 426 "mn-message.c"
+#line 443 "mn-message.c"
}
break;
case PROP_SUBJECT:
{
-#line 84 "mn-message.gob"
+#line 85 "mn-message.gob"
g_value_set_string (VAL, self->subject);
-#line 433 "mn-message.c"
+#line 450 "mn-message.c"
}
break;
case PROP_URI:
{
-#line 88 "mn-message.gob"
+#line 89 "mn-message.gob"
g_value_set_string (VAL, self->uri);
-#line 440 "mn-message.c"
+#line 457 "mn-message.c"
}
break;
case PROP_FILENAME:
{
-#line 92 "mn-message.gob"
+#line 93 "mn-message.gob"
g_value_take_string(VAL, self->uri ? gnome_vfs_get_local_path_from_uri(self->uri) : NULL);
-#line 449 "mn-message.c"
+#line 466 "mn-message.c"
}
break;
case PROP_FLAGS:
{
-#line 97 "mn-message.gob"
+#line 98 "mn-message.gob"
g_value_set_uint (VAL, self->flags);
-#line 456 "mn-message.c"
+#line 473 "mn-message.c"
}
break;
default:
@@ -469,10 +486,10 @@ g_value_set_uint (VAL, self->flags);
-#line 99 "mn-message.gob"
+#line 100 "mn-message.gob"
static GObject *
___1_mn_message_constructor (GType type G_GNUC_UNUSED, unsigned int n_construct_properties, GObjectConstructParam * construct_params)
-#line 476 "mn-message.c"
+#line 493 "mn-message.c"
#define PARENT_HANDLER(___type,___n_construct_properties,___construct_params) \
((G_OBJECT_CLASS(parent_class)->constructor)? \
(* G_OBJECT_CLASS(parent_class)->constructor)(___type,___n_construct_properties,___construct_params): \
@@ -480,7 +497,7 @@ ___1_mn_message_constructor (GType type G_GNUC_UNUSED, unsigned int n_construct_
{
#define __GOB_FUNCTION__ "MN:Message::constructor"
{
-#line 101 "mn-message.gob"
+#line 102 "mn-message.gob"
GObject *object;
Self *self;
@@ -506,7 +523,7 @@ ___1_mn_message_constructor (GType type G_GNUC_UNUSED, unsigned int n_construct_
id = g_string_new(NULL);
if (self->sent_time > 0)
- g_string_append_printf(id, ":sent-time:%u:", self->sent_time);
+ g_string_append_printf(id, ":sent-time:%i:", (int) self->sent_time);
if (self->from)
g_string_append_printf(id, ":from:%s:", self->from);
if (self->subject)
@@ -530,27 +547,27 @@ ___1_mn_message_constructor (GType type G_GNUC_UNUSED, unsigned int n_construct_
return object;
}}
-#line 534 "mn-message.c"
+#line 551 "mn-message.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 151 "mn-message.gob"
+#line 152 "mn-message.gob"
static gboolean
mn_message_get_subst (MNMessage * self, const char * prop_name, char ** result)
-#line 541 "mn-message.c"
+#line 558 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::get_subst"
-#line 151 "mn-message.gob"
+#line 152 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 151 "mn-message.gob"
+#line 152 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 151 "mn-message.gob"
+#line 152 "mn-message.gob"
g_return_val_if_fail (prop_name != NULL, (gboolean )0);
-#line 151 "mn-message.gob"
+#line 152 "mn-message.gob"
g_return_val_if_fail (result != NULL, (gboolean )0);
-#line 552 "mn-message.c"
+#line 569 "mn-message.c"
{
-#line 155 "mn-message.gob"
+#line 156 "mn-message.gob"
GParamSpec **properties;
unsigned int n_properties;
@@ -577,24 +594,24 @@ mn_message_get_subst (MNMessage * self, const char * prop_name, char ** result)
return status;
}}
-#line 581 "mn-message.c"
+#line 598 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 182 "mn-message.gob"
+#line 183 "mn-message.gob"
static char *
mn_message_subst_command (MNMessage * self, const char * command, GError ** err)
-#line 587 "mn-message.c"
+#line 604 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::subst_command"
-#line 182 "mn-message.gob"
+#line 183 "mn-message.gob"
g_return_val_if_fail (self != NULL, (char * )0);
-#line 182 "mn-message.gob"
+#line 183 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (char * )0);
-#line 182 "mn-message.gob"
+#line 183 "mn-message.gob"
g_return_val_if_fail (command != NULL, (char * )0);
-#line 596 "mn-message.c"
+#line 613 "mn-message.c"
{
-#line 184 "mn-message.gob"
+#line 185 "mn-message.gob"
GString *result;
const char *p;
@@ -682,24 +699,24 @@ mn_message_subst_command (MNMessage * self, const char * command, GError ** err)
end:
return result ? g_string_free(result, FALSE) : NULL;
}}
-#line 686 "mn-message.c"
+#line 703 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 272 "mn-message.gob"
+#line 273 "mn-message.gob"
static gboolean
mn_message_execute_command_real (MNMessage * self, const char * command, GError ** err)
-#line 692 "mn-message.c"
+#line 709 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::execute_command_real"
-#line 272 "mn-message.gob"
+#line 273 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 272 "mn-message.gob"
+#line 273 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 272 "mn-message.gob"
+#line 273 "mn-message.gob"
g_return_val_if_fail (command != NULL, (gboolean )0);
-#line 701 "mn-message.c"
+#line 718 "mn-message.c"
{
-#line 276 "mn-message.gob"
+#line 277 "mn-message.gob"
char *subst;
int status;
@@ -719,26 +736,26 @@ mn_message_execute_command_real (MNMessage * self, const char * command, GError
return TRUE;
}}
-#line 723 "mn-message.c"
+#line 740 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 296 "mn-message.gob"
+#line 297 "mn-message.gob"
static gboolean
mn_message_execute_command (MNMessage * self, const char * id, gboolean * status, GError ** err)
-#line 729 "mn-message.c"
+#line 746 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::execute_command"
-#line 296 "mn-message.gob"
+#line 297 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 296 "mn-message.gob"
+#line 297 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 296 "mn-message.gob"
+#line 297 "mn-message.gob"
g_return_val_if_fail (id != NULL, (gboolean )0);
-#line 296 "mn-message.gob"
+#line 297 "mn-message.gob"
g_return_val_if_fail (status != NULL, (gboolean )0);
-#line 740 "mn-message.c"
+#line 757 "mn-message.c"
{
-#line 301 "mn-message.gob"
+#line 302 "mn-message.gob"
char *command;
GError *tmp_err = NULL;
@@ -757,39 +774,39 @@ mn_message_execute_command (MNMessage * self, const char * id, gboolean * status
g_free(command);
return TRUE;
}}
-#line 761 "mn-message.c"
+#line 778 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 320 "mn-message.gob"
+#line 321 "mn-message.gob"
gboolean
mn_message_can_open (MNMessage * self)
-#line 767 "mn-message.c"
+#line 784 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::can_open"
-#line 320 "mn-message.gob"
+#line 321 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 320 "mn-message.gob"
+#line 321 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 774 "mn-message.c"
+#line 791 "mn-message.c"
{
-#line 322 "mn-message.gob"
+#line 323 "mn-message.gob"
return mn_mailbox_has_command(self->mailbox, "open") || self_can_open_impl(self);
}}
-#line 780 "mn-message.c"
+#line 797 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 326 "mn-message.gob"
+#line 327 "mn-message.gob"
static gboolean
mn_message_can_open_impl (MNMessage * self)
-#line 786 "mn-message.c"
+#line 803 "mn-message.c"
{
MNMessageClass *klass;
-#line 326 "mn-message.gob"
+#line 327 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 326 "mn-message.gob"
+#line 327 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 793 "mn-message.c"
+#line 810 "mn-message.c"
klass = MN_MESSAGE_GET_CLASS(self);
if(klass->can_open_impl)
@@ -797,33 +814,33 @@ mn_message_can_open_impl (MNMessage * self)
else
return (gboolean )(0);
}
-#line 326 "mn-message.gob"
+#line 327 "mn-message.gob"
static gboolean
___real_mn_message_can_open_impl (MNMessage * self G_GNUC_UNUSED)
-#line 804 "mn-message.c"
+#line 821 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::can_open_impl"
{
-#line 328 "mn-message.gob"
+#line 329 "mn-message.gob"
return self->uri != NULL;
}}
-#line 812 "mn-message.c"
+#line 829 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 332 "mn-message.gob"
+#line 333 "mn-message.gob"
gboolean
mn_message_open (MNMessage * self, GError ** err)
-#line 818 "mn-message.c"
+#line 835 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::open"
-#line 332 "mn-message.gob"
+#line 333 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 332 "mn-message.gob"
+#line 333 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 825 "mn-message.c"
+#line 842 "mn-message.c"
{
-#line 334 "mn-message.gob"
+#line 335 "mn-message.gob"
gboolean status;
@@ -835,20 +852,20 @@ mn_message_open (MNMessage * self, GError ** err)
else
return self_open_impl(self, err);
}}
-#line 839 "mn-message.c"
+#line 856 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 346 "mn-message.gob"
+#line 347 "mn-message.gob"
static gboolean
mn_message_open_impl (MNMessage * self, GError ** err)
-#line 845 "mn-message.c"
+#line 862 "mn-message.c"
{
MNMessageClass *klass;
-#line 346 "mn-message.gob"
+#line 347 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 346 "mn-message.gob"
+#line 347 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 852 "mn-message.c"
+#line 869 "mn-message.c"
klass = MN_MESSAGE_GET_CLASS(self);
if(klass->open_impl)
@@ -856,50 +873,50 @@ mn_message_open_impl (MNMessage * self, GError ** err)
else
return (gboolean )(0);
}
-#line 346 "mn-message.gob"
+#line 347 "mn-message.gob"
static gboolean
___real_mn_message_open_impl (MNMessage * self G_GNUC_UNUSED, GError ** err)
-#line 863 "mn-message.c"
+#line 880 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::open_impl"
{
-#line 348 "mn-message.gob"
+#line 349 "mn-message.gob"
return gnome_url_show(self->uri, err);
}}
-#line 871 "mn-message.c"
+#line 888 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 352 "mn-message.gob"
+#line 353 "mn-message.gob"
gboolean
mn_message_can_mark_as_read (MNMessage * self)
-#line 877 "mn-message.c"
+#line 894 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::can_mark_as_read"
-#line 352 "mn-message.gob"
+#line 353 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 352 "mn-message.gob"
+#line 353 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 884 "mn-message.c"
+#line 901 "mn-message.c"
{
-#line 354 "mn-message.gob"
+#line 355 "mn-message.gob"
return mn_mailbox_has_command(self->mailbox, "mark-as-read") || self_can_mark_as_read_impl(self);
}}
-#line 890 "mn-message.c"
+#line 907 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 358 "mn-message.gob"
+#line 359 "mn-message.gob"
static gboolean
mn_message_can_mark_as_read_impl (MNMessage * self)
-#line 896 "mn-message.c"
+#line 913 "mn-message.c"
{
MNMessageClass *klass;
-#line 358 "mn-message.gob"
+#line 359 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 358 "mn-message.gob"
+#line 359 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 903 "mn-message.c"
+#line 920 "mn-message.c"
klass = MN_MESSAGE_GET_CLASS(self);
if(klass->can_mark_as_read_impl)
@@ -907,33 +924,33 @@ mn_message_can_mark_as_read_impl (MNMessage * self)
else
return (gboolean )(0);
}
-#line 358 "mn-message.gob"
+#line 359 "mn-message.gob"
static gboolean
___real_mn_message_can_mark_as_read_impl (MNMessage * self G_GNUC_UNUSED)
-#line 914 "mn-message.c"
+#line 931 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::can_mark_as_read_impl"
{
-#line 360 "mn-message.gob"
+#line 361 "mn-message.gob"
return SELF_GET_CLASS(self)->mark_as_read_impl != NULL;
}}
-#line 922 "mn-message.c"
+#line 939 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 364 "mn-message.gob"
+#line 365 "mn-message.gob"
static gboolean
mn_message_mark_as_read_real (MNMessage * self, GError ** err)
-#line 928 "mn-message.c"
+#line 945 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::mark_as_read_real"
-#line 364 "mn-message.gob"
+#line 365 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 364 "mn-message.gob"
+#line 365 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 935 "mn-message.c"
+#line 952 "mn-message.c"
{
-#line 366 "mn-message.gob"
+#line 367 "mn-message.gob"
gboolean status;
@@ -942,22 +959,22 @@ mn_message_mark_as_read_real (MNMessage * self, GError ** err)
else
return self_mark_as_read_impl(self, err);
}}
-#line 946 "mn-message.c"
+#line 963 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 375 "mn-message.gob"
+#line 376 "mn-message.gob"
gboolean
mn_message_mark_as_read (MNMessage * self, GError ** err)
-#line 952 "mn-message.c"
+#line 969 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::mark_as_read"
-#line 375 "mn-message.gob"
+#line 376 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 375 "mn-message.gob"
+#line 376 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 959 "mn-message.c"
+#line 976 "mn-message.c"
{
-#line 377 "mn-message.gob"
+#line 378 "mn-message.gob"
if (self_mark_as_read_real(self, err))
{
@@ -967,20 +984,20 @@ mn_message_mark_as_read (MNMessage * self, GError ** err)
else
return FALSE;
}}
-#line 971 "mn-message.c"
+#line 988 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 387 "mn-message.gob"
+#line 388 "mn-message.gob"
static gboolean
mn_message_mark_as_read_impl (MNMessage * self, GError ** err)
-#line 977 "mn-message.c"
+#line 994 "mn-message.c"
{
MNMessageClass *klass;
-#line 387 "mn-message.gob"
+#line 388 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 387 "mn-message.gob"
+#line 388 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 984 "mn-message.c"
+#line 1001 "mn-message.c"
klass = MN_MESSAGE_GET_CLASS(self);
if(klass->mark_as_read_impl)
@@ -989,17 +1006,17 @@ mn_message_mark_as_read_impl (MNMessage * self, GError ** err)
return (gboolean )(0);
}
-#line 390 "mn-message.gob"
+#line 391 "mn-message.gob"
gboolean
mn_message_can_mark_as_spam (MNMessage * self)
-#line 996 "mn-message.c"
+#line 1013 "mn-message.c"
{
MNMessageClass *klass;
-#line 390 "mn-message.gob"
+#line 391 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 390 "mn-message.gob"
+#line 391 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 1003 "mn-message.c"
+#line 1020 "mn-message.c"
klass = MN_MESSAGE_GET_CLASS(self);
if(klass->can_mark_as_spam)
@@ -1007,31 +1024,31 @@ mn_message_can_mark_as_spam (MNMessage * self)
else
return (gboolean )(0);
}
-#line 390 "mn-message.gob"
+#line 391 "mn-message.gob"
static gboolean
___real_mn_message_can_mark_as_spam (MNMessage * self G_GNUC_UNUSED)
-#line 1014 "mn-message.c"
+#line 1031 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::can_mark_as_spam"
{
-#line 392 "mn-message.gob"
+#line 393 "mn-message.gob"
return mn_mailbox_has_command(self->mailbox, "mark-as-spam") || self_can_mark_as_spam_impl(self);
}}
-#line 1022 "mn-message.c"
+#line 1039 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 396 "mn-message.gob"
+#line 397 "mn-message.gob"
static gboolean
mn_message_can_mark_as_spam_impl (MNMessage * self)
-#line 1028 "mn-message.c"
+#line 1045 "mn-message.c"
{
MNMessageClass *klass;
-#line 396 "mn-message.gob"
+#line 397 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 396 "mn-message.gob"
+#line 397 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 1035 "mn-message.c"
+#line 1052 "mn-message.c"
klass = MN_MESSAGE_GET_CLASS(self);
if(klass->can_mark_as_spam_impl)
@@ -1039,33 +1056,33 @@ mn_message_can_mark_as_spam_impl (MNMessage * self)
else
return (gboolean )(0);
}
-#line 396 "mn-message.gob"
+#line 397 "mn-message.gob"
static gboolean
___real_mn_message_can_mark_as_spam_impl (MNMessage * self G_GNUC_UNUSED)
-#line 1046 "mn-message.c"
+#line 1063 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::can_mark_as_spam_impl"
{
-#line 398 "mn-message.gob"
+#line 399 "mn-message.gob"
return SELF_GET_CLASS(self)->mark_as_spam_impl != NULL;
}}
-#line 1054 "mn-message.c"
+#line 1071 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 402 "mn-message.gob"
+#line 403 "mn-message.gob"
static gboolean
mn_message_mark_as_spam_real (MNMessage * self, GError ** err)
-#line 1060 "mn-message.c"
+#line 1077 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::mark_as_spam_real"
-#line 402 "mn-message.gob"
+#line 403 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 402 "mn-message.gob"
+#line 403 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 1067 "mn-message.c"
+#line 1084 "mn-message.c"
{
-#line 404 "mn-message.gob"
+#line 405 "mn-message.gob"
gboolean status;
@@ -1074,22 +1091,22 @@ mn_message_mark_as_spam_real (MNMessage * self, GError ** err)
else
return self_mark_as_spam_impl(self, err);
}}
-#line 1078 "mn-message.c"
+#line 1095 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 413 "mn-message.gob"
+#line 414 "mn-message.gob"
gboolean
mn_message_mark_as_spam (MNMessage * self, GError ** err)
-#line 1084 "mn-message.c"
+#line 1101 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::mark_as_spam"
-#line 413 "mn-message.gob"
+#line 414 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 413 "mn-message.gob"
+#line 414 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 1091 "mn-message.c"
+#line 1108 "mn-message.c"
{
-#line 415 "mn-message.gob"
+#line 416 "mn-message.gob"
if (self_mark_as_spam_real(self, err))
{
@@ -1099,20 +1116,20 @@ mn_message_mark_as_spam (MNMessage * self, GError ** err)
else
return FALSE;
}}
-#line 1103 "mn-message.c"
+#line 1120 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 425 "mn-message.gob"
+#line 426 "mn-message.gob"
static gboolean
mn_message_mark_as_spam_impl (MNMessage * self, GError ** err)
-#line 1109 "mn-message.c"
+#line 1126 "mn-message.c"
{
MNMessageClass *klass;
-#line 425 "mn-message.gob"
+#line 426 "mn-message.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 425 "mn-message.gob"
+#line 426 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
-#line 1116 "mn-message.c"
+#line 1133 "mn-message.c"
klass = MN_MESSAGE_GET_CLASS(self);
if(klass->mark_as_spam_impl)
@@ -1121,19 +1138,151 @@ mn_message_mark_as_spam_impl (MNMessage * self, GError ** err)
return (gboolean )(0);
}
-#line 428 "mn-message.gob"
+#line 429 "mn-message.gob"
+gboolean
+mn_message_can_delete (MNMessage * self)
+#line 1145 "mn-message.c"
+{
+ MNMessageClass *klass;
+#line 429 "mn-message.gob"
+ g_return_val_if_fail (self != NULL, (gboolean )0);
+#line 429 "mn-message.gob"
+ g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
+#line 1152 "mn-message.c"
+ klass = MN_MESSAGE_GET_CLASS(self);
+
+ if(klass->can_delete)
+ return (*klass->can_delete)(self);
+ else
+ return (gboolean )(0);
+}
+#line 429 "mn-message.gob"
+static gboolean
+___real_mn_message_can_delete (MNMessage * self G_GNUC_UNUSED)
+#line 1163 "mn-message.c"
+{
+#define __GOB_FUNCTION__ "MN:Message::can_delete"
+{
+#line 431 "mn-message.gob"
+
+ return mn_mailbox_has_command(self->mailbox, "delete") || self_can_delete_impl(self);
+ }}
+#line 1171 "mn-message.c"
+#undef __GOB_FUNCTION__
+
+#line 435 "mn-message.gob"
+static gboolean
+mn_message_can_delete_impl (MNMessage * self)
+#line 1177 "mn-message.c"
+{
+ MNMessageClass *klass;
+#line 435 "mn-message.gob"
+ g_return_val_if_fail (self != NULL, (gboolean )0);
+#line 435 "mn-message.gob"
+ g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
+#line 1184 "mn-message.c"
+ klass = MN_MESSAGE_GET_CLASS(self);
+
+ if(klass->can_delete_impl)
+ return (*klass->can_delete_impl)(self);
+ else
+ return (gboolean )(0);
+}
+#line 435 "mn-message.gob"
+static gboolean
+___real_mn_message_can_delete_impl (MNMessage * self G_GNUC_UNUSED)
+#line 1195 "mn-message.c"
+{
+#define __GOB_FUNCTION__ "MN:Message::can_delete_impl"
+{
+#line 437 "mn-message.gob"
+
+ return SELF_GET_CLASS(self)->delete_impl != NULL;
+ }}
+#line 1203 "mn-message.c"
+#undef __GOB_FUNCTION__
+
+#line 441 "mn-message.gob"
+static gboolean
+mn_message_delete_real (MNMessage * self, GError ** err)
+#line 1209 "mn-message.c"
+{
+#define __GOB_FUNCTION__ "MN:Message::delete_real"
+#line 441 "mn-message.gob"
+ g_return_val_if_fail (self != NULL, (gboolean )0);
+#line 441 "mn-message.gob"
+ g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
+#line 1216 "mn-message.c"
+{
+#line 443 "mn-message.gob"
+
+ gboolean status;
+
+ if (self_execute_command(self, "delete", &status, err))
+ return status;
+ else
+ return self_delete_impl(self, err);
+ }}
+#line 1227 "mn-message.c"
+#undef __GOB_FUNCTION__
+
+#line 452 "mn-message.gob"
+gboolean
+mn_message_delete (MNMessage * self, GError ** err)
+#line 1233 "mn-message.c"
+{
+#define __GOB_FUNCTION__ "MN:Message::delete"
+#line 452 "mn-message.gob"
+ g_return_val_if_fail (self != NULL, (gboolean )0);
+#line 452 "mn-message.gob"
+ g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
+#line 1240 "mn-message.c"
+{
+#line 454 "mn-message.gob"
+
+ if (self_delete_real(self, err))
+ {
+ mn_mailbox_mark_as_read(self);
+ return TRUE;
+ }
+ else
+ return FALSE;
+ }}
+#line 1252 "mn-message.c"
+#undef __GOB_FUNCTION__
+
+#line 464 "mn-message.gob"
+static gboolean
+mn_message_delete_impl (MNMessage * self, GError ** err)
+#line 1258 "mn-message.c"
+{
+ MNMessageClass *klass;
+#line 464 "mn-message.gob"
+ g_return_val_if_fail (self != NULL, (gboolean )0);
+#line 464 "mn-message.gob"
+ g_return_val_if_fail (MN_IS_MESSAGE (self), (gboolean )0);
+#line 1265 "mn-message.c"
+ klass = MN_MESSAGE_GET_CLASS(self);
+
+ if(klass->delete_impl)
+ return (*klass->delete_impl)(self,err);
+ else
+ return (gboolean )(0);
+}
+
+#line 467 "mn-message.gob"
MNMessage *
mn_message_new (MNMailbox * mailbox, const char * error, time_t sent_time, const char * id, const char * from, const char * subject, const char * uri, MNMessageFlags flags)
-#line 1128 "mn-message.c"
+#line 1277 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::new"
-#line 428 "mn-message.gob"
+#line 467 "mn-message.gob"
g_return_val_if_fail (mailbox != NULL, (MNMessage * )0);
-#line 428 "mn-message.gob"
+#line 467 "mn-message.gob"
g_return_val_if_fail (MN_IS_MAILBOX (mailbox), (MNMessage * )0);
-#line 1135 "mn-message.c"
+#line 1284 "mn-message.c"
{
-#line 437 "mn-message.gob"
+#line 476 "mn-message.gob"
return GET_NEW_VARG(MN_MESSAGE_PROP_MAILBOX(mailbox),
MN_MESSAGE_PROP_ERROR((char *) error),
@@ -1145,43 +1294,43 @@ mn_message_new (MNMailbox * mailbox, const char * error, time_t sent_time, const
MN_MESSAGE_PROP_FLAGS(flags),
NULL);
}}
-#line 1149 "mn-message.c"
+#line 1298 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 449 "mn-message.gob"
+#line 488 "mn-message.gob"
MNMessage *
mn_message_new_from_error (MNMailbox * mailbox, const char * error, MNMessageFlags flags)
-#line 1155 "mn-message.c"
+#line 1304 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::new_from_error"
-#line 449 "mn-message.gob"
+#line 488 "mn-message.gob"
g_return_val_if_fail (mailbox != NULL, (MNMessage * )0);
-#line 449 "mn-message.gob"
+#line 488 "mn-message.gob"
g_return_val_if_fail (MN_IS_MAILBOX (mailbox), (MNMessage * )0);
-#line 449 "mn-message.gob"
+#line 488 "mn-message.gob"
g_return_val_if_fail (error != NULL, (MNMessage * )0);
-#line 1164 "mn-message.c"
+#line 1313 "mn-message.c"
{
-#line 453 "mn-message.gob"
+#line 492 "mn-message.gob"
return self_new(mailbox, error, 0, NULL, NULL, NULL, NULL, flags);
}}
-#line 1170 "mn-message.c"
+#line 1319 "mn-message.c"
#undef __GOB_FUNCTION__
-#line 457 "mn-message.gob"
+#line 496 "mn-message.gob"
xmlNode *
mn_message_xml_node_new (MNMessage * self)
-#line 1176 "mn-message.c"
+#line 1325 "mn-message.c"
{
#define __GOB_FUNCTION__ "MN:Message::xml_node_new"
-#line 457 "mn-message.gob"
+#line 496 "mn-message.gob"
g_return_val_if_fail (self != NULL, (xmlNode * )0);
-#line 457 "mn-message.gob"
+#line 496 "mn-message.gob"
g_return_val_if_fail (MN_IS_MESSAGE (self), (xmlNode * )0);
-#line 1183 "mn-message.c"
+#line 1332 "mn-message.c"
{
-#line 459 "mn-message.gob"
+#line 498 "mn-message.gob"
xmlNode *node;
@@ -1196,5 +1345,5 @@ mn_message_xml_node_new (MNMessage * self)
return node;
}}
-#line 1200 "mn-message.c"
+#line 1349 "mn-message.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-message.gob b/src/mn-message.gob
@@ -44,6 +44,7 @@ typedef enum
%{
#include "config.h"
#include <errno.h>
+#include <glib/gi18n.h>
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include "mn-util.h"
@@ -123,7 +124,7 @@ class MN:Message from G:Object
id = g_string_new(NULL);
if (self->sent_time > 0)
- g_string_append_printf(id, ":sent-time:%u:", self->sent_time);
+ g_string_append_printf(id, ":sent-time:%i:", (int) self->sent_time);
if (self->from)
g_string_append_printf(id, ":from:%s:", self->from);
if (self->subject)
@@ -425,6 +426,44 @@ class MN:Message from G:Object
virtual private gboolean
mark_as_spam_impl (self, GError **err);
+ virtual public gboolean
+ can_delete (self)
+ {
+ return mn_mailbox_has_command(self->mailbox, "delete") || self_can_delete_impl(self);
+ }
+
+ virtual private gboolean
+ can_delete_impl (self)
+ {
+ return SELF_GET_CLASS(self)->delete_impl != NULL;
+ }
+
+ private gboolean
+ delete_real (self, GError **err)
+ {
+ gboolean status;
+
+ if (self_execute_command(self, "delete", &status, err))
+ return status;
+ else
+ return self_delete_impl(self, err);
+ }
+
+ public gboolean
+ delete (self, GError **err)
+ {
+ if (self_delete_real(self, err))
+ {
+ mn_mailbox_mark_as_read(self);
+ return TRUE;
+ }
+ else
+ return FALSE;
+ }
+
+ virtual private gboolean
+ delete_impl (self, GError **err);
+
public MNMessage *
new (MN:Mailbox *mailbox (check null type),
const char *error,
diff --git a/src/mn-message.h b/src/mn-message.h
@@ -66,6 +66,9 @@ struct _MNMessageClass {
gboolean (* can_mark_as_spam) (MNMessage * self);
gboolean (* can_mark_as_spam_impl) (MNMessage * self);
gboolean (* mark_as_spam_impl) (MNMessage * self, GError ** err);
+ gboolean (* can_delete) (MNMessage * self);
+ gboolean (* can_delete_impl) (MNMessage * self);
+ gboolean (* delete_impl) (MNMessage * self, GError ** err);
};
@@ -82,6 +85,9 @@ gboolean mn_message_mark_as_read (MNMessage * self,
gboolean mn_message_can_mark_as_spam (MNMessage * self);
gboolean mn_message_mark_as_spam (MNMessage * self,
GError ** err);
+gboolean mn_message_can_delete (MNMessage * self);
+gboolean mn_message_delete (MNMessage * self,
+ GError ** err);
MNMessage * mn_message_new (MNMailbox * mailbox,
const char * error,
time_t sent_time,
diff --git a/src/mn-mh-mailbox-backend.c b/src/mn-mh-mailbox-backend.c
@@ -249,6 +249,7 @@ ___4_mn_mh_mailbox_backend_check (MNVFSMailboxBackend * backend G_GNUC_UNUSED, u
{
char *filename;
GnomeVFSURI *message_uri;
+ MNMessage *message;
if (mn_reentrant_mailbox_check_aborted(MN_REENTRANT_MAILBOX(backend->mailbox), check_id))
{
@@ -266,8 +267,14 @@ ___4_mn_mh_mailbox_backend_check (MNVFSMailboxBackend * backend G_GNUC_UNUSED, u
* definition unseen (that is, new).
*/
- messages = g_slist_prepend(messages, mn_message_new_from_uri(MN_MAILBOX(backend->mailbox), message_uri, MN_MESSAGE_NEW, FALSE));
+ message = mn_message_new_from_uri(MN_MAILBOX(backend->mailbox),
+ message_uri,
+ MN_MESSAGE_NEW,
+ FALSE);
gnome_vfs_uri_unref(message_uri);
+
+ if (message)
+ messages = g_slist_prepend(messages, message);
}
}
}
@@ -309,6 +316,6 @@ ___4_mn_mh_mailbox_backend_check (MNVFSMailboxBackend * backend G_GNUC_UNUSED, u
GDK_THREADS_LEAVE();
}
}}
-#line 313 "mn-mh-mailbox-backend.c"
+#line 320 "mn-mh-mailbox-backend.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
diff --git a/src/mn-mh-mailbox-backend.gob b/src/mn-mh-mailbox-backend.gob
@@ -126,6 +126,7 @@ class MN:MH:Mailbox:Backend from MN:VFS:Mailbox:Backend
{
char *filename;
GnomeVFSURI *message_uri;
+ MNMessage *message;
if (mn_reentrant_mailbox_check_aborted(MN_REENTRANT_MAILBOX(backend->mailbox), check_id))
{
@@ -143,8 +144,14 @@ class MN:MH:Mailbox:Backend from MN:VFS:Mailbox:Backend
* definition unseen (that is, new).
*/
- messages = g_slist_prepend(messages, mn_message_new_from_uri(MN_MAILBOX(backend->mailbox), message_uri, MN_MESSAGE_NEW, FALSE));
+ message = mn_message_new_from_uri(MN_MAILBOX(backend->mailbox),
+ message_uri,
+ MN_MESSAGE_NEW,
+ FALSE);
gnome_vfs_uri_unref(message_uri);
+
+ if (message)
+ messages = g_slist_prepend(messages, message);
}
}
}
diff --git a/src/mn-pi-mailbox-private.h b/src/mn-pi-mailbox-private.h
@@ -22,9 +22,9 @@ extern "C" {
#line 24 "mn-pi-mailbox-private.h"
struct _MNPIMailboxPrivate {
-#line 92 "mn-pi-mailbox.gob"
+#line 93 "mn-pi-mailbox.gob"
GtkWidget * auth_dialog;
-#line 95 "mn-pi-mailbox.gob"
+#line 96 "mn-pi-mailbox.gob"
gboolean auth_failed;
#line 30 "mn-pi-mailbox-private.h"
};
diff --git a/src/mn-pi-mailbox-properties.c b/src/mn-pi-mailbox-properties.c
@@ -218,7 +218,7 @@ mn_pi_mailbox_properties_init (MNPIMailboxProperties * self G_GNUC_UNUSED)
connection_types[i].type,
_(connection_types[i].mnemonic));
-#ifndef WITH_SSL
+#if ! WITH_SSL
gtk_widget_set_sensitive(self->conn_radio[MN_PI_MAILBOX_CONNECTION_TYPE_INBAND_SSL], FALSE);
gtk_widget_set_sensitive(self->conn_radio[MN_PI_MAILBOX_CONNECTION_TYPE_SSL], FALSE);
#endif
diff --git a/src/mn-pi-mailbox-properties.gob b/src/mn-pi-mailbox-properties.gob
@@ -103,7 +103,7 @@ class MN:PI:Mailbox:Properties from MN:Authenticated:Mailbox:Properties (abstrac
connection_types[i].type,
_(connection_types[i].mnemonic));
-#ifndef WITH_SSL
+#if ! WITH_SSL
gtk_widget_set_sensitive(self->conn_radio[MN_PI_MAILBOX_CONNECTION_TYPE_INBAND_SSL], FALSE);
gtk_widget_set_sensitive(self->conn_radio[MN_PI_MAILBOX_CONNECTION_TYPE_SSL], FALSE);
#endif
diff --git a/src/mn-pi-mailbox.c b/src/mn-pi-mailbox.c
@@ -25,6 +25,7 @@
#line 40 "mn-pi-mailbox.gob"
#include "config.h"
+#include <glib/gi18n.h>
#include <gnome.h>
#include <eel/eel.h>
#include "mn-mailbox-private.h"
@@ -39,7 +40,7 @@ struct _MNClientSessionPrivate
MN_PI_MAILBOX_SESSION_PRIVATE;
};
-#line 43 "mn-pi-mailbox.c"
+#line 44 "mn-pi-mailbox.c"
static const GEnumValue _mn_pi_mailbox_connection_type_values[] = {
{ MN_PI_MAILBOX_CONNECTION_TYPE_NORMAL, (char *)"MN_PI_MAILBOX_CONNECTION_TYPE_NORMAL", (char *)"normal" },
{ MN_PI_MAILBOX_CONNECTION_TYPE_INBAND_SSL, (char *)"MN_PI_MAILBOX_CONNECTION_TYPE_INBAND_SSL", (char *)"inband-ssl" },
@@ -158,25 +159,25 @@ ___finalize(GObject *obj_self)
gpointer priv G_GNUC_UNUSED = self->_priv;
if(G_OBJECT_CLASS(parent_class)->finalize) \
(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);
-#line 74 "mn-pi-mailbox.gob"
+#line 75 "mn-pi-mailbox.gob"
if(self->authmech) { g_free ((gpointer) self->authmech); self->authmech = NULL; }
-#line 164 "mn-pi-mailbox.c"
-#line 78 "mn-pi-mailbox.gob"
+#line 165 "mn-pi-mailbox.c"
+#line 79 "mn-pi-mailbox.gob"
if(self->hostname) { g_free ((gpointer) self->hostname); self->hostname = NULL; }
-#line 167 "mn-pi-mailbox.c"
-#line 89 "mn-pi-mailbox.gob"
- if(self->runtime_username) { g_free ((gpointer) self->runtime_username); self->runtime_username = NULL; }
-#line 170 "mn-pi-mailbox.c"
+#line 168 "mn-pi-mailbox.c"
#line 90 "mn-pi-mailbox.gob"
+ if(self->runtime_username) { g_free ((gpointer) self->runtime_username); self->runtime_username = NULL; }
+#line 171 "mn-pi-mailbox.c"
+#line 91 "mn-pi-mailbox.gob"
if(self->runtime_password) { g_free ((gpointer) self->runtime_password); self->runtime_password = NULL; }
-#line 173 "mn-pi-mailbox.c"
+#line 174 "mn-pi-mailbox.c"
}
#undef __GOB_FUNCTION__
-#line 97 "mn-pi-mailbox.gob"
+#line 98 "mn-pi-mailbox.gob"
static void
mn_pi_mailbox_class_init (MNPIMailboxClass * class G_GNUC_UNUSED)
-#line 180 "mn-pi-mailbox.c"
+#line 181 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::class_init"
GObjectClass *g_object_class G_GNUC_UNUSED = (GObjectClass*) class;
@@ -187,13 +188,13 @@ mn_pi_mailbox_class_init (MNPIMailboxClass * class G_GNUC_UNUSED)
parent_class = g_type_class_ref (MN_TYPE_AUTHENTICATED_MAILBOX);
-#line 113 "mn-pi-mailbox.gob"
+#line 114 "mn-pi-mailbox.gob"
mn_mailbox_class->removed = ___3_mn_pi_mailbox_removed;
-#line 124 "mn-pi-mailbox.gob"
+#line 125 "mn-pi-mailbox.gob"
mn_mailbox_class->seal = ___4_mn_pi_mailbox_seal;
-#line 140 "mn-pi-mailbox.gob"
+#line 141 "mn-pi-mailbox.gob"
mn_authenticated_mailbox_class->authenticated_check = ___5_mn_pi_mailbox_authenticated_check;
-#line 197 "mn-pi-mailbox.c"
+#line 198 "mn-pi-mailbox.c"
g_object_class->finalize = ___finalize;
g_object_class->get_property = ___object_get_property;
g_object_class->set_property = ___object_set_property;
@@ -241,7 +242,7 @@ mn_pi_mailbox_class_init (MNPIMailboxClass * class G_GNUC_UNUSED)
param_spec);
}
{
-#line 98 "mn-pi-mailbox.gob"
+#line 99 "mn-pi-mailbox.gob"
password_database = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
@@ -251,23 +252,23 @@ mn_pi_mailbox_class_init (MNPIMailboxClass * class G_GNUC_UNUSED)
*/
MN_MAILBOX_CLASS(class)->default_check_delay = 60 * 5;
-#line 255 "mn-pi-mailbox.c"
+#line 256 "mn-pi-mailbox.c"
}
}
#undef __GOB_FUNCTION__
-#line 108 "mn-pi-mailbox.gob"
+#line 109 "mn-pi-mailbox.gob"
static void
mn_pi_mailbox_init (MNPIMailbox * self G_GNUC_UNUSED)
-#line 262 "mn-pi-mailbox.c"
+#line 263 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::init"
self->_priv = G_TYPE_INSTANCE_GET_PRIVATE(self,MN_TYPE_PI_MAILBOX,MNPIMailboxPrivate);
{
-#line 109 "mn-pi-mailbox.gob"
+#line 110 "mn-pi-mailbox.gob"
mn_mailbox_set_stock_id(MN_MAILBOX(self), MN_STOCK_REMOTE);
-#line 271 "mn-pi-mailbox.c"
+#line 272 "mn-pi-mailbox.c"
}
}
#undef __GOB_FUNCTION__
@@ -286,30 +287,30 @@ ___object_set_property (GObject *object,
switch (property_id) {
case PROP_CONNECTION_TYPE:
{
-#line 69 "mn-pi-mailbox.gob"
+#line 70 "mn-pi-mailbox.gob"
self->connection_type = g_value_get_enum (VAL);
-#line 292 "mn-pi-mailbox.c"
+#line 293 "mn-pi-mailbox.c"
}
break;
case PROP_AUTHMECH:
{
-#line 75 "mn-pi-mailbox.gob"
+#line 76 "mn-pi-mailbox.gob"
{ char *old = self->authmech; self->authmech = g_value_dup_string (VAL); g_free (old); }
-#line 299 "mn-pi-mailbox.c"
+#line 300 "mn-pi-mailbox.c"
}
break;
case PROP_HOSTNAME:
{
-#line 79 "mn-pi-mailbox.gob"
+#line 80 "mn-pi-mailbox.gob"
{ char *old = self->hostname; self->hostname = g_value_dup_string (VAL); g_free (old); }
-#line 306 "mn-pi-mailbox.c"
+#line 307 "mn-pi-mailbox.c"
}
break;
case PROP_PORT:
{
-#line 82 "mn-pi-mailbox.gob"
+#line 83 "mn-pi-mailbox.gob"
self->port = g_value_get_int (VAL);
-#line 313 "mn-pi-mailbox.c"
+#line 314 "mn-pi-mailbox.c"
}
break;
default:
@@ -338,30 +339,30 @@ ___object_get_property (GObject *object,
switch (property_id) {
case PROP_CONNECTION_TYPE:
{
-#line 69 "mn-pi-mailbox.gob"
+#line 70 "mn-pi-mailbox.gob"
g_value_set_enum (VAL, self->connection_type);
-#line 344 "mn-pi-mailbox.c"
+#line 345 "mn-pi-mailbox.c"
}
break;
case PROP_AUTHMECH:
{
-#line 75 "mn-pi-mailbox.gob"
+#line 76 "mn-pi-mailbox.gob"
g_value_set_string (VAL, self->authmech);
-#line 351 "mn-pi-mailbox.c"
+#line 352 "mn-pi-mailbox.c"
}
break;
case PROP_HOSTNAME:
{
-#line 79 "mn-pi-mailbox.gob"
+#line 80 "mn-pi-mailbox.gob"
g_value_set_string (VAL, self->hostname);
-#line 358 "mn-pi-mailbox.c"
+#line 359 "mn-pi-mailbox.c"
}
break;
case PROP_PORT:
{
-#line 82 "mn-pi-mailbox.gob"
+#line 83 "mn-pi-mailbox.gob"
g_value_set_int (VAL, self->port);
-#line 365 "mn-pi-mailbox.c"
+#line 366 "mn-pi-mailbox.c"
}
break;
default:
@@ -378,17 +379,17 @@ g_value_set_int (VAL, self->port);
-#line 113 "mn-pi-mailbox.gob"
+#line 114 "mn-pi-mailbox.gob"
static void
___3_mn_pi_mailbox_removed (MNMailbox * mailbox G_GNUC_UNUSED)
-#line 385 "mn-pi-mailbox.c"
+#line 386 "mn-pi-mailbox.c"
#define PARENT_HANDLER(___mailbox) \
{ if(MN_MAILBOX_CLASS(parent_class)->removed) \
(* MN_MAILBOX_CLASS(parent_class)->removed)(___mailbox); }
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::removed"
{
-#line 115 "mn-pi-mailbox.gob"
+#line 116 "mn-pi-mailbox.gob"
Self *self = SELF(mailbox);
@@ -397,21 +398,21 @@ ___3_mn_pi_mailbox_removed (MNMailbox * mailbox G_GNUC_UNUSED)
PARENT_HANDLER(mailbox);
}}
-#line 401 "mn-pi-mailbox.c"
+#line 402 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 124 "mn-pi-mailbox.gob"
+#line 125 "mn-pi-mailbox.gob"
static void
___4_mn_pi_mailbox_seal (MNMailbox * mailbox G_GNUC_UNUSED)
-#line 408 "mn-pi-mailbox.c"
+#line 409 "mn-pi-mailbox.c"
#define PARENT_HANDLER(___mailbox) \
{ if(MN_MAILBOX_CLASS(parent_class)->seal) \
(* MN_MAILBOX_CLASS(parent_class)->seal)(___mailbox); }
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::seal"
{
-#line 126 "mn-pi-mailbox.gob"
+#line 127 "mn-pi-mailbox.gob"
Self *self = SELF(mailbox);
@@ -425,27 +426,27 @@ ___4_mn_pi_mailbox_seal (MNMailbox * mailbox G_GNUC_UNUSED)
? SELF_GET_CLASS(self)->default_ports[self->connection_type]
: self->port;
}}
-#line 429 "mn-pi-mailbox.c"
+#line 430 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 140 "mn-pi-mailbox.gob"
+#line 141 "mn-pi-mailbox.gob"
static void
___5_mn_pi_mailbox_authenticated_check (MNAuthenticatedMailbox * mailbox G_GNUC_UNUSED)
-#line 436 "mn-pi-mailbox.c"
+#line 437 "mn-pi-mailbox.c"
#define PARENT_HANDLER(___mailbox) \
{ if(MN_AUTHENTICATED_MAILBOX_CLASS(parent_class)->authenticated_check) \
(* MN_AUTHENTICATED_MAILBOX_CLASS(parent_class)->authenticated_check)(___mailbox); }
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::authenticated_check"
{
-#line 142 "mn-pi-mailbox.gob"
+#line 143 "mn-pi-mailbox.gob"
Self *self = SELF(mailbox);
PARENT_HANDLER(mailbox);
-#ifndef WITH_SSL
+#if ! WITH_SSL
if (self->connection_type == MN_PI_MAILBOX_CONNECTION_TYPE_INBAND_SSL
|| self->connection_type == MN_PI_MAILBOX_CONNECTION_TYPE_SSL)
{
@@ -462,29 +463,29 @@ ___5_mn_pi_mailbox_authenticated_check (MNAuthenticatedMailbox * mailbox G_GNUC_
self->auth_prompted = FALSE;
selfp->auth_failed = FALSE;
}}
-#line 466 "mn-pi-mailbox.c"
+#line 467 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 165 "mn-pi-mailbox.gob"
+#line 166 "mn-pi-mailbox.gob"
gboolean
mn_pi_mailbox_split_uri (const char * uri, int maxlen, char * scheme, char * auth, char * location, gboolean * has_auth)
-#line 473 "mn-pi-mailbox.c"
+#line 474 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::split_uri"
-#line 165 "mn-pi-mailbox.gob"
+#line 166 "mn-pi-mailbox.gob"
g_return_val_if_fail (uri != NULL, (gboolean )0);
-#line 165 "mn-pi-mailbox.gob"
+#line 166 "mn-pi-mailbox.gob"
g_return_val_if_fail (scheme != NULL, (gboolean )0);
-#line 165 "mn-pi-mailbox.gob"
+#line 166 "mn-pi-mailbox.gob"
g_return_val_if_fail (auth != NULL, (gboolean )0);
-#line 165 "mn-pi-mailbox.gob"
+#line 166 "mn-pi-mailbox.gob"
g_return_val_if_fail (location != NULL, (gboolean )0);
-#line 165 "mn-pi-mailbox.gob"
+#line 166 "mn-pi-mailbox.gob"
g_return_val_if_fail (has_auth != NULL, (gboolean )0);
-#line 486 "mn-pi-mailbox.c"
+#line 487 "mn-pi-mailbox.c"
{
-#line 172 "mn-pi-mailbox.gob"
+#line 173 "mn-pi-mailbox.gob"
char *pat;
int n;
@@ -505,28 +506,28 @@ mn_pi_mailbox_split_uri (const char * uri, int maxlen, char * scheme, char * aut
else
return FALSE;
}}
-#line 509 "mn-pi-mailbox.c"
+#line 510 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
-#line 193 "mn-pi-mailbox.gob"
+#line 194 "mn-pi-mailbox.gob"
gboolean
mn_pi_mailbox_split_uri_auth (const char * auth, int maxlen, char * username, char * authmech, gboolean * has_username, gboolean * has_authmech)
-#line 515 "mn-pi-mailbox.c"
+#line 516 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::split_uri_auth"
-#line 193 "mn-pi-mailbox.gob"
+#line 194 "mn-pi-mailbox.gob"
g_return_val_if_fail (auth != NULL, (gboolean )0);
-#line 193 "mn-pi-mailbox.gob"
+#line 194 "mn-pi-mailbox.gob"
g_return_val_if_fail (username != NULL, (gboolean )0);
-#line 193 "mn-pi-mailbox.gob"
+#line 194 "mn-pi-mailbox.gob"
g_return_val_if_fail (authmech != NULL, (gboolean )0);
-#line 193 "mn-pi-mailbox.gob"
+#line 194 "mn-pi-mailbox.gob"
g_return_val_if_fail (has_username != NULL, (gboolean )0);
-#line 193 "mn-pi-mailbox.gob"
+#line 194 "mn-pi-mailbox.gob"
g_return_val_if_fail (has_authmech != NULL, (gboolean )0);
-#line 528 "mn-pi-mailbox.c"
+#line 529 "mn-pi-mailbox.c"
{
-#line 200 "mn-pi-mailbox.gob"
+#line 201 "mn-pi-mailbox.gob"
char *pat;
int n;
@@ -559,24 +560,24 @@ mn_pi_mailbox_split_uri_auth (const char * auth, int maxlen, char * username, ch
return TRUE;
}}
-#line 563 "mn-pi-mailbox.c"
+#line 564 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
-#line 233 "mn-pi-mailbox.gob"
+#line 234 "mn-pi-mailbox.gob"
void
mn_pi_mailbox_split_uri_hostport (const char * hostport, int maxlen, char * hostname, int * port)
-#line 569 "mn-pi-mailbox.c"
+#line 570 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::split_uri_hostport"
-#line 233 "mn-pi-mailbox.gob"
+#line 234 "mn-pi-mailbox.gob"
g_return_if_fail (hostport != NULL);
-#line 233 "mn-pi-mailbox.gob"
+#line 234 "mn-pi-mailbox.gob"
g_return_if_fail (hostname != NULL);
-#line 233 "mn-pi-mailbox.gob"
+#line 234 "mn-pi-mailbox.gob"
g_return_if_fail (port != NULL);
-#line 578 "mn-pi-mailbox.c"
+#line 579 "mn-pi-mailbox.c"
{
-#line 238 "mn-pi-mailbox.gob"
+#line 239 "mn-pi-mailbox.gob"
char *pat;
int n;
@@ -599,22 +600,22 @@ mn_pi_mailbox_split_uri_hostport (const char * hostport, int maxlen, char * host
if (n < 2)
*port = 0;
}}
-#line 603 "mn-pi-mailbox.c"
+#line 604 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
-#line 261 "mn-pi-mailbox.gob"
+#line 262 "mn-pi-mailbox.gob"
void
mn_pi_mailbox_auth_failed (MNPIMailbox * self)
-#line 609 "mn-pi-mailbox.c"
+#line 610 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::auth_failed"
-#line 261 "mn-pi-mailbox.gob"
+#line 262 "mn-pi-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 261 "mn-pi-mailbox.gob"
+#line 262 "mn-pi-mailbox.gob"
g_return_if_fail (MN_IS_PI_MAILBOX (self));
-#line 616 "mn-pi-mailbox.c"
+#line 617 "mn-pi-mailbox.c"
{
-#line 263 "mn-pi-mailbox.gob"
+#line 264 "mn-pi-mailbox.gob"
MNAuthenticatedMailbox *auth_mailbox = MN_AUTHENTICATED_MAILBOX(self);
@@ -635,22 +636,22 @@ mn_pi_mailbox_auth_failed (MNPIMailbox * self)
selfp->auth_failed = TRUE;
}}
-#line 639 "mn-pi-mailbox.c"
+#line 640 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
-#line 284 "mn-pi-mailbox.gob"
+#line 285 "mn-pi-mailbox.gob"
gboolean
mn_pi_mailbox_fill_credentials (MNPIMailbox * self, gboolean need_username, gboolean need_password)
-#line 645 "mn-pi-mailbox.c"
+#line 646 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::fill_credentials"
-#line 284 "mn-pi-mailbox.gob"
+#line 285 "mn-pi-mailbox.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 284 "mn-pi-mailbox.gob"
+#line 285 "mn-pi-mailbox.gob"
g_return_val_if_fail (MN_IS_PI_MAILBOX (self), (gboolean )0);
-#line 652 "mn-pi-mailbox.c"
+#line 653 "mn-pi-mailbox.c"
{
-#line 286 "mn-pi-mailbox.gob"
+#line 287 "mn-pi-mailbox.gob"
MNAuthenticatedMailbox *auth_mailbox = MN_AUTHENTICATED_MAILBOX(self);
@@ -706,24 +707,24 @@ mn_pi_mailbox_fill_credentials (MNPIMailbox * self, gboolean need_username, gboo
return ! self->auth_cancelled;
}}
-#line 710 "mn-pi-mailbox.c"
+#line 711 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
-#line 342 "mn-pi-mailbox.gob"
+#line 343 "mn-pi-mailbox.gob"
static gboolean
mn_pi_mailbox_credentials_prompt (MNPIMailbox * self, char ** username, char ** password, const char * format, ...)
-#line 716 "mn-pi-mailbox.c"
+#line 717 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::credentials_prompt"
-#line 342 "mn-pi-mailbox.gob"
+#line 343 "mn-pi-mailbox.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 342 "mn-pi-mailbox.gob"
+#line 343 "mn-pi-mailbox.gob"
g_return_val_if_fail (MN_IS_PI_MAILBOX (self), (gboolean )0);
-#line 342 "mn-pi-mailbox.gob"
+#line 343 "mn-pi-mailbox.gob"
g_return_val_if_fail (format != NULL, (gboolean )0);
-#line 725 "mn-pi-mailbox.c"
+#line 726 "mn-pi-mailbox.c"
{
-#line 348 "mn-pi-mailbox.gob"
+#line 349 "mn-pi-mailbox.gob"
va_list args;
char *message;
@@ -765,22 +766,22 @@ mn_pi_mailbox_credentials_prompt (MNPIMailbox * self, char ** username, char **
return ok;
}}
-#line 769 "mn-pi-mailbox.c"
+#line 770 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
-#line 390 "mn-pi-mailbox.gob"
+#line 391 "mn-pi-mailbox.gob"
static char *
mn_pi_mailbox_build_auth_id (MNPIMailbox * self, const char * username)
-#line 775 "mn-pi-mailbox.c"
+#line 776 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::build_auth_id"
-#line 390 "mn-pi-mailbox.gob"
+#line 391 "mn-pi-mailbox.gob"
g_return_val_if_fail (self != NULL, (char * )0);
-#line 390 "mn-pi-mailbox.gob"
+#line 391 "mn-pi-mailbox.gob"
g_return_val_if_fail (MN_IS_PI_MAILBOX (self), (char * )0);
-#line 782 "mn-pi-mailbox.c"
+#line 783 "mn-pi-mailbox.c"
{
-#line 392 "mn-pi-mailbox.gob"
+#line 393 "mn-pi-mailbox.gob"
return g_strdup_printf("%s:%s:%i:%i:%s",
MN_MAILBOX_GET_CLASS(self)->type,
@@ -789,24 +790,24 @@ mn_pi_mailbox_build_auth_id (MNPIMailbox * self, const char * username)
self->connection_type,
username);
}}
-#line 793 "mn-pi-mailbox.c"
+#line 794 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
-#line 401 "mn-pi-mailbox.gob"
+#line 402 "mn-pi-mailbox.gob"
static char *
mn_pi_mailbox_get_password (MNPIMailbox * self, const char * username)
-#line 799 "mn-pi-mailbox.c"
+#line 800 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::get_password"
-#line 401 "mn-pi-mailbox.gob"
+#line 402 "mn-pi-mailbox.gob"
g_return_val_if_fail (self != NULL, (char * )0);
-#line 401 "mn-pi-mailbox.gob"
+#line 402 "mn-pi-mailbox.gob"
g_return_val_if_fail (MN_IS_PI_MAILBOX (self), (char * )0);
-#line 401 "mn-pi-mailbox.gob"
+#line 402 "mn-pi-mailbox.gob"
g_return_val_if_fail (username != NULL, (char * )0);
-#line 808 "mn-pi-mailbox.c"
+#line 809 "mn-pi-mailbox.c"
{
-#line 403 "mn-pi-mailbox.gob"
+#line 404 "mn-pi-mailbox.gob"
char *auth_id;
char *password;
@@ -821,24 +822,24 @@ mn_pi_mailbox_get_password (MNPIMailbox * self, const char * username)
return password;
}}
-#line 825 "mn-pi-mailbox.c"
+#line 826 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
-#line 418 "mn-pi-mailbox.gob"
+#line 419 "mn-pi-mailbox.gob"
static void
mn_pi_mailbox_set_password (MNPIMailbox * self, const char * username, const char * password)
-#line 831 "mn-pi-mailbox.c"
+#line 832 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::set_password"
-#line 418 "mn-pi-mailbox.gob"
+#line 419 "mn-pi-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 418 "mn-pi-mailbox.gob"
+#line 419 "mn-pi-mailbox.gob"
g_return_if_fail (MN_IS_PI_MAILBOX (self));
-#line 418 "mn-pi-mailbox.gob"
+#line 419 "mn-pi-mailbox.gob"
g_return_if_fail (username != NULL);
-#line 840 "mn-pi-mailbox.c"
+#line 841 "mn-pi-mailbox.c"
{
-#line 420 "mn-pi-mailbox.gob"
+#line 421 "mn-pi-mailbox.gob"
char *auth_id;
@@ -853,39 +854,39 @@ mn_pi_mailbox_set_password (MNPIMailbox * self, const char * username, const cha
g_free(auth_id);
}}
-#line 857 "mn-pi-mailbox.c"
+#line 858 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
-#line 435 "mn-pi-mailbox.gob"
+#line 436 "mn-pi-mailbox.gob"
void
mn_pi_mailbox_session_private_init (MNPIMailbox * self, MNClientSessionPrivate * priv)
-#line 863 "mn-pi-mailbox.c"
+#line 864 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::session_private_init"
-#line 435 "mn-pi-mailbox.gob"
+#line 436 "mn-pi-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 435 "mn-pi-mailbox.gob"
+#line 436 "mn-pi-mailbox.gob"
g_return_if_fail (MN_IS_PI_MAILBOX (self));
-#line 435 "mn-pi-mailbox.gob"
+#line 436 "mn-pi-mailbox.gob"
g_return_if_fail (priv != NULL);
-#line 872 "mn-pi-mailbox.c"
+#line 873 "mn-pi-mailbox.c"
{
-#line 437 "mn-pi-mailbox.gob"
+#line 438 "mn-pi-mailbox.gob"
priv->mailbox = MN_MAILBOX(self);
priv->pi_mailbox = MN_PI_MAILBOX(self);
}}
-#line 879 "mn-pi-mailbox.c"
+#line 880 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
-#line 442 "mn-pi-mailbox.gob"
+#line 443 "mn-pi-mailbox.gob"
gboolean
mn_pi_mailbox_sasl_get_credentials_cb (MNClientSession * session, MNClientSessionPrivate * priv, const char ** username, const char ** password)
-#line 885 "mn-pi-mailbox.c"
+#line 886 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::sasl_get_credentials_cb"
{
-#line 447 "mn-pi-mailbox.gob"
+#line 448 "mn-pi-mailbox.gob"
#if WITH_SASL
g_return_val_if_fail(username != NULL || password != NULL, FALSE);
@@ -906,33 +907,33 @@ mn_pi_mailbox_sasl_get_credentials_cb (MNClientSession * session, MNClientSessio
return FALSE;
#endif /* WITH_SASL */
}}
-#line 910 "mn-pi-mailbox.c"
+#line 911 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
-#line 468 "mn-pi-mailbox.gob"
+#line 469 "mn-pi-mailbox.gob"
void
mn_pi_mailbox_notice_cb (MNClientSession * session, const char * message, MNClientSessionPrivate * priv)
-#line 916 "mn-pi-mailbox.c"
+#line 917 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::notice_cb"
{
-#line 472 "mn-pi-mailbox.gob"
+#line 473 "mn-pi-mailbox.gob"
mn_mailbox_notice(priv->mailbox, "%s", message);
}}
-#line 924 "mn-pi-mailbox.c"
+#line 925 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
-#line 476 "mn-pi-mailbox.gob"
+#line 477 "mn-pi-mailbox.gob"
void
mn_pi_mailbox_warning_cb (MNClientSession * session, const char * message, MNClientSessionPrivate * priv)
-#line 930 "mn-pi-mailbox.c"
+#line 931 "mn-pi-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:PI:Mailbox::warning_cb"
{
-#line 480 "mn-pi-mailbox.gob"
+#line 481 "mn-pi-mailbox.gob"
mn_mailbox_warning(priv->mailbox, "%s", message);
}}
-#line 938 "mn-pi-mailbox.c"
+#line 939 "mn-pi-mailbox.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-pi-mailbox.gob b/src/mn-pi-mailbox.gob
@@ -39,6 +39,7 @@ requires 2.0.14
%{
#include "config.h"
+#include <glib/gi18n.h>
#include <gnome.h>
#include <eel/eel.h>
#include "mn-mailbox-private.h"
@@ -144,7 +145,7 @@ class MN:PI:Mailbox from MN:Authenticated:Mailbox (abstract)
PARENT_HANDLER(mailbox);
-#ifndef WITH_SSL
+#if ! WITH_SSL
if (self->connection_type == MN_PI_MAILBOX_CONNECTION_TYPE_INBAND_SSL
|| self->connection_type == MN_PI_MAILBOX_CONNECTION_TYPE_SSL)
{
diff --git a/src/mn-pop3-mailbox-properties.c b/src/mn-pop3-mailbox-properties.c
@@ -185,7 +185,7 @@ ___object_get_property (GObject *object,
NULL);
complete = *server != 0;
-#ifndef WITH_SSL
+#if ! WITH_SSL
if (complete)
complete = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pi->conn_radio[MN_PI_MAILBOX_CONNECTION_TYPE_NORMAL]));
#endif /* WITH_SSL */
diff --git a/src/mn-pop3-mailbox-properties.gob b/src/mn-pop3-mailbox-properties.gob
@@ -51,7 +51,7 @@ class MN:POP3:Mailbox:Properties from MN:PI:Mailbox:Properties
NULL);
complete = *server != 0;
-#ifndef WITH_SSL
+#if ! WITH_SSL
if (complete)
complete = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pi->conn_radio[MN_PI_MAILBOX_CONNECTION_TYPE_NORMAL]));
#endif /* WITH_SSL */
diff --git a/src/mn-pop3-mailbox.c b/src/mn-pop3-mailbox.c
@@ -1237,48 +1237,50 @@ mn_pop3_mailbox_response_new_cb (MNClientSession * session, const char * input,
if (after_status)
{
- if (input[after_status] == 0 || input[after_status] == ' ')
- {
- response = g_new0(MNClientSessionResponse, 1);
- response->type = type;
- if (input[after_status] == ' ')
- response->arguments = g_strdup(input + after_status + 1);
- }
+ char c = input[after_status];
+
+ if (c == ' ' || c == ',') /* skip commonly used separators */
+ after_status++;
+
+ response = g_new0(MNClientSessionResponse, 1);
+ response->type = type;
+ if (input[after_status] != 0)
+ response->arguments = g_strdup(input + after_status);
}
}
}
return response;
}}
-#line 1254 "mn-pop3-mailbox.c"
+#line 1256 "mn-pop3-mailbox.c"
#undef __GOB_FUNCTION__
-#line 930 "mn-pop3-mailbox.gob"
+#line 932 "mn-pop3-mailbox.gob"
static void
mn_pop3_mailbox_response_free_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 1260 "mn-pop3-mailbox.c"
+#line 1262 "mn-pop3-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:POP3:Mailbox::response_free_cb"
{
-#line 934 "mn-pop3-mailbox.gob"
+#line 936 "mn-pop3-mailbox.gob"
g_free(response->arguments);
g_free(response);
}}
-#line 1269 "mn-pop3-mailbox.c"
+#line 1271 "mn-pop3-mailbox.c"
#undef __GOB_FUNCTION__
-#line 939 "mn-pop3-mailbox.gob"
+#line 941 "mn-pop3-mailbox.gob"
static int
mn_pop3_mailbox_session_authenticate (MNClientSessionPrivate * priv)
-#line 1275 "mn-pop3-mailbox.c"
+#line 1277 "mn-pop3-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:POP3:Mailbox::session_authenticate"
-#line 939 "mn-pop3-mailbox.gob"
+#line 941 "mn-pop3-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1280 "mn-pop3-mailbox.c"
+#line 1282 "mn-pop3-mailbox.c"
{
-#line 941 "mn-pop3-mailbox.gob"
+#line 943 "mn-pop3-mailbox.gob"
#if WITH_SASL
g_slist_free(priv->sasl_remaining_mechanisms);
@@ -1329,20 +1331,20 @@ mn_pop3_mailbox_session_authenticate (MNClientSessionPrivate * priv)
return STATE_USER;
}
}}
-#line 1333 "mn-pop3-mailbox.c"
+#line 1335 "mn-pop3-mailbox.c"
#undef __GOB_FUNCTION__
-#line 992 "mn-pop3-mailbox.gob"
+#line 994 "mn-pop3-mailbox.gob"
static int
mn_pop3_mailbox_session_authenticate_fallback (MNClientSessionPrivate * priv, gboolean tried_apop, gboolean tried_pass)
-#line 1339 "mn-pop3-mailbox.c"
+#line 1341 "mn-pop3-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:POP3:Mailbox::session_authenticate_fallback"
-#line 992 "mn-pop3-mailbox.gob"
+#line 994 "mn-pop3-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1344 "mn-pop3-mailbox.c"
+#line 1346 "mn-pop3-mailbox.c"
{
-#line 996 "mn-pop3-mailbox.gob"
+#line 998 "mn-pop3-mailbox.gob"
if (! priv->pi_mailbox->authmech)
{
@@ -1390,20 +1392,20 @@ mn_pop3_mailbox_session_authenticate_fallback (MNClientSessionPrivate * priv, gb
return STATE_QUIT;
}
}}
-#line 1394 "mn-pop3-mailbox.c"
+#line 1396 "mn-pop3-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1044 "mn-pop3-mailbox.gob"
+#line 1046 "mn-pop3-mailbox.gob"
static int
mn_pop3_mailbox_session_authenticated (MNClientSessionPrivate * priv)
-#line 1400 "mn-pop3-mailbox.c"
+#line 1402 "mn-pop3-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:POP3:Mailbox::session_authenticated"
-#line 1044 "mn-pop3-mailbox.gob"
+#line 1046 "mn-pop3-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1405 "mn-pop3-mailbox.c"
+#line 1407 "mn-pop3-mailbox.c"
{
-#line 1046 "mn-pop3-mailbox.gob"
+#line 1048 "mn-pop3-mailbox.gob"
priv->authenticated = TRUE;
if (priv->self->_priv->login_delay)
@@ -1430,22 +1432,22 @@ mn_pop3_mailbox_session_authenticated (MNClientSessionPrivate * priv)
? STATE_CAPA
: STATE_LIST;
}}
-#line 1434 "mn-pop3-mailbox.c"
+#line 1436 "mn-pop3-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1073 "mn-pop3-mailbox.gob"
+#line 1075 "mn-pop3-mailbox.gob"
static void
mn_pop3_mailbox_handle_list_response (MNClientSessionPrivate * priv, MNClientSessionResponse * response, gboolean in_retr_top)
-#line 1440 "mn-pop3-mailbox.c"
+#line 1442 "mn-pop3-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:POP3:Mailbox::handle_list_response"
-#line 1073 "mn-pop3-mailbox.gob"
+#line 1075 "mn-pop3-mailbox.gob"
g_return_if_fail (priv != NULL);
-#line 1073 "mn-pop3-mailbox.gob"
+#line 1075 "mn-pop3-mailbox.gob"
g_return_if_fail (response != NULL);
-#line 1447 "mn-pop3-mailbox.c"
+#line 1449 "mn-pop3-mailbox.c"
{
-#line 1077 "mn-pop3-mailbox.gob"
+#line 1079 "mn-pop3-mailbox.gob"
switch (response->type)
{
@@ -1463,24 +1465,24 @@ mn_pop3_mailbox_handle_list_response (MNClientSessionPrivate * priv, MNClientSes
break;
}
}}
-#line 1467 "mn-pop3-mailbox.c"
+#line 1469 "mn-pop3-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1095 "mn-pop3-mailbox.gob"
+#line 1097 "mn-pop3-mailbox.gob"
char *
mn_pop3_mailbox_build_name (const char * username, const char * server)
-#line 1473 "mn-pop3-mailbox.c"
+#line 1475 "mn-pop3-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:POP3:Mailbox::build_name"
-#line 1095 "mn-pop3-mailbox.gob"
+#line 1097 "mn-pop3-mailbox.gob"
g_return_val_if_fail (server != NULL, (char * )0);
-#line 1478 "mn-pop3-mailbox.c"
+#line 1480 "mn-pop3-mailbox.c"
{
-#line 1097 "mn-pop3-mailbox.gob"
+#line 1099 "mn-pop3-mailbox.gob"
return username
? g_strdup_printf("%s@%s", username, server)
: g_strdup(server);
}}
-#line 1486 "mn-pop3-mailbox.c"
+#line 1488 "mn-pop3-mailbox.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-pop3-mailbox.gob b/src/mn-pop3-mailbox.gob
@@ -913,13 +913,15 @@ class MN:POP3:Mailbox from MN:PI:Mailbox
if (after_status)
{
- if (input[after_status] == 0 || input[after_status] == ' ')
- {
- response = g_new0(MNClientSessionResponse, 1);
- response->type = type;
- if (input[after_status] == ' ')
- response->arguments = g_strdup(input + after_status + 1);
- }
+ char c = input[after_status];
+
+ if (c == ' ' || c == ',') /* skip commonly used separators */
+ after_status++;
+
+ response = g_new0(MNClientSessionResponse, 1);
+ response->type = type;
+ if (input[after_status] != 0)
+ response->arguments = g_strdup(input + after_status);
}
}
}
diff --git a/src/mn-popup-private.h b/src/mn-popup-private.h
@@ -10,7 +10,7 @@ extern "C" {
#endif /* __cplusplus */
struct _MNPopupPrivate {
-#line 36 "mn-popup.gob"
+#line 44 "mn-popup.gob"
MNMessage * message;
#line 16 "mn-popup-private.h"
};
diff --git a/src/mn-popup.c b/src/mn-popup.c
@@ -29,7 +29,15 @@
#include "mn-conf.h"
#include "mn-shell.h"
-#line 33 "mn-popup.c"
+typedef void (*ActionAddFunction) (MNPopup *self);
+
+typedef struct
+{
+ const char *id;
+ ActionAddFunction add;
+} ActionDefinition;
+
+#line 41 "mn-popup.c"
/* self casting macros */
#define SELF(x) MN_POPUP(x)
#define SELF_CONST(x) MN_POPUP_CONST(x)
@@ -49,9 +57,16 @@ static void ___object_get_property (GObject *object, guint property_id, GValue *
static void mn_popup_init (MNPopup * o) G_GNUC_UNUSED;
static void mn_popup_class_init (MNPopupClass * c) G_GNUC_UNUSED;
static GObject * ___1_mn_popup_constructor (GType type, unsigned int n_construct_properties, GObjectConstructParam * construct_params) G_GNUC_UNUSED;
+static ActionDefinition * mn_popup_find_action (const char * id) G_GNUC_UNUSED;
+static void mn_popup_add_actions (MNPopup * self) G_GNUC_UNUSED;
+static void mn_popup_add_open_cb (MNPopup * self) G_GNUC_UNUSED;
+static void mn_popup_add_mark_as_read_cb (MNPopup * self) G_GNUC_UNUSED;
+static void mn_popup_add_mark_as_spam_cb (MNPopup * self) G_GNUC_UNUSED;
+static void mn_popup_add_delete_cb (MNPopup * self) G_GNUC_UNUSED;
static void mn_popup_open_cb (NotifyNotification * notification, char * id, gpointer user_data) G_GNUC_UNUSED;
static void mn_popup_mark_as_read_cb (NotifyNotification * notification, char * id, gpointer user_data) G_GNUC_UNUSED;
static void mn_popup_mark_as_spam_cb (NotifyNotification * notification, char * id, gpointer user_data) G_GNUC_UNUSED;
+static void mn_popup_delete_cb (NotifyNotification * notification, char * id, gpointer user_data) G_GNUC_UNUSED;
static void mn_popup_closed_h (NotifyNotification * notification, gpointer user_data) G_GNUC_UNUSED;
static void mn_popup_append_row (GString * body, const char * name, const char * value) G_GNUC_UNUSED;
static int mn_popup_get_conf_timeout (void) G_GNUC_UNUSED;
@@ -65,9 +80,16 @@ enum {
static NotifyNotificationClass *parent_class = NULL;
/* Short form macros */
+#define self_find_action mn_popup_find_action
+#define self_add_actions mn_popup_add_actions
+#define self_add_open_cb mn_popup_add_open_cb
+#define self_add_mark_as_read_cb mn_popup_add_mark_as_read_cb
+#define self_add_mark_as_spam_cb mn_popup_add_mark_as_spam_cb
+#define self_add_delete_cb mn_popup_add_delete_cb
#define self_open_cb mn_popup_open_cb
#define self_mark_as_read_cb mn_popup_mark_as_read_cb
#define self_mark_as_spam_cb mn_popup_mark_as_spam_cb
+#define self_delete_cb mn_popup_delete_cb
#define self_closed_h mn_popup_closed_h
#define self_append_row mn_popup_append_row
#define self_get_conf_timeout mn_popup_get_conf_timeout
@@ -124,9 +146,9 @@ ___dispose (GObject *obj_self)
MNPopup *self G_GNUC_UNUSED = MN_POPUP (obj_self);
if (G_OBJECT_CLASS (parent_class)->dispose) \
(* G_OBJECT_CLASS (parent_class)->dispose) (obj_self);
-#line 36 "mn-popup.gob"
+#line 44 "mn-popup.gob"
if(self->_priv->message) { g_object_unref ((gpointer) self->_priv->message); self->_priv->message = NULL; }
-#line 130 "mn-popup.c"
+#line 152 "mn-popup.c"
}
#undef __GOB_FUNCTION__
@@ -159,9 +181,9 @@ mn_popup_class_init (MNPopupClass * c G_GNUC_UNUSED)
parent_class = g_type_class_ref (NOTIFY_TYPE_NOTIFICATION);
-#line 41 "mn-popup.gob"
+#line 49 "mn-popup.gob"
g_object_class->constructor = ___1_mn_popup_constructor;
-#line 165 "mn-popup.c"
+#line 187 "mn-popup.c"
g_object_class->dispose = ___dispose;
g_object_class->finalize = ___finalize;
g_object_class->get_property = ___object_get_property;
@@ -196,9 +218,9 @@ ___object_set_property (GObject *object,
switch (property_id) {
case PROP_MESSAGE:
{
-#line 37 "mn-popup.gob"
+#line 45 "mn-popup.gob"
{ GObject *___old = (GObject *)self->_priv->message; self->_priv->message = (MNMessage *)g_value_dup_object (VAL); if (___old != NULL) { g_object_unref (G_OBJECT (___old)); } }
-#line 202 "mn-popup.c"
+#line 224 "mn-popup.c"
}
break;
default:
@@ -227,9 +249,9 @@ ___object_get_property (GObject *object,
switch (property_id) {
case PROP_MESSAGE:
{
-#line 37 "mn-popup.gob"
+#line 45 "mn-popup.gob"
g_value_set_object (VAL, (gpointer)self->_priv->message);
-#line 233 "mn-popup.c"
+#line 255 "mn-popup.c"
}
break;
default:
@@ -246,10 +268,10 @@ g_value_set_object (VAL, (gpointer)self->_priv->message);
-#line 41 "mn-popup.gob"
+#line 49 "mn-popup.gob"
static GObject *
___1_mn_popup_constructor (GType type G_GNUC_UNUSED, unsigned int n_construct_properties, GObjectConstructParam * construct_params)
-#line 253 "mn-popup.c"
+#line 275 "mn-popup.c"
#define PARENT_HANDLER(___type,___n_construct_properties,___construct_params) \
((G_OBJECT_CLASS(parent_class)->constructor)? \
(* G_OBJECT_CLASS(parent_class)->constructor)(___type,___n_construct_properties,___construct_params): \
@@ -257,7 +279,7 @@ ___1_mn_popup_constructor (GType type G_GNUC_UNUSED, unsigned int n_construct_pr
{
#define __GOB_FUNCTION__ "MN:Popup::constructor"
{
-#line 43 "mn-popup.gob"
+#line 51 "mn-popup.gob"
GObject *object;
Self *self;
@@ -286,10 +308,102 @@ ___1_mn_popup_constructor (GType type G_GNUC_UNUSED, unsigned int n_construct_pr
g_string_free(body, TRUE);
+ self_add_actions(self);
+
+ notify_notification_set_timeout(NOTIFY_NOTIFICATION(self), self_get_conf_timeout());
+
+ g_signal_connect(self, "closed", G_CALLBACK(self_closed_h), NULL);
+
+ return object;
+ }}
+#line 320 "mn-popup.c"
+#undef __GOB_FUNCTION__
+#undef PARENT_HANDLER
+
+#line 88 "mn-popup.gob"
+static ActionDefinition *
+mn_popup_find_action (const char * id)
+#line 327 "mn-popup.c"
+{
+#define __GOB_FUNCTION__ "MN:Popup::find_action"
+#line 88 "mn-popup.gob"
+ g_return_val_if_fail (id != NULL, (ActionDefinition * )0);
+#line 332 "mn-popup.c"
+{
+#line 90 "mn-popup.gob"
+
+ static ActionDefinition action_definitions[] = {
+ { "open", mn_popup_add_open_cb },
+ { "mark-as-read", mn_popup_add_mark_as_read_cb },
+ { "mark-as-spam", mn_popup_add_mark_as_spam_cb },
+ { "delete", mn_popup_add_delete_cb }
+ };
+ int i;
+
+ for (i = 0; i < G_N_ELEMENTS(action_definitions); i++)
+ if (! strcmp(action_definitions[i].id, id))
+ return &action_definitions[i];
+
+ return NULL;
+ }}
+#line 350 "mn-popup.c"
+#undef __GOB_FUNCTION__
+
+#line 106 "mn-popup.gob"
+static void
+mn_popup_add_actions (MNPopup * self)
+#line 356 "mn-popup.c"
+{
+#define __GOB_FUNCTION__ "MN:Popup::add_actions"
+#line 106 "mn-popup.gob"
+ g_return_if_fail (self != NULL);
+#line 106 "mn-popup.gob"
+ g_return_if_fail (MN_IS_POPUP (self));
+#line 363 "mn-popup.c"
+{
+#line 108 "mn-popup.gob"
+
+ GSList *actions;
+ GSList *l;
+
/*
* Note that notification-daemon currently assigns icons to
* actions by prepending "stock_" to the action ID.
*/
+
+ actions = eel_gconf_get_string_list(MN_CONF_POPUPS_ACTIONS);
+
+ MN_LIST_FOREACH(l, actions)
+ {
+ char *id = l->data;
+ ActionDefinition *def;
+
+ def = self_find_action(id);
+ if (def)
+ def->add(self);
+ else
+ g_warning(_("configuration key %s: there is no action named `%s'"), MN_CONF_POPUPS_ACTIONS, id);
+ }
+
+ eel_g_slist_free_deep(actions);
+ }}
+#line 391 "mn-popup.c"
+#undef __GOB_FUNCTION__
+
+#line 134 "mn-popup.gob"
+static void
+mn_popup_add_open_cb (MNPopup * self)
+#line 397 "mn-popup.c"
+{
+#define __GOB_FUNCTION__ "MN:Popup::add_open_cb"
+#line 134 "mn-popup.gob"
+ g_return_if_fail (self != NULL);
+#line 134 "mn-popup.gob"
+ g_return_if_fail (MN_IS_POPUP (self));
+#line 404 "mn-popup.c"
+{
+#line 136 "mn-popup.gob"
+
if (mn_message_can_open(selfp->message))
notify_notification_add_action(NOTIFY_NOTIFICATION(self),
"mail-open",
@@ -298,6 +412,24 @@ ___1_mn_popup_constructor (GType type G_GNUC_UNUSED, unsigned int n_construct_pr
self_open_cb,
NULL,
NULL);
+ }}
+#line 417 "mn-popup.c"
+#undef __GOB_FUNCTION__
+
+#line 147 "mn-popup.gob"
+static void
+mn_popup_add_mark_as_read_cb (MNPopup * self)
+#line 423 "mn-popup.c"
+{
+#define __GOB_FUNCTION__ "MN:Popup::add_mark_as_read_cb"
+#line 147 "mn-popup.gob"
+ g_return_if_fail (self != NULL);
+#line 147 "mn-popup.gob"
+ g_return_if_fail (MN_IS_POPUP (self));
+#line 430 "mn-popup.c"
+{
+#line 149 "mn-popup.gob"
+
if (mn_message_can_mark_as_read(selfp->message))
notify_notification_add_action(NOTIFY_NOTIFICATION(self),
"mark",
@@ -306,6 +438,24 @@ ___1_mn_popup_constructor (GType type G_GNUC_UNUSED, unsigned int n_construct_pr
self_mark_as_read_cb,
NULL,
NULL);
+ }}
+#line 443 "mn-popup.c"
+#undef __GOB_FUNCTION__
+
+#line 160 "mn-popup.gob"
+static void
+mn_popup_add_mark_as_spam_cb (MNPopup * self)
+#line 449 "mn-popup.c"
+{
+#define __GOB_FUNCTION__ "MN:Popup::add_mark_as_spam_cb"
+#line 160 "mn-popup.gob"
+ g_return_if_fail (self != NULL);
+#line 160 "mn-popup.gob"
+ g_return_if_fail (MN_IS_POPUP (self));
+#line 456 "mn-popup.c"
+{
+#line 162 "mn-popup.gob"
+
if (mn_message_can_mark_as_spam(selfp->message))
notify_notification_add_action(NOTIFY_NOTIFICATION(self),
"spam",
@@ -314,25 +464,44 @@ ___1_mn_popup_constructor (GType type G_GNUC_UNUSED, unsigned int n_construct_pr
self_mark_as_spam_cb,
NULL,
NULL);
+ }}
+#line 469 "mn-popup.c"
+#undef __GOB_FUNCTION__
- notify_notification_set_timeout(NOTIFY_NOTIFICATION(self), self_get_conf_timeout());
-
- g_signal_connect(self, "closed", G_CALLBACK(self_closed_h), NULL);
-
- return object;
+#line 173 "mn-popup.gob"
+static void
+mn_popup_add_delete_cb (MNPopup * self)
+#line 475 "mn-popup.c"
+{
+#define __GOB_FUNCTION__ "MN:Popup::add_delete_cb"
+#line 173 "mn-popup.gob"
+ g_return_if_fail (self != NULL);
+#line 173 "mn-popup.gob"
+ g_return_if_fail (MN_IS_POPUP (self));
+#line 482 "mn-popup.c"
+{
+#line 175 "mn-popup.gob"
+
+ if (mn_message_can_delete(selfp->message))
+ notify_notification_add_action(NOTIFY_NOTIFICATION(self),
+ "delete",
+ /* translators: header capitalization */
+ _("Delete"),
+ self_delete_cb,
+ NULL,
+ NULL);
}}
-#line 325 "mn-popup.c"
+#line 495 "mn-popup.c"
#undef __GOB_FUNCTION__
-#undef PARENT_HANDLER
-#line 107 "mn-popup.gob"
+#line 186 "mn-popup.gob"
static void
mn_popup_open_cb (NotifyNotification * notification, char * id, gpointer user_data)
-#line 332 "mn-popup.c"
+#line 501 "mn-popup.c"
{
#define __GOB_FUNCTION__ "MN:Popup::open_cb"
{
-#line 109 "mn-popup.gob"
+#line 188 "mn-popup.gob"
Self *self = SELF(notification);
GError *err = NULL;
@@ -347,17 +516,17 @@ mn_popup_open_cb (NotifyNotification * notification, char * id, gpointer user_da
GDK_THREADS_LEAVE();
}}
-#line 351 "mn-popup.c"
+#line 520 "mn-popup.c"
#undef __GOB_FUNCTION__
-#line 124 "mn-popup.gob"
+#line 203 "mn-popup.gob"
static void
mn_popup_mark_as_read_cb (NotifyNotification * notification, char * id, gpointer user_data)
-#line 357 "mn-popup.c"
+#line 526 "mn-popup.c"
{
#define __GOB_FUNCTION__ "MN:Popup::mark_as_read_cb"
{
-#line 126 "mn-popup.gob"
+#line 205 "mn-popup.gob"
Self *self = SELF(notification);
GError *err = NULL;
@@ -372,17 +541,17 @@ mn_popup_mark_as_read_cb (NotifyNotification * notification, char * id, gpointer
GDK_THREADS_LEAVE();
}}
-#line 376 "mn-popup.c"
+#line 545 "mn-popup.c"
#undef __GOB_FUNCTION__
-#line 141 "mn-popup.gob"
+#line 220 "mn-popup.gob"
static void
mn_popup_mark_as_spam_cb (NotifyNotification * notification, char * id, gpointer user_data)
-#line 382 "mn-popup.c"
+#line 551 "mn-popup.c"
{
#define __GOB_FUNCTION__ "MN:Popup::mark_as_spam_cb"
{
-#line 143 "mn-popup.gob"
+#line 222 "mn-popup.gob"
Self *self = SELF(notification);
GError *err = NULL;
@@ -397,39 +566,64 @@ mn_popup_mark_as_spam_cb (NotifyNotification * notification, char * id, gpointer
GDK_THREADS_LEAVE();
}}
-#line 401 "mn-popup.c"
+#line 570 "mn-popup.c"
+#undef __GOB_FUNCTION__
+
+#line 237 "mn-popup.gob"
+static void
+mn_popup_delete_cb (NotifyNotification * notification, char * id, gpointer user_data)
+#line 576 "mn-popup.c"
+{
+#define __GOB_FUNCTION__ "MN:Popup::delete_cb"
+{
+#line 239 "mn-popup.gob"
+
+ Self *self = SELF(notification);
+ GError *err = NULL;
+
+ GDK_THREADS_ENTER();
+
+ if (! mn_message_delete(selfp->message, &err))
+ {
+ mn_error_dialog(NULL, _("Unable to delete message"), "%s", err->message);
+ g_error_free(err);
+ }
+
+ GDK_THREADS_LEAVE();
+ }}
+#line 595 "mn-popup.c"
#undef __GOB_FUNCTION__
-#line 158 "mn-popup.gob"
+#line 254 "mn-popup.gob"
static void
mn_popup_closed_h (NotifyNotification * notification, gpointer user_data)
-#line 407 "mn-popup.c"
+#line 601 "mn-popup.c"
{
#define __GOB_FUNCTION__ "MN:Popup::closed_h"
{
-#line 160 "mn-popup.gob"
+#line 256 "mn-popup.gob"
Self *self = SELF(notification);
self->visible = FALSE;
}}
-#line 416 "mn-popup.c"
+#line 610 "mn-popup.c"
#undef __GOB_FUNCTION__
-#line 165 "mn-popup.gob"
+#line 261 "mn-popup.gob"
static void
mn_popup_append_row (GString * body, const char * name, const char * value)
-#line 422 "mn-popup.c"
+#line 616 "mn-popup.c"
{
#define __GOB_FUNCTION__ "MN:Popup::append_row"
-#line 165 "mn-popup.gob"
+#line 261 "mn-popup.gob"
g_return_if_fail (body != NULL);
-#line 165 "mn-popup.gob"
+#line 261 "mn-popup.gob"
g_return_if_fail (name != NULL);
-#line 165 "mn-popup.gob"
+#line 261 "mn-popup.gob"
g_return_if_fail (value != NULL);
-#line 431 "mn-popup.c"
+#line 625 "mn-popup.c"
{
-#line 169 "mn-popup.gob"
+#line 265 "mn-popup.gob"
char *escaped;
@@ -442,17 +636,17 @@ mn_popup_append_row (GString * body, const char * name, const char * value)
g_string_append_printf(body, " %s", escaped);
g_free(escaped);
}}
-#line 446 "mn-popup.c"
+#line 640 "mn-popup.c"
#undef __GOB_FUNCTION__
-#line 182 "mn-popup.gob"
+#line 278 "mn-popup.gob"
static int
mn_popup_get_conf_timeout (void)
-#line 452 "mn-popup.c"
+#line 646 "mn-popup.c"
{
#define __GOB_FUNCTION__ "MN:Popup::get_conf_timeout"
{
-#line 184 "mn-popup.gob"
+#line 280 "mn-popup.gob"
switch (mn_conf_get_enum_value(MN_TYPE_EXPIRATION_ENABLED, MN_CONF_POPUPS_EXPIRATION_ENABLED))
{
@@ -471,22 +665,22 @@ mn_popup_get_conf_timeout (void)
return 0;
}
}}
-#line 475 "mn-popup.c"
+#line 669 "mn-popup.c"
#undef __GOB_FUNCTION__
-#line 203 "mn-popup.gob"
+#line 299 "mn-popup.gob"
void
mn_popup_show (MNPopup * self)
-#line 481 "mn-popup.c"
+#line 675 "mn-popup.c"
{
#define __GOB_FUNCTION__ "MN:Popup::show"
-#line 203 "mn-popup.gob"
+#line 299 "mn-popup.gob"
g_return_if_fail (self != NULL);
-#line 203 "mn-popup.gob"
+#line 299 "mn-popup.gob"
g_return_if_fail (MN_IS_POPUP (self));
-#line 488 "mn-popup.c"
+#line 682 "mn-popup.c"
{
-#line 205 "mn-popup.gob"
+#line 301 "mn-popup.gob"
GError *err = NULL;
@@ -498,22 +692,22 @@ mn_popup_show (MNPopup * self)
self->visible = TRUE;
}}
-#line 502 "mn-popup.c"
+#line 696 "mn-popup.c"
#undef __GOB_FUNCTION__
-#line 217 "mn-popup.gob"
+#line 313 "mn-popup.gob"
void
mn_popup_close (MNPopup * self)
-#line 508 "mn-popup.c"
+#line 702 "mn-popup.c"
{
#define __GOB_FUNCTION__ "MN:Popup::close"
-#line 217 "mn-popup.gob"
+#line 313 "mn-popup.gob"
g_return_if_fail (self != NULL);
-#line 217 "mn-popup.gob"
+#line 313 "mn-popup.gob"
g_return_if_fail (MN_IS_POPUP (self));
-#line 515 "mn-popup.c"
+#line 709 "mn-popup.c"
{
-#line 219 "mn-popup.gob"
+#line 315 "mn-popup.gob"
GError *err = NULL;
@@ -526,22 +720,22 @@ mn_popup_close (MNPopup * self)
g_error_free(err);
}
}}
-#line 530 "mn-popup.c"
+#line 724 "mn-popup.c"
#undef __GOB_FUNCTION__
-#line 232 "mn-popup.gob"
+#line 328 "mn-popup.gob"
MNPopup *
mn_popup_new (MNMessage * message)
-#line 536 "mn-popup.c"
+#line 730 "mn-popup.c"
{
#define __GOB_FUNCTION__ "MN:Popup::new"
-#line 232 "mn-popup.gob"
+#line 328 "mn-popup.gob"
g_return_val_if_fail (message != NULL, (MNPopup * )0);
-#line 232 "mn-popup.gob"
+#line 328 "mn-popup.gob"
g_return_val_if_fail (MN_IS_MESSAGE (message), (MNPopup * )0);
-#line 543 "mn-popup.c"
+#line 737 "mn-popup.c"
{
-#line 234 "mn-popup.gob"
+#line 330 "mn-popup.gob"
/* we set the summary here because libnotify requires it */
@@ -550,5 +744,5 @@ mn_popup_new (MNMessage * message)
MN_POPUP_PROP_MESSAGE(message),
NULL);
}}
-#line 554 "mn-popup.c"
+#line 748 "mn-popup.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-popup.gob b/src/mn-popup.gob
@@ -29,6 +29,14 @@ requires 2.0.14
#include <glib/gi18n.h>
#include "mn-conf.h"
#include "mn-shell.h"
+
+typedef void (*ActionAddFunction) (MNPopup *self);
+
+typedef struct
+{
+ const char *id;
+ ActionAddFunction add;
+} ActionDefinition;
%}
class MN:Popup from Notify:Notification
@@ -68,10 +76,64 @@ class MN:Popup from Notify:Notification
g_string_free(body, TRUE);
+ self_add_actions(self);
+
+ notify_notification_set_timeout(NOTIFY_NOTIFICATION(self), self_get_conf_timeout());
+
+ g_signal_connect(self, "closed", G_CALLBACK(self_closed_h), NULL);
+
+ return object;
+ }
+
+ private ActionDefinition *
+ find_action (const char *id (check null))
+ {
+ static ActionDefinition action_definitions[] = {
+ { "open", mn_popup_add_open_cb },
+ { "mark-as-read", mn_popup_add_mark_as_read_cb },
+ { "mark-as-spam", mn_popup_add_mark_as_spam_cb },
+ { "delete", mn_popup_add_delete_cb }
+ };
+ int i;
+
+ for (i = 0; i < G_N_ELEMENTS(action_definitions); i++)
+ if (! strcmp(action_definitions[i].id, id))
+ return &action_definitions[i];
+
+ return NULL;
+ }
+
+ private void
+ add_actions (self)
+ {
+ GSList *actions;
+ GSList *l;
+
/*
* Note that notification-daemon currently assigns icons to
* actions by prepending "stock_" to the action ID.
*/
+
+ actions = eel_gconf_get_string_list(MN_CONF_POPUPS_ACTIONS);
+
+ MN_LIST_FOREACH(l, actions)
+ {
+ char *id = l->data;
+ ActionDefinition *def;
+
+ def = self_find_action(id);
+ if (def)
+ def->add(self);
+ else
+ g_warning(_("configuration key %s: there is no action named `%s'"), MN_CONF_POPUPS_ACTIONS, id);
+ }
+
+ eel_g_slist_free_deep(actions);
+ }
+
+ private void
+ add_open_cb (self)
+ {
if (mn_message_can_open(selfp->message))
notify_notification_add_action(NOTIFY_NOTIFICATION(self),
"mail-open",
@@ -80,6 +142,11 @@ class MN:Popup from Notify:Notification
self_open_cb,
NULL,
NULL);
+ }
+
+ private void
+ add_mark_as_read_cb (self)
+ {
if (mn_message_can_mark_as_read(selfp->message))
notify_notification_add_action(NOTIFY_NOTIFICATION(self),
"mark",
@@ -88,6 +155,11 @@ class MN:Popup from Notify:Notification
self_mark_as_read_cb,
NULL,
NULL);
+ }
+
+ private void
+ add_mark_as_spam_cb (self)
+ {
if (mn_message_can_mark_as_spam(selfp->message))
notify_notification_add_action(NOTIFY_NOTIFICATION(self),
"spam",
@@ -96,12 +168,19 @@ class MN:Popup from Notify:Notification
self_mark_as_spam_cb,
NULL,
NULL);
+ }
- notify_notification_set_timeout(NOTIFY_NOTIFICATION(self), self_get_conf_timeout());
-
- g_signal_connect(self, "closed", G_CALLBACK(self_closed_h), NULL);
-
- return object;
+ private void
+ add_delete_cb (self)
+ {
+ if (mn_message_can_delete(selfp->message))
+ notify_notification_add_action(NOTIFY_NOTIFICATION(self),
+ "delete",
+ /* translators: header capitalization */
+ _("Delete"),
+ self_delete_cb,
+ NULL,
+ NULL);
}
private void
@@ -156,6 +235,23 @@ class MN:Popup from Notify:Notification
}
private void
+ delete_cb (NotifyNotification *notification, char *id, gpointer user_data)
+ {
+ Self *self = SELF(notification);
+ GError *err = NULL;
+
+ GDK_THREADS_ENTER();
+
+ if (! mn_message_delete(selfp->message, &err))
+ {
+ mn_error_dialog(NULL, _("Unable to delete message"), "%s", err->message);
+ g_error_free(err);
+ }
+
+ GDK_THREADS_LEAVE();
+ }
+
+ private void
closed_h (NotifyNotification *notification, gpointer user_data)
{
Self *self = SELF(notification);
diff --git a/src/mn-ssl.c b/src/mn-ssl.c
@@ -20,7 +20,11 @@
#include "config.h"
#include <glib.h>
#include <glib/gi18n.h>
+
+typedef GMutex CRYPTO_dynlock_value;
+
#include <openssl/ssl.h>
+#include <openssl/crypto.h>
#include <openssl/err.h>
#include "mn-ssl.h"
@@ -30,10 +34,83 @@ static gboolean attempted = FALSE;
static SSL_CTX *ctx = NULL;
static char *init_error = NULL;
-G_LOCK_DEFINE_STATIC(init);
+static int num_locks;
+static GMutex **locks;
+
+/* a general purpose global SSL lock */
+G_LOCK_DEFINE(mn_ssl);
+
+/*** functions ***************************************************************/
+
+static void mn_ssl_locking_cb (int mode, int n, const char *file, int line);
+static unsigned long mn_ssl_id_cb (void);
+
+static void mn_ssl_init_threading (void);
/*** implementation **********************************************************/
+static void
+mn_ssl_locking_cb (int mode, int n, const char *file, int line)
+{
+ g_assert(n >= 0 && n < num_locks);
+
+ if ((mode & CRYPTO_LOCK) != 0)
+ g_mutex_lock(locks[n]);
+ else
+ g_mutex_unlock(locks[n]);
+}
+
+static unsigned long
+mn_ssl_id_cb (void)
+{
+ return (unsigned long) g_thread_self();
+}
+
+static struct CRYPTO_dynlock_value *
+mn_ssl_dynlock_create_cb (const char *file, int line)
+{
+ return (struct CRYPTO_dynlock_value *) g_mutex_new();
+}
+
+static void
+mn_ssl_dynlock_locking_cb (int mode,
+ struct CRYPTO_dynlock_value *lock,
+ const char *file,
+ int line)
+{
+ if ((mode & CRYPTO_LOCK) != 0)
+ g_mutex_lock((GMutex *) lock);
+ else
+ g_mutex_unlock((GMutex *) lock);
+}
+
+static void
+mn_ssl_dynlock_destroy_cb (struct CRYPTO_dynlock_value *lock,
+ const char *file,
+ int line)
+{
+ g_mutex_free((GMutex *) lock);
+}
+
+static void
+mn_ssl_init_threading (void)
+{
+ int i;
+
+ num_locks = CRYPTO_num_locks();
+
+ locks = g_new(GMutex *, num_locks);
+ for (i = 0; i < num_locks; i++)
+ locks[i] = g_mutex_new();
+
+ CRYPTO_set_locking_callback(mn_ssl_locking_cb);
+ CRYPTO_set_id_callback(mn_ssl_id_cb);
+
+ CRYPTO_set_dynlock_create_callback(mn_ssl_dynlock_create_cb);
+ CRYPTO_set_dynlock_lock_callback(mn_ssl_dynlock_locking_cb);
+ CRYPTO_set_dynlock_destroy_callback(mn_ssl_dynlock_destroy_cb);
+}
+
SSL_CTX *
mn_ssl_init (GError **err)
{
@@ -42,15 +119,20 @@ mn_ssl_init (GError **err)
* keep the same context for the whole application lifetime.
*/
- G_LOCK(init);
+ G_LOCK(mn_ssl);
if (! attempted)
{
SSL_library_init();
SSL_load_error_strings();
+ mn_ssl_init_threading();
+
ctx = SSL_CTX_new(SSLv23_client_method());
if (ctx)
- SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
+ {
+ SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
+ SSL_CTX_set_default_verify_paths(ctx); /* #19578 */
+ }
else
init_error = g_strdup(mn_ssl_get_error());
@@ -62,7 +144,7 @@ mn_ssl_init (GError **err)
g_assert(init_error != NULL);
g_set_error(err, 0, 0, "%s", init_error);
}
- G_UNLOCK(init);
+ G_UNLOCK(mn_ssl);
return ctx;
}
diff --git a/src/mn-ssl.h b/src/mn-ssl.h
@@ -23,6 +23,8 @@
#include <glib.h>
#include <openssl/ssl.h>
+G_LOCK_EXTERN(mn_ssl);
+
SSL_CTX *mn_ssl_init (GError **err);
const char *mn_ssl_get_error (void);
diff --git a/src/mn-stock.c b/src/mn-stock.c
@@ -29,7 +29,6 @@ static const GtkStockItem items[] = {
/* translators: header capitalization */
{ MN_STOCK_SELECT_ALL, N_("Select _All"), 0, 0, NULL },
/* translators: header capitalization */
- /* translators: header capitalization */
{ MN_STOCK_CONNECT, N_("Co_nnect"), 0, 0, NULL }
};
diff --git a/src/mn-sylpheed-mailbox-backend.c b/src/mn-sylpheed-mailbox-backend.c
@@ -187,7 +187,7 @@ mn_sylpheed_mailbox_backend_class_init (MNSylpheedMailboxBackendClass * class G_
mn_vfs_mailbox_backend_class->is = ___6_mn_sylpheed_mailbox_backend_is;
#line 190 "mn-sylpheed-mailbox-backend.gob"
mn_vfs_mailbox_backend_class->check = ___7_mn_sylpheed_mailbox_backend_check;
-#line 478 "mn-sylpheed-mailbox-backend.gob"
+#line 481 "mn-sylpheed-mailbox-backend.gob"
mn_vfs_mailbox_backend_class->mark_as_read = ___e_mn_sylpheed_mailbox_backend_mark_as_read;
#line 193 "mn-sylpheed-mailbox-backend.c"
{
@@ -430,6 +430,7 @@ ___7_mn_sylpheed_mailbox_backend_check (MNVFSMailboxBackend * backend G_GNUC_UNU
if (! entry || (entry->flags & (SYLPHEED_MSG_NEW | SYLPHEED_MSG_UNREAD)) != 0)
{
MNMessageFlags flags = 0;
+ MNMessage *message;
if (mn_reentrant_mailbox_check_aborted(MN_REENTRANT_MAILBOX(backend->mailbox), check_id))
break;
@@ -442,11 +443,13 @@ ___7_mn_sylpheed_mailbox_backend_check (MNVFSMailboxBackend * backend G_GNUC_UNU
* own way (mark file) of differencing seen/unseen
* messages.
*/
- messages = g_slist_prepend(messages, mn_vfs_message_new(backend,
- backend->mailbox->vfs_uri,
- file_info->name,
- flags,
- FALSE));
+ message = mn_vfs_message_new(backend,
+ backend->mailbox->vfs_uri,
+ file_info->name,
+ flags,
+ FALSE);
+ if (message)
+ messages = g_slist_prepend(messages, message);
}
}
gnome_vfs_file_info_unref(file_info);
@@ -476,25 +479,25 @@ ___7_mn_sylpheed_mailbox_backend_check (MNVFSMailboxBackend * backend G_GNUC_UNU
end:
self_marks_free(marks);
}}
-#line 480 "mn-sylpheed-mailbox-backend.c"
+#line 483 "mn-sylpheed-mailbox-backend.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 292 "mn-sylpheed-mailbox-backend.gob"
+#line 295 "mn-sylpheed-mailbox-backend.gob"
static gboolean
mn_sylpheed_mailbox_backend_read_local_mark_file (const char * filename, gsize * size, char ** contents, GError ** err)
-#line 487 "mn-sylpheed-mailbox-backend.c"
+#line 490 "mn-sylpheed-mailbox-backend.c"
{
#define __GOB_FUNCTION__ "MN:Sylpheed:Mailbox:Backend::read_local_mark_file"
-#line 292 "mn-sylpheed-mailbox-backend.gob"
+#line 295 "mn-sylpheed-mailbox-backend.gob"
g_return_val_if_fail (filename != NULL, (gboolean )0);
-#line 292 "mn-sylpheed-mailbox-backend.gob"
+#line 295 "mn-sylpheed-mailbox-backend.gob"
g_return_val_if_fail (size != NULL, (gboolean )0);
-#line 292 "mn-sylpheed-mailbox-backend.gob"
+#line 295 "mn-sylpheed-mailbox-backend.gob"
g_return_val_if_fail (contents != NULL, (gboolean )0);
-#line 496 "mn-sylpheed-mailbox-backend.c"
+#line 499 "mn-sylpheed-mailbox-backend.c"
{
-#line 297 "mn-sylpheed-mailbox-backend.gob"
+#line 300 "mn-sylpheed-mailbox-backend.gob"
int fd;
struct flock lock;
@@ -542,24 +545,24 @@ mn_sylpheed_mailbox_backend_read_local_mark_file (const char * filename, gsize *
return status;
}}
-#line 546 "mn-sylpheed-mailbox-backend.c"
+#line 549 "mn-sylpheed-mailbox-backend.c"
#undef __GOB_FUNCTION__
-#line 345 "mn-sylpheed-mailbox-backend.gob"
+#line 348 "mn-sylpheed-mailbox-backend.gob"
static gboolean
mn_sylpheed_mailbox_backend_read_remote_mark_file (GnomeVFSURI * uri, gsize * size, char ** contents, GError ** err)
-#line 552 "mn-sylpheed-mailbox-backend.c"
+#line 555 "mn-sylpheed-mailbox-backend.c"
{
#define __GOB_FUNCTION__ "MN:Sylpheed:Mailbox:Backend::read_remote_mark_file"
-#line 345 "mn-sylpheed-mailbox-backend.gob"
+#line 348 "mn-sylpheed-mailbox-backend.gob"
g_return_val_if_fail (uri != NULL, (gboolean )0);
-#line 345 "mn-sylpheed-mailbox-backend.gob"
+#line 348 "mn-sylpheed-mailbox-backend.gob"
g_return_val_if_fail (size != NULL, (gboolean )0);
-#line 345 "mn-sylpheed-mailbox-backend.gob"
+#line 348 "mn-sylpheed-mailbox-backend.gob"
g_return_val_if_fail (contents != NULL, (gboolean )0);
-#line 561 "mn-sylpheed-mailbox-backend.c"
+#line 564 "mn-sylpheed-mailbox-backend.c"
{
-#line 350 "mn-sylpheed-mailbox-backend.gob"
+#line 353 "mn-sylpheed-mailbox-backend.gob"
GnomeVFSResult result;
int _size;
@@ -576,24 +579,24 @@ mn_sylpheed_mailbox_backend_read_remote_mark_file (GnomeVFSURI * uri, gsize * si
return FALSE;
}
}}
-#line 580 "mn-sylpheed-mailbox-backend.c"
+#line 583 "mn-sylpheed-mailbox-backend.c"
#undef __GOB_FUNCTION__
-#line 367 "mn-sylpheed-mailbox-backend.gob"
+#line 370 "mn-sylpheed-mailbox-backend.gob"
static gboolean
mn_sylpheed_mailbox_backend_read_mark_file (GnomeVFSURI * mailbox_uri, gsize * size, char ** contents, GError ** err)
-#line 586 "mn-sylpheed-mailbox-backend.c"
+#line 589 "mn-sylpheed-mailbox-backend.c"
{
#define __GOB_FUNCTION__ "MN:Sylpheed:Mailbox:Backend::read_mark_file"
-#line 367 "mn-sylpheed-mailbox-backend.gob"
+#line 370 "mn-sylpheed-mailbox-backend.gob"
g_return_val_if_fail (mailbox_uri != NULL, (gboolean )0);
-#line 367 "mn-sylpheed-mailbox-backend.gob"
+#line 370 "mn-sylpheed-mailbox-backend.gob"
g_return_val_if_fail (size != NULL, (gboolean )0);
-#line 367 "mn-sylpheed-mailbox-backend.gob"
+#line 370 "mn-sylpheed-mailbox-backend.gob"
g_return_val_if_fail (contents != NULL, (gboolean )0);
-#line 595 "mn-sylpheed-mailbox-backend.c"
+#line 598 "mn-sylpheed-mailbox-backend.c"
{
-#line 372 "mn-sylpheed-mailbox-backend.gob"
+#line 375 "mn-sylpheed-mailbox-backend.gob"
GnomeVFSURI *markfile_uri;
char *filename;
@@ -614,20 +617,20 @@ mn_sylpheed_mailbox_backend_read_mark_file (GnomeVFSURI * mailbox_uri, gsize * s
return status;
}}
-#line 618 "mn-sylpheed-mailbox-backend.c"
+#line 621 "mn-sylpheed-mailbox-backend.c"
#undef __GOB_FUNCTION__
-#line 393 "mn-sylpheed-mailbox-backend.gob"
+#line 396 "mn-sylpheed-mailbox-backend.gob"
static Marks *
mn_sylpheed_mailbox_backend_marks_new (GnomeVFSURI * mailbox_uri, GError ** err)
-#line 624 "mn-sylpheed-mailbox-backend.c"
+#line 627 "mn-sylpheed-mailbox-backend.c"
{
#define __GOB_FUNCTION__ "MN:Sylpheed:Mailbox:Backend::marks_new"
-#line 393 "mn-sylpheed-mailbox-backend.gob"
+#line 396 "mn-sylpheed-mailbox-backend.gob"
g_return_val_if_fail (mailbox_uri != NULL, (Marks * )0);
-#line 629 "mn-sylpheed-mailbox-backend.c"
+#line 632 "mn-sylpheed-mailbox-backend.c"
{
-#line 395 "mn-sylpheed-mailbox-backend.gob"
+#line 398 "mn-sylpheed-mailbox-backend.gob"
Marks *marks = NULL;
gsize bytes_left;
@@ -680,22 +683,22 @@ mn_sylpheed_mailbox_backend_marks_new (GnomeVFSURI * mailbox_uri, GError ** err)
return marks;
}}
-#line 684 "mn-sylpheed-mailbox-backend.c"
+#line 687 "mn-sylpheed-mailbox-backend.c"
#undef __GOB_FUNCTION__
-#line 448 "mn-sylpheed-mailbox-backend.gob"
+#line 451 "mn-sylpheed-mailbox-backend.gob"
static gboolean
mn_sylpheed_mailbox_backend_marks_write (GnomeVFSURI * mailbox_uri, Marks * marks, GError ** err)
-#line 690 "mn-sylpheed-mailbox-backend.c"
+#line 693 "mn-sylpheed-mailbox-backend.c"
{
#define __GOB_FUNCTION__ "MN:Sylpheed:Mailbox:Backend::marks_write"
-#line 448 "mn-sylpheed-mailbox-backend.gob"
+#line 451 "mn-sylpheed-mailbox-backend.gob"
g_return_val_if_fail (mailbox_uri != NULL, (gboolean )0);
-#line 448 "mn-sylpheed-mailbox-backend.gob"
+#line 451 "mn-sylpheed-mailbox-backend.gob"
g_return_val_if_fail (marks != NULL, (gboolean )0);
-#line 697 "mn-sylpheed-mailbox-backend.c"
+#line 700 "mn-sylpheed-mailbox-backend.c"
{
-#line 452 "mn-sylpheed-mailbox-backend.gob"
+#line 455 "mn-sylpheed-mailbox-backend.gob"
GnomeVFSURI *markfile_uri;
gboolean status;
@@ -713,32 +716,32 @@ mn_sylpheed_mailbox_backend_marks_write (GnomeVFSURI * mailbox_uri, Marks * mark
return status;
}}
-#line 717 "mn-sylpheed-mailbox-backend.c"
+#line 720 "mn-sylpheed-mailbox-backend.c"
#undef __GOB_FUNCTION__
-#line 470 "mn-sylpheed-mailbox-backend.gob"
+#line 473 "mn-sylpheed-mailbox-backend.gob"
static void
mn_sylpheed_mailbox_backend_marks_free (Marks * marks)
-#line 723 "mn-sylpheed-mailbox-backend.c"
+#line 726 "mn-sylpheed-mailbox-backend.c"
{
#define __GOB_FUNCTION__ "MN:Sylpheed:Mailbox:Backend::marks_free"
-#line 470 "mn-sylpheed-mailbox-backend.gob"
+#line 473 "mn-sylpheed-mailbox-backend.gob"
g_return_if_fail (marks != NULL);
-#line 728 "mn-sylpheed-mailbox-backend.c"
+#line 731 "mn-sylpheed-mailbox-backend.c"
{
-#line 472 "mn-sylpheed-mailbox-backend.gob"
+#line 475 "mn-sylpheed-mailbox-backend.gob"
g_free(marks->data);
g_hash_table_destroy(marks->table);
g_free(marks);
}}
-#line 736 "mn-sylpheed-mailbox-backend.c"
+#line 739 "mn-sylpheed-mailbox-backend.c"
#undef __GOB_FUNCTION__
-#line 478 "mn-sylpheed-mailbox-backend.gob"
+#line 481 "mn-sylpheed-mailbox-backend.gob"
static gboolean
___e_mn_sylpheed_mailbox_backend_mark_as_read (MNVFSMailboxBackend * dummy G_GNUC_UNUSED, MNVFSMessage * message, GError ** err)
-#line 742 "mn-sylpheed-mailbox-backend.c"
+#line 745 "mn-sylpheed-mailbox-backend.c"
#define PARENT_HANDLER(___dummy,___message,___err) \
((MN_VFS_MAILBOX_BACKEND_CLASS(parent_class)->mark_as_read)? \
(* MN_VFS_MAILBOX_BACKEND_CLASS(parent_class)->mark_as_read)(___dummy,___message,___err): \
@@ -746,7 +749,7 @@ ___e_mn_sylpheed_mailbox_backend_mark_as_read (MNVFSMailboxBackend * dummy G_GNU
{
#define __GOB_FUNCTION__ "MN:Sylpheed:Mailbox:Backend::mark_as_read"
{
-#line 482 "mn-sylpheed-mailbox-backend.gob"
+#line 485 "mn-sylpheed-mailbox-backend.gob"
char *filename;
int num;
@@ -785,6 +788,6 @@ ___e_mn_sylpheed_mailbox_backend_mark_as_read (MNVFSMailboxBackend * dummy G_GNU
return status;
}}
-#line 789 "mn-sylpheed-mailbox-backend.c"
+#line 792 "mn-sylpheed-mailbox-backend.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
diff --git a/src/mn-sylpheed-mailbox-backend.gob b/src/mn-sylpheed-mailbox-backend.gob
@@ -242,6 +242,7 @@ class MN:Sylpheed:Mailbox:Backend from MN:VFS:Mailbox:Backend
if (! entry || (entry->flags & (SYLPHEED_MSG_NEW | SYLPHEED_MSG_UNREAD)) != 0)
{
MNMessageFlags flags = 0;
+ MNMessage *message;
if (mn_reentrant_mailbox_check_aborted(MN_REENTRANT_MAILBOX(backend->mailbox), check_id))
break;
@@ -254,11 +255,13 @@ class MN:Sylpheed:Mailbox:Backend from MN:VFS:Mailbox:Backend
* own way (mark file) of differencing seen/unseen
* messages.
*/
- messages = g_slist_prepend(messages, mn_vfs_message_new(backend,
- backend->mailbox->vfs_uri,
- file_info->name,
- flags,
- FALSE));
+ message = mn_vfs_message_new(backend,
+ backend->mailbox->vfs_uri,
+ file_info->name,
+ flags,
+ FALSE);
+ if (message)
+ messages = g_slist_prepend(messages, message);
}
}
gnome_vfs_file_info_unref(file_info);
diff --git a/src/mn-text-table.c b/src/mn-text-table.c
@@ -59,8 +59,9 @@ static void mn_text_table_class_init (MNTextTableClass * c) G_GNUC_UNUSED;
static void mn_text_table_init (MNTextTable * self) G_GNUC_UNUSED;
static void mn_text_table_row_free (Row * row) G_GNUC_UNUSED;
static void mn_text_table_cell_free (MNTextTableCell * cell) G_GNUC_UNUSED;
-static gboolean ___4_mn_text_table_expose_event (GtkWidget * widget, GdkEventExpose * event) G_GNUC_UNUSED;
-static void ___5_mn_text_table_size_request (GtkWidget * widget, GtkRequisition * requisition) G_GNUC_UNUSED;
+static void ___4_mn_text_table_realize (GtkWidget * widget) G_GNUC_UNUSED;
+static gboolean ___5_mn_text_table_expose_event (GtkWidget * widget, GdkEventExpose * event) G_GNUC_UNUSED;
+static void ___6_mn_text_table_size_request (GtkWidget * widget, GtkRequisition * requisition) G_GNUC_UNUSED;
static void mn_text_table_set_dirty (MNTextTable * self) G_GNUC_UNUSED;
static void mn_text_table_context_changed (MNTextTable * self) G_GNUC_UNUSED;
static void mn_text_table_relayout (MNTextTable * self) G_GNUC_UNUSED;
@@ -142,7 +143,7 @@ ___finalize(GObject *obj_self)
{
#line 80 "mn-text-table.gob"
mn_g_queue_free_deep_custom(VAR, (GFunc) self_row_free, NULL); }
-#line 146 "mn-text-table.c"
+#line 147 "mn-text-table.c"
memset(&rows, 0, sizeof(rows));
#undef VAR
#undef rows
@@ -151,7 +152,7 @@ ___finalize(GObject *obj_self)
{
#line 83 "mn-text-table.gob"
g_array_free(VAR, TRUE); }
-#line 155 "mn-text-table.c"
+#line 156 "mn-text-table.c"
memset(&column_sizes, 0, sizeof(column_sizes));
#undef VAR
#undef column_sizes
@@ -170,31 +171,33 @@ mn_text_table_class_init (MNTextTableClass * c G_GNUC_UNUSED)
parent_class = g_type_class_ref (GTK_TYPE_DRAWING_AREA);
#line 117 "mn-text-table.gob"
- gtk_widget_class->expose_event = ___4_mn_text_table_expose_event;
-#line 128 "mn-text-table.gob"
- gtk_widget_class->size_request = ___5_mn_text_table_size_request;
-#line 271 "mn-text-table.gob"
+ gtk_widget_class->realize = ___4_mn_text_table_realize;
+#line 126 "mn-text-table.gob"
+ gtk_widget_class->expose_event = ___5_mn_text_table_expose_event;
+#line 137 "mn-text-table.gob"
+ gtk_widget_class->size_request = ___6_mn_text_table_size_request;
+#line 280 "mn-text-table.gob"
c->clear = ___real_mn_text_table_clear;
-#line 179 "mn-text-table.c"
+#line 182 "mn-text-table.c"
g_object_class->finalize = ___finalize;
}
#undef __GOB_FUNCTION__
#line 91 "mn-text-table.gob"
static void
mn_text_table_init (MNTextTable * self G_GNUC_UNUSED)
-#line 186 "mn-text-table.c"
+#line 189 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::init"
self->_priv = G_TYPE_INSTANCE_GET_PRIVATE(self,MN_TYPE_TEXT_TABLE,MNTextTablePrivate);
#line 79 "mn-text-table.gob"
self->_priv->rows = g_queue_new();
-#line 192 "mn-text-table.c"
+#line 195 "mn-text-table.c"
#line 82 "mn-text-table.gob"
self->_priv->column_sizes = g_array_new(FALSE, TRUE, sizeof(int));
-#line 195 "mn-text-table.c"
+#line 198 "mn-text-table.c"
#line 83 "mn-text-table.gob"
self->_priv->dirty = TRUE;
-#line 198 "mn-text-table.c"
+#line 201 "mn-text-table.c"
{
#line 92 "mn-text-table.gob"
@@ -206,7 +209,7 @@ mn_text_table_init (MNTextTable * self G_GNUC_UNUSED)
"swapped-signal::direction-changed", self_context_changed, self,
NULL);
-#line 210 "mn-text-table.c"
+#line 213 "mn-text-table.c"
}
}
#undef __GOB_FUNCTION__
@@ -216,30 +219,30 @@ mn_text_table_init (MNTextTable * self G_GNUC_UNUSED)
#line 102 "mn-text-table.gob"
static void
mn_text_table_row_free (Row * row)
-#line 220 "mn-text-table.c"
+#line 223 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::row_free"
#line 102 "mn-text-table.gob"
g_return_if_fail (row != NULL);
-#line 225 "mn-text-table.c"
+#line 228 "mn-text-table.c"
{
#line 104 "mn-text-table.gob"
mn_g_queue_free_deep_custom(row->cells, (GFunc) self_cell_free, NULL);
g_free(row);
}}
-#line 232 "mn-text-table.c"
+#line 235 "mn-text-table.c"
#undef __GOB_FUNCTION__
#line 109 "mn-text-table.gob"
static void
mn_text_table_cell_free (MNTextTableCell * cell)
-#line 238 "mn-text-table.c"
+#line 241 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::cell_free"
#line 109 "mn-text-table.gob"
g_return_if_fail (cell != NULL);
-#line 243 "mn-text-table.c"
+#line 246 "mn-text-table.c"
{
#line 111 "mn-text-table.gob"
@@ -247,13 +250,34 @@ mn_text_table_cell_free (MNTextTableCell * cell)
g_object_unref(cell->layout);
g_free(cell);
}}
-#line 251 "mn-text-table.c"
+#line 254 "mn-text-table.c"
#undef __GOB_FUNCTION__
#line 117 "mn-text-table.gob"
+static void
+___4_mn_text_table_realize (GtkWidget * widget G_GNUC_UNUSED)
+#line 260 "mn-text-table.c"
+#define PARENT_HANDLER(___widget) \
+ { if(GTK_WIDGET_CLASS(parent_class)->realize) \
+ (* GTK_WIDGET_CLASS(parent_class)->realize)(___widget); }
+{
+#define __GOB_FUNCTION__ "MN:Text:Table::realize"
+{
+#line 119 "mn-text-table.gob"
+
+ PARENT_HANDLER(widget);
+
+ /* set a transparent background */
+ gdk_window_set_back_pixmap(widget->window, NULL, TRUE);
+ }}
+#line 274 "mn-text-table.c"
+#undef __GOB_FUNCTION__
+#undef PARENT_HANDLER
+
+#line 126 "mn-text-table.gob"
static gboolean
-___4_mn_text_table_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpose * event)
-#line 257 "mn-text-table.c"
+___5_mn_text_table_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpose * event)
+#line 281 "mn-text-table.c"
#define PARENT_HANDLER(___widget,___event) \
((GTK_WIDGET_CLASS(parent_class)->expose_event)? \
(* GTK_WIDGET_CLASS(parent_class)->expose_event)(___widget,___event): \
@@ -261,7 +285,7 @@ ___4_mn_text_table_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpos
{
#define __GOB_FUNCTION__ "MN:Text:Table::expose_event"
{
-#line 119 "mn-text-table.gob"
+#line 128 "mn-text-table.gob"
Self *self = SELF(widget);
@@ -270,21 +294,21 @@ ___4_mn_text_table_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpos
return FALSE; /* propagate event */
}}
-#line 274 "mn-text-table.c"
+#line 298 "mn-text-table.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 128 "mn-text-table.gob"
+#line 137 "mn-text-table.gob"
static void
-___5_mn_text_table_size_request (GtkWidget * widget G_GNUC_UNUSED, GtkRequisition * requisition)
-#line 281 "mn-text-table.c"
+___6_mn_text_table_size_request (GtkWidget * widget G_GNUC_UNUSED, GtkRequisition * requisition)
+#line 305 "mn-text-table.c"
#define PARENT_HANDLER(___widget,___requisition) \
{ if(GTK_WIDGET_CLASS(parent_class)->size_request) \
(* GTK_WIDGET_CLASS(parent_class)->size_request)(___widget,___requisition); }
{
#define __GOB_FUNCTION__ "MN:Text:Table::size_request"
{
-#line 130 "mn-text-table.gob"
+#line 139 "mn-text-table.gob"
Self *self = SELF(widget);
@@ -293,23 +317,23 @@ ___5_mn_text_table_size_request (GtkWidget * widget G_GNUC_UNUSED, GtkRequisitio
requisition->width = selfp->width;
requisition->height = selfp->height;
}}
-#line 297 "mn-text-table.c"
+#line 321 "mn-text-table.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 139 "mn-text-table.gob"
+#line 148 "mn-text-table.gob"
static void
mn_text_table_set_dirty (MNTextTable * self)
-#line 304 "mn-text-table.c"
+#line 328 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::set_dirty"
-#line 139 "mn-text-table.gob"
+#line 148 "mn-text-table.gob"
g_return_if_fail (self != NULL);
-#line 139 "mn-text-table.gob"
+#line 148 "mn-text-table.gob"
g_return_if_fail (MN_IS_TEXT_TABLE (self));
-#line 311 "mn-text-table.c"
+#line 335 "mn-text-table.c"
{
-#line 141 "mn-text-table.gob"
+#line 150 "mn-text-table.gob"
if (! selfp->dirty)
{
@@ -317,22 +341,22 @@ mn_text_table_set_dirty (MNTextTable * self)
gtk_widget_queue_resize(GTK_WIDGET(self));
}
}}
-#line 321 "mn-text-table.c"
+#line 345 "mn-text-table.c"
#undef __GOB_FUNCTION__
-#line 149 "mn-text-table.gob"
+#line 158 "mn-text-table.gob"
static void
mn_text_table_context_changed (MNTextTable * self)
-#line 327 "mn-text-table.c"
+#line 351 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::context_changed"
-#line 149 "mn-text-table.gob"
+#line 158 "mn-text-table.gob"
g_return_if_fail (self != NULL);
-#line 149 "mn-text-table.gob"
+#line 158 "mn-text-table.gob"
g_return_if_fail (MN_IS_TEXT_TABLE (self));
-#line 334 "mn-text-table.c"
+#line 358 "mn-text-table.c"
{
-#line 151 "mn-text-table.gob"
+#line 160 "mn-text-table.gob"
GList *la;
@@ -355,22 +379,22 @@ mn_text_table_context_changed (MNTextTable * self)
self_set_dirty(self);
}}
-#line 359 "mn-text-table.c"
+#line 383 "mn-text-table.c"
#undef __GOB_FUNCTION__
-#line 174 "mn-text-table.gob"
+#line 183 "mn-text-table.gob"
static void
mn_text_table_relayout (MNTextTable * self)
-#line 365 "mn-text-table.c"
+#line 389 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::relayout"
-#line 174 "mn-text-table.gob"
+#line 183 "mn-text-table.gob"
g_return_if_fail (self != NULL);
-#line 174 "mn-text-table.gob"
+#line 183 "mn-text-table.gob"
g_return_if_fail (MN_IS_TEXT_TABLE (self));
-#line 372 "mn-text-table.c"
+#line 396 "mn-text-table.c"
{
-#line 176 "mn-text-table.gob"
+#line 185 "mn-text-table.gob"
int i;
GList *la;
@@ -429,22 +453,22 @@ mn_text_table_relayout (MNTextTable * self)
selfp->dirty = FALSE;
}}
-#line 433 "mn-text-table.c"
+#line 457 "mn-text-table.c"
#undef __GOB_FUNCTION__
-#line 235 "mn-text-table.gob"
+#line 244 "mn-text-table.gob"
static void
mn_text_table_redraw (MNTextTable * self)
-#line 439 "mn-text-table.c"
+#line 463 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::redraw"
-#line 235 "mn-text-table.gob"
+#line 244 "mn-text-table.gob"
g_return_if_fail (self != NULL);
-#line 235 "mn-text-table.gob"
+#line 244 "mn-text-table.gob"
g_return_if_fail (MN_IS_TEXT_TABLE (self));
-#line 446 "mn-text-table.c"
+#line 470 "mn-text-table.c"
{
-#line 237 "mn-text-table.gob"
+#line 246 "mn-text-table.gob"
GtkWidget *widget = GTK_WIDGET(self);
GList *la;
@@ -478,33 +502,33 @@ mn_text_table_redraw (MNTextTable * self)
y += VERTICAL_SPACING;
}
}}
-#line 482 "mn-text-table.c"
+#line 506 "mn-text-table.c"
#undef __GOB_FUNCTION__
-#line 271 "mn-text-table.gob"
+#line 280 "mn-text-table.gob"
void
mn_text_table_clear (MNTextTable * self)
-#line 488 "mn-text-table.c"
+#line 512 "mn-text-table.c"
{
MNTextTableClass *klass;
-#line 271 "mn-text-table.gob"
+#line 280 "mn-text-table.gob"
g_return_if_fail (self != NULL);
-#line 271 "mn-text-table.gob"
+#line 280 "mn-text-table.gob"
g_return_if_fail (MN_IS_TEXT_TABLE (self));
-#line 495 "mn-text-table.c"
+#line 519 "mn-text-table.c"
klass = MN_TEXT_TABLE_GET_CLASS(self);
if(klass->clear)
(*klass->clear)(self);
}
-#line 271 "mn-text-table.gob"
+#line 280 "mn-text-table.gob"
static void
___real_mn_text_table_clear (MNTextTable * self G_GNUC_UNUSED)
-#line 504 "mn-text-table.c"
+#line 528 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::clear"
{
-#line 273 "mn-text-table.gob"
+#line 282 "mn-text-table.gob"
Row *row;
@@ -517,43 +541,43 @@ ___real_mn_text_table_clear (MNTextTable * self G_GNUC_UNUSED)
self_set_dirty(self);
}}
-#line 521 "mn-text-table.c"
+#line 545 "mn-text-table.c"
#undef __GOB_FUNCTION__
-#line 286 "mn-text-table.gob"
+#line 295 "mn-text-table.gob"
MNTextTableCell *
mn_text_table_append_text_cell (MNTextTable * self, const char * text)
-#line 527 "mn-text-table.c"
+#line 551 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::append_text_cell"
-#line 286 "mn-text-table.gob"
+#line 295 "mn-text-table.gob"
g_return_val_if_fail (self != NULL, (MNTextTableCell * )0);
-#line 286 "mn-text-table.gob"
+#line 295 "mn-text-table.gob"
g_return_val_if_fail (MN_IS_TEXT_TABLE (self), (MNTextTableCell * )0);
-#line 534 "mn-text-table.c"
+#line 558 "mn-text-table.c"
{
-#line 288 "mn-text-table.gob"
+#line 297 "mn-text-table.gob"
return self_append_text_cell_from_layout(self, gtk_widget_create_pango_layout(GTK_WIDGET(self), text));
}}
-#line 540 "mn-text-table.c"
+#line 564 "mn-text-table.c"
#undef __GOB_FUNCTION__
-#line 292 "mn-text-table.gob"
+#line 301 "mn-text-table.gob"
MNTextTableCell *
mn_text_table_append_text_cell_from_markup (MNTextTable * self, const char * markup)
-#line 546 "mn-text-table.c"
+#line 570 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::append_text_cell_from_markup"
-#line 292 "mn-text-table.gob"
+#line 301 "mn-text-table.gob"
g_return_val_if_fail (self != NULL, (MNTextTableCell * )0);
-#line 292 "mn-text-table.gob"
+#line 301 "mn-text-table.gob"
g_return_val_if_fail (MN_IS_TEXT_TABLE (self), (MNTextTableCell * )0);
-#line 292 "mn-text-table.gob"
+#line 301 "mn-text-table.gob"
g_return_val_if_fail (markup != NULL, (MNTextTableCell * )0);
-#line 555 "mn-text-table.c"
+#line 579 "mn-text-table.c"
{
-#line 294 "mn-text-table.gob"
+#line 303 "mn-text-table.gob"
PangoLayout *layout;
@@ -562,24 +586,24 @@ mn_text_table_append_text_cell_from_markup (MNTextTable * self, const char * mar
return self_append_text_cell_from_layout(self, layout);
}}
-#line 566 "mn-text-table.c"
+#line 590 "mn-text-table.c"
#undef __GOB_FUNCTION__
-#line 303 "mn-text-table.gob"
+#line 312 "mn-text-table.gob"
MNTextTableCell *
mn_text_table_append_text_cell_from_layout (MNTextTable * self, PangoLayout * layout)
-#line 572 "mn-text-table.c"
+#line 596 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::append_text_cell_from_layout"
-#line 303 "mn-text-table.gob"
+#line 312 "mn-text-table.gob"
g_return_val_if_fail (self != NULL, (MNTextTableCell * )0);
-#line 303 "mn-text-table.gob"
+#line 312 "mn-text-table.gob"
g_return_val_if_fail (MN_IS_TEXT_TABLE (self), (MNTextTableCell * )0);
-#line 303 "mn-text-table.gob"
+#line 312 "mn-text-table.gob"
g_return_val_if_fail (layout != NULL, (MNTextTableCell * )0);
-#line 581 "mn-text-table.c"
+#line 605 "mn-text-table.c"
{
-#line 305 "mn-text-table.gob"
+#line 314 "mn-text-table.gob"
MNTextTableCell *cell;
@@ -591,22 +615,22 @@ mn_text_table_append_text_cell_from_layout (MNTextTable * self, PangoLayout * la
return cell;
}}
-#line 595 "mn-text-table.c"
+#line 619 "mn-text-table.c"
#undef __GOB_FUNCTION__
-#line 317 "mn-text-table.gob"
+#line 326 "mn-text-table.gob"
MNTextTableCell *
mn_text_table_append_blank_cell (MNTextTable * self, int width, int height)
-#line 601 "mn-text-table.c"
+#line 625 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::append_blank_cell"
-#line 317 "mn-text-table.gob"
+#line 326 "mn-text-table.gob"
g_return_val_if_fail (self != NULL, (MNTextTableCell * )0);
-#line 317 "mn-text-table.gob"
+#line 326 "mn-text-table.gob"
g_return_val_if_fail (MN_IS_TEXT_TABLE (self), (MNTextTableCell * )0);
-#line 608 "mn-text-table.c"
+#line 632 "mn-text-table.c"
{
-#line 319 "mn-text-table.gob"
+#line 328 "mn-text-table.gob"
MNTextTableCell *cell;
@@ -620,22 +644,22 @@ mn_text_table_append_blank_cell (MNTextTable * self, int width, int height)
return cell;
}}
-#line 624 "mn-text-table.c"
+#line 648 "mn-text-table.c"
#undef __GOB_FUNCTION__
-#line 333 "mn-text-table.gob"
+#line 342 "mn-text-table.gob"
static void
mn_text_table_append_cell_real (MNTextTable * self, MNTextTableCell * cell)
-#line 630 "mn-text-table.c"
+#line 654 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::append_cell_real"
-#line 333 "mn-text-table.gob"
+#line 342 "mn-text-table.gob"
g_return_if_fail (self != NULL);
-#line 333 "mn-text-table.gob"
+#line 342 "mn-text-table.gob"
g_return_if_fail (MN_IS_TEXT_TABLE (self));
-#line 637 "mn-text-table.c"
+#line 661 "mn-text-table.c"
{
-#line 335 "mn-text-table.gob"
+#line 344 "mn-text-table.gob"
if (! selfp->row)
{
@@ -649,26 +673,26 @@ mn_text_table_append_cell_real (MNTextTable * self, MNTextTableCell * cell)
self_set_dirty(self);
}}
-#line 653 "mn-text-table.c"
+#line 677 "mn-text-table.c"
#undef __GOB_FUNCTION__
-#line 349 "mn-text-table.gob"
+#line 358 "mn-text-table.gob"
void
mn_text_table_cell_set_text (MNTextTable * self, MNTextTableCell * cell, const char * text)
-#line 659 "mn-text-table.c"
+#line 683 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::cell_set_text"
-#line 349 "mn-text-table.gob"
+#line 358 "mn-text-table.gob"
g_return_if_fail (self != NULL);
-#line 349 "mn-text-table.gob"
+#line 358 "mn-text-table.gob"
g_return_if_fail (MN_IS_TEXT_TABLE (self));
-#line 349 "mn-text-table.gob"
+#line 358 "mn-text-table.gob"
g_return_if_fail (cell != NULL);
-#line 349 "mn-text-table.gob"
+#line 358 "mn-text-table.gob"
g_return_if_fail (text != NULL);
-#line 670 "mn-text-table.c"
+#line 694 "mn-text-table.c"
{
-#line 353 "mn-text-table.gob"
+#line 362 "mn-text-table.gob"
const char *current_text;
@@ -682,24 +706,24 @@ mn_text_table_cell_set_text (MNTextTable * self, MNTextTableCell * cell, const c
self_set_dirty(self);
}
}}
-#line 686 "mn-text-table.c"
+#line 710 "mn-text-table.c"
#undef __GOB_FUNCTION__
-#line 367 "mn-text-table.gob"
+#line 376 "mn-text-table.gob"
void
mn_text_table_line_break (MNTextTable * self)
-#line 692 "mn-text-table.c"
+#line 716 "mn-text-table.c"
{
#define __GOB_FUNCTION__ "MN:Text:Table::line_break"
-#line 367 "mn-text-table.gob"
+#line 376 "mn-text-table.gob"
g_return_if_fail (self != NULL);
-#line 367 "mn-text-table.gob"
+#line 376 "mn-text-table.gob"
g_return_if_fail (MN_IS_TEXT_TABLE (self));
-#line 699 "mn-text-table.c"
+#line 723 "mn-text-table.c"
{
-#line 369 "mn-text-table.gob"
+#line 378 "mn-text-table.gob"
selfp->row = NULL;
}}
-#line 705 "mn-text-table.c"
+#line 729 "mn-text-table.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-text-table.gob b/src/mn-text-table.gob
@@ -114,6 +114,15 @@ class MN:Text:Table from Gtk:Drawing:Area
g_free(cell);
}
+ override (Gtk:Widget) void
+ realize (GtkWidget *widget)
+ {
+ PARENT_HANDLER(widget);
+
+ /* set a transparent background */
+ gdk_window_set_back_pixmap(widget->window, NULL, TRUE);
+ }
+
override (Gtk:Widget) gboolean
expose_event (GtkWidget *widget, GdkEventExpose *event)
{
diff --git a/src/mn-tooltips.c b/src/mn-tooltips.c
@@ -688,20 +688,33 @@ mn_tooltips_draw_tips (MNTooltips * self)
gtk_widget_set_size_request(selfp->window, MIN(w, screen_width), -1);
}
+ /*
+ * The following block ensures that the top of the tooltip is
+ * visible, but it corrupts the tip widget (the mail summary is
+ * not properly positioned). A fix is welcome.
+ */
+/*
+ if (y < 0)
+ {
+ gtk_widget_set_size_request(selfp->window, -1, y + h);
+ y = 0;
+ }
+*/
+
gtk_window_move(GTK_WINDOW(selfp->window), x, y);
gtk_widget_show(selfp->window);
}}
-#line 695 "mn-tooltips.c"
+#line 708 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 412 "mn-tooltips.gob"
+#line 425 "mn-tooltips.gob"
static gboolean
mn_tooltips_timeout_cb (gpointer data)
-#line 701 "mn-tooltips.c"
+#line 714 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::timeout_cb"
{
-#line 414 "mn-tooltips.gob"
+#line 427 "mn-tooltips.gob"
Self *self = SELF(data);
@@ -711,22 +724,22 @@ mn_tooltips_timeout_cb (gpointer data)
selfp->timeout_source = NULL;
return FALSE; /* remove timeout */
}}
-#line 715 "mn-tooltips.c"
+#line 728 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 424 "mn-tooltips.gob"
+#line 437 "mn-tooltips.gob"
static void
mn_tooltips_set_active_widget (MNTooltips * self, GtkWidget * widget)
-#line 721 "mn-tooltips.c"
+#line 734 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::set_active_widget"
-#line 424 "mn-tooltips.gob"
+#line 437 "mn-tooltips.gob"
g_return_if_fail (self != NULL);
-#line 424 "mn-tooltips.gob"
+#line 437 "mn-tooltips.gob"
g_return_if_fail (MN_IS_TOOLTIPS (self));
-#line 728 "mn-tooltips.c"
+#line 741 "mn-tooltips.c"
{
-#line 426 "mn-tooltips.gob"
+#line 439 "mn-tooltips.gob"
if (selfp->window)
{
@@ -757,22 +770,22 @@ mn_tooltips_set_active_widget (MNTooltips * self, GtkWidget * widget)
else
selfp->use_sticky_delay = FALSE;
}}
-#line 761 "mn-tooltips.c"
+#line 774 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 457 "mn-tooltips.gob"
+#line 470 "mn-tooltips.gob"
static void
mn_tooltips_show_tip (GtkWidget * widget)
-#line 767 "mn-tooltips.c"
+#line 780 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::show_tip"
-#line 457 "mn-tooltips.gob"
+#line 470 "mn-tooltips.gob"
g_return_if_fail (widget != NULL);
-#line 457 "mn-tooltips.gob"
+#line 470 "mn-tooltips.gob"
g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 774 "mn-tooltips.c"
+#line 787 "mn-tooltips.c"
{
-#line 459 "mn-tooltips.gob"
+#line 472 "mn-tooltips.gob"
TooltipsData *data;
@@ -786,22 +799,22 @@ mn_tooltips_show_tip (GtkWidget * widget)
self_draw_tips(data->self);
}
}}
-#line 790 "mn-tooltips.c"
+#line 803 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 473 "mn-tooltips.gob"
+#line 486 "mn-tooltips.gob"
static void
mn_tooltips_hide_tip (GtkWidget * widget)
-#line 796 "mn-tooltips.c"
+#line 809 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::hide_tip"
-#line 473 "mn-tooltips.gob"
+#line 486 "mn-tooltips.gob"
g_return_if_fail (widget != NULL);
-#line 473 "mn-tooltips.gob"
+#line 486 "mn-tooltips.gob"
g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 803 "mn-tooltips.c"
+#line 816 "mn-tooltips.c"
{
-#line 475 "mn-tooltips.gob"
+#line 488 "mn-tooltips.gob"
TooltipsData *data;
@@ -812,22 +825,22 @@ mn_tooltips_hide_tip (GtkWidget * widget)
data->self->_priv->active_data->widget == widget))
self_set_active_widget(data->self, NULL);
}}
-#line 816 "mn-tooltips.c"
+#line 829 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 486 "mn-tooltips.gob"
+#line 499 "mn-tooltips.gob"
static gboolean
mn_tooltips_recently_shown (MNTooltips * self)
-#line 822 "mn-tooltips.c"
+#line 835 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::recently_shown"
-#line 486 "mn-tooltips.gob"
+#line 499 "mn-tooltips.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 486 "mn-tooltips.gob"
+#line 499 "mn-tooltips.gob"
g_return_val_if_fail (MN_IS_TOOLTIPS (self), (gboolean )0);
-#line 829 "mn-tooltips.c"
+#line 842 "mn-tooltips.c"
{
-#line 488 "mn-tooltips.gob"
+#line 501 "mn-tooltips.gob"
GTimeVal now;
glong msec;
@@ -837,22 +850,22 @@ mn_tooltips_recently_shown (MNTooltips * self)
(now.tv_usec - selfp->last_popdown.tv_usec) / 1000;
return (msec < STICKY_REVERT_DELAY);
}}
-#line 841 "mn-tooltips.c"
+#line 854 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 498 "mn-tooltips.gob"
+#line 511 "mn-tooltips.gob"
static gboolean
mn_tooltips_get_keyboard_mode (GtkWidget * widget)
-#line 847 "mn-tooltips.c"
+#line 860 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::get_keyboard_mode"
-#line 498 "mn-tooltips.gob"
+#line 511 "mn-tooltips.gob"
g_return_val_if_fail (widget != NULL, (gboolean )0);
-#line 498 "mn-tooltips.gob"
+#line 511 "mn-tooltips.gob"
g_return_val_if_fail (GTK_IS_WIDGET (widget), (gboolean )0);
-#line 854 "mn-tooltips.c"
+#line 867 "mn-tooltips.c"
{
-#line 500 "mn-tooltips.gob"
+#line 513 "mn-tooltips.gob"
GtkWidget *toplevel = gtk_widget_get_toplevel(widget);
@@ -861,22 +874,22 @@ mn_tooltips_get_keyboard_mode (GtkWidget * widget)
else
return FALSE;
}}
-#line 865 "mn-tooltips.c"
+#line 878 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 509 "mn-tooltips.gob"
+#line 522 "mn-tooltips.gob"
static void
mn_tooltips_start_keyboard_mode (GtkWidget * widget)
-#line 871 "mn-tooltips.c"
+#line 884 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::start_keyboard_mode"
-#line 509 "mn-tooltips.gob"
+#line 522 "mn-tooltips.gob"
g_return_if_fail (widget != NULL);
-#line 509 "mn-tooltips.gob"
+#line 522 "mn-tooltips.gob"
g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 878 "mn-tooltips.c"
+#line 891 "mn-tooltips.c"
{
-#line 511 "mn-tooltips.gob"
+#line 524 "mn-tooltips.gob"
GtkWidget *toplevel = gtk_widget_get_toplevel(widget);
@@ -890,22 +903,22 @@ mn_tooltips_start_keyboard_mode (GtkWidget * widget)
self_show_tip(focus);
}
}}
-#line 894 "mn-tooltips.c"
+#line 907 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 525 "mn-tooltips.gob"
+#line 538 "mn-tooltips.gob"
static void
mn_tooltips_stop_keyboard_mode (GtkWidget * widget)
-#line 900 "mn-tooltips.c"
+#line 913 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::stop_keyboard_mode"
-#line 525 "mn-tooltips.gob"
+#line 538 "mn-tooltips.gob"
g_return_if_fail (widget != NULL);
-#line 525 "mn-tooltips.gob"
+#line 538 "mn-tooltips.gob"
g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 907 "mn-tooltips.c"
+#line 920 "mn-tooltips.c"
{
-#line 527 "mn-tooltips.gob"
+#line 540 "mn-tooltips.gob"
GtkWidget *toplevel = gtk_widget_get_toplevel(widget);
@@ -919,22 +932,22 @@ mn_tooltips_stop_keyboard_mode (GtkWidget * widget)
g_object_set_data(G_OBJECT(toplevel), TOOLTIPS_KEYBOARD_MODE, GINT_TO_POINTER(FALSE));
}
}}
-#line 923 "mn-tooltips.c"
+#line 936 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 541 "mn-tooltips.gob"
+#line 554 "mn-tooltips.gob"
static void
mn_tooltips_start_delay (MNTooltips * self, GtkWidget * widget)
-#line 929 "mn-tooltips.c"
+#line 942 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::start_delay"
-#line 541 "mn-tooltips.gob"
+#line 554 "mn-tooltips.gob"
g_return_if_fail (self != NULL);
-#line 541 "mn-tooltips.gob"
+#line 554 "mn-tooltips.gob"
g_return_if_fail (MN_IS_TOOLTIPS (self));
-#line 936 "mn-tooltips.c"
+#line 949 "mn-tooltips.c"
{
-#line 543 "mn-tooltips.gob"
+#line 556 "mn-tooltips.gob"
TooltipsData *old_data;
@@ -947,17 +960,17 @@ mn_tooltips_start_delay (MNTooltips * self, GtkWidget * widget)
self);
}
}}
-#line 951 "mn-tooltips.c"
+#line 964 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 556 "mn-tooltips.gob"
+#line 569 "mn-tooltips.gob"
static void
mn_tooltips_event_after_h (GtkWidget * widget, GdkEvent * event, gpointer user_data)
-#line 957 "mn-tooltips.c"
+#line 970 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::event_after_h"
{
-#line 558 "mn-tooltips.gob"
+#line 571 "mn-tooltips.gob"
Self *self;
TooltipsData *old_data;
@@ -1040,22 +1053,22 @@ mn_tooltips_event_after_h (GtkWidget * widget, GdkEvent * event, gpointer user_d
}
}
}}
-#line 1044 "mn-tooltips.c"
+#line 1057 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 641 "mn-tooltips.gob"
+#line 654 "mn-tooltips.gob"
static void
mn_tooltips_widget_unmap (GtkWidget * widget, gpointer user_data)
-#line 1050 "mn-tooltips.c"
+#line 1063 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::widget_unmap"
-#line 641 "mn-tooltips.gob"
+#line 654 "mn-tooltips.gob"
g_return_if_fail (widget != NULL);
-#line 641 "mn-tooltips.gob"
+#line 654 "mn-tooltips.gob"
g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 1057 "mn-tooltips.c"
+#line 1070 "mn-tooltips.c"
{
-#line 643 "mn-tooltips.gob"
+#line 656 "mn-tooltips.gob"
TooltipsData *data = user_data;
Self *self = data->self;
@@ -1064,22 +1077,22 @@ mn_tooltips_widget_unmap (GtkWidget * widget, gpointer user_data)
(selfp->active_data->widget == widget))
self_set_active_widget(self, NULL);
}}
-#line 1068 "mn-tooltips.c"
+#line 1081 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 652 "mn-tooltips.gob"
+#line 665 "mn-tooltips.gob"
static void
mn_tooltips_widget_remove (GtkWidget * widget, gpointer user_data)
-#line 1074 "mn-tooltips.c"
+#line 1087 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::widget_remove"
-#line 652 "mn-tooltips.gob"
+#line 665 "mn-tooltips.gob"
g_return_if_fail (widget != NULL);
-#line 652 "mn-tooltips.gob"
+#line 665 "mn-tooltips.gob"
g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 1081 "mn-tooltips.c"
+#line 1094 "mn-tooltips.c"
{
-#line 654 "mn-tooltips.gob"
+#line 667 "mn-tooltips.gob"
TooltipsData *data = user_data;
Self *self = data->self;
@@ -1088,41 +1101,41 @@ mn_tooltips_widget_remove (GtkWidget * widget, gpointer user_data)
selfp->data_list = g_slist_remove(selfp->data_list, data);
self_destroy_data(data);
}}
-#line 1092 "mn-tooltips.c"
+#line 1105 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 663 "mn-tooltips.gob"
+#line 676 "mn-tooltips.gob"
void
mn_tooltips_toggle_keyboard_mode (GtkWidget * widget)
-#line 1098 "mn-tooltips.c"
+#line 1111 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::toggle_keyboard_mode"
-#line 663 "mn-tooltips.gob"
+#line 676 "mn-tooltips.gob"
g_return_if_fail (widget != NULL);
-#line 663 "mn-tooltips.gob"
+#line 676 "mn-tooltips.gob"
g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 1105 "mn-tooltips.c"
+#line 1118 "mn-tooltips.c"
{
-#line 665 "mn-tooltips.gob"
+#line 678 "mn-tooltips.gob"
if (self_get_keyboard_mode(widget))
self_stop_keyboard_mode(widget);
else
self_start_keyboard_mode(widget);
}}
-#line 1114 "mn-tooltips.c"
+#line 1127 "mn-tooltips.c"
#undef __GOB_FUNCTION__
-#line 672 "mn-tooltips.gob"
+#line 685 "mn-tooltips.gob"
MNTooltips *
mn_tooltips_new (void)
-#line 1120 "mn-tooltips.c"
+#line 1133 "mn-tooltips.c"
{
#define __GOB_FUNCTION__ "MN:Tooltips::new"
{
-#line 674 "mn-tooltips.gob"
+#line 687 "mn-tooltips.gob"
return GET_NEW;
}}
-#line 1128 "mn-tooltips.c"
+#line 1141 "mn-tooltips.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-tooltips.gob b/src/mn-tooltips.gob
@@ -405,6 +405,19 @@ class MN:Tooltips from G:Object
gtk_widget_set_size_request(selfp->window, MIN(w, screen_width), -1);
}
+ /*
+ * The following block ensures that the top of the tooltip is
+ * visible, but it corrupts the tip widget (the mail summary is
+ * not properly positioned). A fix is welcome.
+ */
+/*
+ if (y < 0)
+ {
+ gtk_widget_set_size_request(selfp->window, -1, y + h);
+ y = 0;
+ }
+*/
+
gtk_window_move(GTK_WINDOW(selfp->window), x, y);
gtk_widget_show(selfp->window);
}
diff --git a/src/mn-util.c b/src/mn-util.c
@@ -25,6 +25,7 @@
#include <time.h>
#include <errno.h>
#include <gmodule.h>
+#include <glib/gi18n.h>
#include <gnome.h>
#include <glade/glade.h>
#include <eel/eel.h>
@@ -1137,6 +1138,39 @@ mn_utf8_strcasecmp (const char *s1, const char *s2)
return cmp;
}
+gboolean
+mn_utf8_str_case_has_suffix (const char *str, const char *suffix)
+{
+ char *normalized_str;
+ char *normalized_suffix;
+ char *folded_str;
+ char *folded_suffix;
+ int str_len;
+ int suffix_len;
+ gboolean has;
+
+ g_return_val_if_fail(str != NULL, FALSE);
+ g_return_val_if_fail(suffix != NULL, FALSE);
+
+ normalized_str = g_utf8_normalize(str, -1, G_NORMALIZE_ALL);
+ normalized_suffix = g_utf8_normalize(suffix, -1, G_NORMALIZE_ALL);
+ folded_str = g_utf8_casefold(normalized_str, -1);
+ folded_suffix = g_utf8_casefold(normalized_suffix, -1);
+
+ str_len = strlen(folded_str);
+ suffix_len = strlen(folded_suffix);
+
+ has = str_len >= suffix_len
+ && ! strcmp(folded_str + str_len - suffix_len, folded_suffix);
+
+ g_free(normalized_str);
+ g_free(normalized_suffix);
+ g_free(folded_str);
+ g_free(folded_suffix);
+
+ return has;
+}
+
char *
mn_utf8_escape (const char *str)
{
@@ -1291,6 +1325,27 @@ mn_ascii_str_case_has_prefix (const char *str, const char *prefix)
}
char *
+mn_ascii_strcasestr (const char *big, const char *little)
+{
+ char *lower_big;
+ char *lower_little;
+ char *s;
+
+ g_return_val_if_fail(big != NULL, NULL);
+ g_return_val_if_fail(little != NULL, NULL);
+
+ lower_big = g_ascii_strdown(big, -1);
+ lower_little = g_ascii_strdown(little, -1);
+
+ s = strstr(lower_big, lower_little);
+
+ g_free(lower_big);
+ g_free(lower_little);
+
+ return s ? (char *) big + (s - lower_big) : NULL;
+}
+
+char *
mn_format_past_time (time_t past_time, time_t now)
{
time_t diff;
@@ -1301,7 +1356,7 @@ mn_format_past_time (time_t past_time, time_t now)
if (diff >= 0)
{
if (diff < 60)
- return g_strdup_printf(ngettext("%i second ago", "%i seconds ago", diff), diff);
+ return g_strdup_printf(ngettext("%i second ago", "%i seconds ago", (int) diff), (int) diff);
else if (diff < 60 * 60)
{
int minutes = diff / 60;
diff --git a/src/mn-util.h b/src/mn-util.h
@@ -26,14 +26,19 @@
#include <gtk/gtk.h>
#define MN_LIST_FOREACH(var, head) \
-for ((var) = (head); \
- (var); \
- (var) = (var)->next)
+ for ((var) = (head); \
+ (var); \
+ (var) = (var)->next)
#define MN_QUEUE_FOREACH(var, queue) \
-for ((var) = (queue)->head; \
- (var); \
- (var) = (var)->next)
+ for ((var) = (queue)->head; \
+ (var); \
+ (var) = (var)->next)
+
+#define MN_TREE_MODEL_FOREACH(valid, iter, model) \
+ for ((valid) = gtk_tree_model_get_iter_first((model), (iter)); \
+ (valid); \
+ (valid) = gtk_tree_model_iter_next((model), (iter)))
void mn_info (const char *format,
...) G_GNUC_PRINTF(1, 2);
@@ -152,6 +157,8 @@ int mn_utf8_strcmp (const char *s1,
const char *s2);
int mn_utf8_strcasecmp (const char *s1,
const char *s2);
+gboolean mn_utf8_str_case_has_suffix (const char *str,
+ const char *suffix);
char *mn_utf8_escape (const char *str);
int mn_dialog_run_nonmodal (GtkDialog *dialog);
@@ -160,6 +167,8 @@ void mn_source_clear (unsigned int *tag);
gboolean mn_ascii_str_case_has_prefix (const char *str,
const char *prefix);
+char *mn_ascii_strcasestr (const char *big,
+ const char *little);
char *mn_format_past_time (time_t past_time,
time_t now);
diff --git a/src/mn-vfs-mailbox-private.h b/src/mn-vfs-mailbox-private.h
@@ -17,11 +17,11 @@ extern "C" {
#line 19 "mn-vfs-mailbox-private.h"
struct _MNVFSMailboxPrivate {
-#line 80 "mn-vfs-mailbox.gob"
+#line 84 "mn-vfs-mailbox.gob"
GSList * monitors;
-#line 81 "mn-vfs-mailbox.gob"
+#line 85 "mn-vfs-mailbox.gob"
MNVFSMailboxBackend * backend;
-#line 82 "mn-vfs-mailbox.gob"
+#line 86 "mn-vfs-mailbox.gob"
MNLockedGSource * update_poll_source;
#line 27 "mn-vfs-mailbox-private.h"
};
diff --git a/src/mn-vfs-mailbox.c b/src/mn-vfs-mailbox.c
@@ -54,11 +54,15 @@ typedef struct
{
char *uri;
MNVFSMailboxBackend *owner;
+ GnomeVFSMonitorType type;
+ GnomeVFSMonitorCallback callback;
+ gpointer user_data;
+
GnomeVFSResult result;
GnomeVFSMonitorHandle *handle;
} Monitor;
-#line 62 "mn-vfs-mailbox.c"
+#line 66 "mn-vfs-mailbox.c"
/* self casting macros */
#define SELF(x) MN_VFS_MAILBOX(x)
#define SELF_CONST(x) MN_VFS_MAILBOX_CONST(x)
@@ -78,17 +82,19 @@ static void mn_vfs_mailbox_class_init (MNVFSMailboxClass * class) G_GNUC_UNUSED;
static GObject * ___3_mn_vfs_mailbox_constructor (GType type, unsigned int n_construct_properties, GObjectConstructParam * construct_params) G_GNUC_UNUSED;
static void ___4_mn_vfs_mailbox_dispose (GObject * object) G_GNUC_UNUSED;
static void ___5_mn_vfs_mailbox_seal (MNMailbox * mailbox) G_GNUC_UNUSED;
+static Monitor * mn_vfs_mailbox_find_monitor (MNVFSMailbox * self, const char * uri, MNVFSMailboxBackend * owner, GnomeVFSMonitorType type, GnomeVFSMonitorCallback callback, gpointer user_data) G_GNUC_UNUSED;
static void mn_vfs_mailbox_monitor_free (Monitor * monitor) G_GNUC_UNUSED;
static void mn_vfs_mailbox_monitor_cb (GnomeVFSMonitorHandle * handle, const char * monitor_uri, const char * info_uri, GnomeVFSMonitorEventType event_type, gpointer user_data) G_GNUC_UNUSED;
static void mn_vfs_mailbox_queue_update_poll (MNVFSMailbox * self) G_GNUC_UNUSED;
static gboolean mn_vfs_mailbox_update_poll_cb (gpointer data) G_GNUC_UNUSED;
-static void ___c_mn_vfs_mailbox_reentrant_check (MNReentrantMailbox * mailbox, unsigned long check_id) G_GNUC_UNUSED;
+static void ___d_mn_vfs_mailbox_reentrant_check (MNReentrantMailbox * mailbox, unsigned long check_id) G_GNUC_UNUSED;
/* pointer to the class of our parent */
static MNReentrantMailboxClass *parent_class = NULL;
/* Short form macros */
#define self_init_types mn_vfs_mailbox_init_types
+#define self_find_monitor mn_vfs_mailbox_find_monitor
#define self_monitor mn_vfs_mailbox_monitor
#define self_monitor_free mn_vfs_mailbox_monitor_free
#define self_monitor_cb mn_vfs_mailbox_monitor_cb
@@ -143,15 +149,15 @@ ___dispose (GObject *obj_self)
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::dispose"
MNVFSMailbox *self G_GNUC_UNUSED = MN_VFS_MAILBOX (obj_self);
-#line 141 "mn-vfs-mailbox.gob"
+#line 145 "mn-vfs-mailbox.gob"
___4_mn_vfs_mailbox_dispose(obj_self);
-#line 149 "mn-vfs-mailbox.c"
-#line 78 "mn-vfs-mailbox.gob"
+#line 155 "mn-vfs-mailbox.c"
+#line 82 "mn-vfs-mailbox.gob"
if(self->vfs_uri) { gnome_vfs_uri_unref ((gpointer) self->vfs_uri); self->vfs_uri = NULL; }
-#line 152 "mn-vfs-mailbox.c"
-#line 81 "mn-vfs-mailbox.gob"
+#line 158 "mn-vfs-mailbox.c"
+#line 85 "mn-vfs-mailbox.gob"
if(self->_priv->backend) { g_object_unref ((gpointer) self->_priv->backend); self->_priv->backend = NULL; }
-#line 155 "mn-vfs-mailbox.c"
+#line 161 "mn-vfs-mailbox.c"
}
#undef __GOB_FUNCTION__
@@ -164,9 +170,9 @@ ___finalize(GObject *obj_self)
gpointer priv G_GNUC_UNUSED = self->_priv;
if(G_OBJECT_CLASS(parent_class)->finalize) \
(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);
-#line 77 "mn-vfs-mailbox.gob"
+#line 81 "mn-vfs-mailbox.gob"
if(self->uri) { g_free ((gpointer) self->uri); self->uri = NULL; }
-#line 170 "mn-vfs-mailbox.c"
+#line 176 "mn-vfs-mailbox.c"
}
#undef __GOB_FUNCTION__
@@ -177,10 +183,10 @@ mn_vfs_mailbox_init (MNVFSMailbox * o G_GNUC_UNUSED)
o->_priv = G_TYPE_INSTANCE_GET_PRIVATE(o,MN_TYPE_VFS_MAILBOX,MNVFSMailboxPrivate);
}
#undef __GOB_FUNCTION__
-#line 107 "mn-vfs-mailbox.gob"
+#line 111 "mn-vfs-mailbox.gob"
static void
mn_vfs_mailbox_class_init (MNVFSMailboxClass * class G_GNUC_UNUSED)
-#line 184 "mn-vfs-mailbox.c"
+#line 190 "mn-vfs-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::class_init"
GObjectClass *g_object_class G_GNUC_UNUSED = (GObjectClass*) class;
@@ -191,18 +197,18 @@ mn_vfs_mailbox_class_init (MNVFSMailboxClass * class G_GNUC_UNUSED)
parent_class = g_type_class_ref (MN_TYPE_REENTRANT_MAILBOX);
-#line 117 "mn-vfs-mailbox.gob"
+#line 121 "mn-vfs-mailbox.gob"
g_object_class->constructor = ___3_mn_vfs_mailbox_constructor;
-#line 141 "mn-vfs-mailbox.gob"
+#line 145 "mn-vfs-mailbox.gob"
g_object_class->dispose = ___dispose;
-#line 156 "mn-vfs-mailbox.gob"
+#line 160 "mn-vfs-mailbox.gob"
mn_mailbox_class->seal = ___5_mn_vfs_mailbox_seal;
-#line 322 "mn-vfs-mailbox.gob"
- mn_reentrant_mailbox_class->reentrant_check = ___c_mn_vfs_mailbox_reentrant_check;
-#line 203 "mn-vfs-mailbox.c"
+#line 343 "mn-vfs-mailbox.gob"
+ mn_reentrant_mailbox_class->reentrant_check = ___d_mn_vfs_mailbox_reentrant_check;
+#line 209 "mn-vfs-mailbox.c"
g_object_class->finalize = ___finalize;
{
-#line 108 "mn-vfs-mailbox.gob"
+#line 112 "mn-vfs-mailbox.gob"
/*
* Most VFS mailboxes will probably be local files, or remote
@@ -211,20 +217,20 @@ mn_vfs_mailbox_class_init (MNVFSMailboxClass * class G_GNUC_UNUSED)
*/
MN_MAILBOX_CLASS(class)->default_check_delay = 60 * 1;
-#line 215 "mn-vfs-mailbox.c"
+#line 221 "mn-vfs-mailbox.c"
}
}
#undef __GOB_FUNCTION__
-#line 84 "mn-vfs-mailbox.gob"
+#line 88 "mn-vfs-mailbox.gob"
void
mn_vfs_mailbox_init_types (void)
-#line 224 "mn-vfs-mailbox.c"
+#line 230 "mn-vfs-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::init_types"
{
-#line 86 "mn-vfs-mailbox.gob"
+#line 90 "mn-vfs-mailbox.gob"
int i = 0;
@@ -245,14 +251,14 @@ mn_vfs_mailbox_init_types (void)
#endif
mn_vfs_mailbox_backend_types[i] = 0;
}}
-#line 249 "mn-vfs-mailbox.c"
+#line 255 "mn-vfs-mailbox.c"
#undef __GOB_FUNCTION__
-#line 117 "mn-vfs-mailbox.gob"
+#line 121 "mn-vfs-mailbox.gob"
static GObject *
___3_mn_vfs_mailbox_constructor (GType type G_GNUC_UNUSED, unsigned int n_construct_properties, GObjectConstructParam * construct_params)
-#line 256 "mn-vfs-mailbox.c"
+#line 262 "mn-vfs-mailbox.c"
#define PARENT_HANDLER(___type,___n_construct_properties,___construct_params) \
((G_OBJECT_CLASS(parent_class)->constructor)? \
(* G_OBJECT_CLASS(parent_class)->constructor)(___type,___n_construct_properties,___construct_params): \
@@ -260,7 +266,7 @@ ___3_mn_vfs_mailbox_constructor (GType type G_GNUC_UNUSED, unsigned int n_constr
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::constructor"
{
-#line 119 "mn-vfs-mailbox.gob"
+#line 123 "mn-vfs-mailbox.gob"
GObject *object;
Self *self;
@@ -282,21 +288,21 @@ ___3_mn_vfs_mailbox_constructor (GType type G_GNUC_UNUSED, unsigned int n_constr
return object;
}}
-#line 286 "mn-vfs-mailbox.c"
+#line 292 "mn-vfs-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 141 "mn-vfs-mailbox.gob"
+#line 145 "mn-vfs-mailbox.gob"
static void
___4_mn_vfs_mailbox_dispose (GObject * object G_GNUC_UNUSED)
-#line 293 "mn-vfs-mailbox.c"
+#line 299 "mn-vfs-mailbox.c"
#define PARENT_HANDLER(___object) \
{ if(G_OBJECT_CLASS(parent_class)->dispose) \
(* G_OBJECT_CLASS(parent_class)->dispose)(___object); }
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::dispose"
{
-#line 143 "mn-vfs-mailbox.gob"
+#line 147 "mn-vfs-mailbox.gob"
Self *self = SELF(object);
@@ -309,21 +315,21 @@ ___4_mn_vfs_mailbox_dispose (GObject * object G_GNUC_UNUSED)
PARENT_HANDLER(object);
}}
-#line 313 "mn-vfs-mailbox.c"
+#line 319 "mn-vfs-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 156 "mn-vfs-mailbox.gob"
+#line 160 "mn-vfs-mailbox.gob"
static void
___5_mn_vfs_mailbox_seal (MNMailbox * mailbox G_GNUC_UNUSED)
-#line 320 "mn-vfs-mailbox.c"
+#line 326 "mn-vfs-mailbox.c"
#define PARENT_HANDLER(___mailbox) \
{ if(MN_MAILBOX_CLASS(parent_class)->seal) \
(* MN_MAILBOX_CLASS(parent_class)->seal)(___mailbox); }
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::seal"
{
-#line 158 "mn-vfs-mailbox.gob"
+#line 162 "mn-vfs-mailbox.gob"
Self *self = SELF(mailbox);
@@ -350,47 +356,74 @@ ___5_mn_vfs_mailbox_seal (MNMailbox * mailbox G_GNUC_UNUSED)
}
}
}}
-#line 354 "mn-vfs-mailbox.c"
+#line 360 "mn-vfs-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 185 "mn-vfs-mailbox.gob"
+#line 189 "mn-vfs-mailbox.gob"
+static Monitor *
+mn_vfs_mailbox_find_monitor (MNVFSMailbox * self, const char * uri, MNVFSMailboxBackend * owner, GnomeVFSMonitorType type, GnomeVFSMonitorCallback callback, gpointer user_data)
+#line 367 "mn-vfs-mailbox.c"
+{
+#define __GOB_FUNCTION__ "MN:VFS:Mailbox::find_monitor"
+#line 189 "mn-vfs-mailbox.gob"
+ g_return_val_if_fail (self != NULL, (Monitor * )0);
+#line 189 "mn-vfs-mailbox.gob"
+ g_return_val_if_fail (MN_IS_VFS_MAILBOX (self), (Monitor * )0);
+#line 189 "mn-vfs-mailbox.gob"
+ g_return_val_if_fail (uri != NULL, (Monitor * )0);
+#line 376 "mn-vfs-mailbox.c"
+{
+#line 196 "mn-vfs-mailbox.gob"
+
+ GSList *l;
+
+ MN_LIST_FOREACH(l, selfp->monitors)
+ {
+ Monitor *monitor = l->data;
+
+ if (monitor->owner == owner
+ && monitor->type == type
+ && monitor->callback == callback
+ && monitor->user_data == user_data
+ && ! strcmp(monitor->uri, uri))
+ return monitor;
+ }
+
+ return NULL;
+ }}
+#line 396 "mn-vfs-mailbox.c"
+#undef __GOB_FUNCTION__
+
+#line 214 "mn-vfs-mailbox.gob"
void
mn_vfs_mailbox_monitor (MNVFSMailbox * self, const char * uri, MNVFSMailboxBackend * owner, GnomeVFSMonitorType type, GnomeVFSMonitorCallback callback, gpointer user_data)
-#line 361 "mn-vfs-mailbox.c"
+#line 402 "mn-vfs-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::monitor"
-#line 185 "mn-vfs-mailbox.gob"
+#line 214 "mn-vfs-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 185 "mn-vfs-mailbox.gob"
+#line 214 "mn-vfs-mailbox.gob"
g_return_if_fail (MN_IS_VFS_MAILBOX (self));
-#line 185 "mn-vfs-mailbox.gob"
+#line 214 "mn-vfs-mailbox.gob"
g_return_if_fail (uri != NULL);
-#line 370 "mn-vfs-mailbox.c"
+#line 411 "mn-vfs-mailbox.c"
{
-#line 192 "mn-vfs-mailbox.gob"
+#line 221 "mn-vfs-mailbox.gob"
- Monitor *monitor = NULL;
- GSList *l;
+ Monitor *monitor;
g_return_if_fail(owner == NULL || MN_IS_VFS_MAILBOX_BACKEND(owner));
- MN_LIST_FOREACH(l, selfp->monitors)
- {
- Monitor *this_monitor = l->data;
-
- if (this_monitor->owner == owner && ! strcmp(this_monitor->uri, uri))
- {
- monitor = this_monitor;
- break;
- }
- }
-
+ monitor = self_find_monitor(self, uri, owner, type, callback, user_data);
if (! monitor)
{
monitor = g_new0(Monitor, 1);
monitor->uri = g_strdup(uri);
monitor->owner = owner;
+ monitor->type = type;
+ monitor->callback = callback;
+ monitor->user_data = user_data;
monitor->result = -1;
selfp->monitors = g_slist_append(selfp->monitors, monitor);
@@ -411,20 +444,20 @@ mn_vfs_mailbox_monitor (MNVFSMailbox * self, const char * uri, MNVFSMailboxBacke
}
}
}}
-#line 415 "mn-vfs-mailbox.c"
+#line 448 "mn-vfs-mailbox.c"
#undef __GOB_FUNCTION__
-#line 235 "mn-vfs-mailbox.gob"
+#line 256 "mn-vfs-mailbox.gob"
static void
mn_vfs_mailbox_monitor_free (Monitor * monitor)
-#line 421 "mn-vfs-mailbox.c"
+#line 454 "mn-vfs-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::monitor_free"
-#line 235 "mn-vfs-mailbox.gob"
+#line 256 "mn-vfs-mailbox.gob"
g_return_if_fail (monitor != NULL);
-#line 426 "mn-vfs-mailbox.c"
+#line 459 "mn-vfs-mailbox.c"
{
-#line 237 "mn-vfs-mailbox.gob"
+#line 258 "mn-vfs-mailbox.gob"
g_free(monitor->uri);
@@ -433,17 +466,17 @@ mn_vfs_mailbox_monitor_free (Monitor * monitor)
g_free(monitor);
}}
-#line 437 "mn-vfs-mailbox.c"
+#line 470 "mn-vfs-mailbox.c"
#undef __GOB_FUNCTION__
-#line 246 "mn-vfs-mailbox.gob"
+#line 267 "mn-vfs-mailbox.gob"
static void
mn_vfs_mailbox_monitor_cb (GnomeVFSMonitorHandle * handle, const char * monitor_uri, const char * info_uri, GnomeVFSMonitorEventType event_type, gpointer user_data)
-#line 443 "mn-vfs-mailbox.c"
+#line 476 "mn-vfs-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::monitor_cb"
{
-#line 252 "mn-vfs-mailbox.gob"
+#line 273 "mn-vfs-mailbox.gob"
if (event_type == GNOME_VFS_MONITOR_EVENT_CHANGED
|| event_type == GNOME_VFS_MONITOR_EVENT_DELETED
@@ -453,22 +486,22 @@ mn_vfs_mailbox_monitor_cb (GnomeVFSMonitorHandle * handle, const char * monitor_
mn_reentrant_mailbox_queue_check(MN_REENTRANT_MAILBOX(self));
}
}}
-#line 457 "mn-vfs-mailbox.c"
+#line 490 "mn-vfs-mailbox.c"
#undef __GOB_FUNCTION__
-#line 262 "mn-vfs-mailbox.gob"
+#line 283 "mn-vfs-mailbox.gob"
void
mn_vfs_mailbox_remove_monitors_by_owner (MNVFSMailbox * self, MNVFSMailboxBackend * owner)
-#line 463 "mn-vfs-mailbox.c"
+#line 496 "mn-vfs-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::remove_monitors_by_owner"
-#line 262 "mn-vfs-mailbox.gob"
+#line 283 "mn-vfs-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 262 "mn-vfs-mailbox.gob"
+#line 283 "mn-vfs-mailbox.gob"
g_return_if_fail (MN_IS_VFS_MAILBOX (self));
-#line 470 "mn-vfs-mailbox.c"
+#line 503 "mn-vfs-mailbox.c"
{
-#line 264 "mn-vfs-mailbox.gob"
+#line 285 "mn-vfs-mailbox.gob"
GSList *l;
@@ -487,39 +520,39 @@ mn_vfs_mailbox_remove_monitors_by_owner (MNVFSMailbox * self, MNVFSMailboxBacken
}
}
}}
-#line 491 "mn-vfs-mailbox.c"
+#line 524 "mn-vfs-mailbox.c"
#undef __GOB_FUNCTION__
-#line 283 "mn-vfs-mailbox.gob"
+#line 304 "mn-vfs-mailbox.gob"
static void
mn_vfs_mailbox_queue_update_poll (MNVFSMailbox * self)
-#line 497 "mn-vfs-mailbox.c"
+#line 530 "mn-vfs-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::queue_update_poll"
-#line 283 "mn-vfs-mailbox.gob"
+#line 304 "mn-vfs-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 283 "mn-vfs-mailbox.gob"
+#line 304 "mn-vfs-mailbox.gob"
g_return_if_fail (MN_IS_VFS_MAILBOX (self));
-#line 504 "mn-vfs-mailbox.c"
+#line 537 "mn-vfs-mailbox.c"
{
-#line 285 "mn-vfs-mailbox.gob"
+#line 306 "mn-vfs-mailbox.gob"
if (selfp->update_poll_source)
mn_locked_g_source_remove(selfp->update_poll_source);
selfp->update_poll_source = mn_g_idle_add_gdk_locked(self_update_poll_cb, self);
}}
-#line 513 "mn-vfs-mailbox.c"
+#line 546 "mn-vfs-mailbox.c"
#undef __GOB_FUNCTION__
-#line 292 "mn-vfs-mailbox.gob"
+#line 313 "mn-vfs-mailbox.gob"
static gboolean
mn_vfs_mailbox_update_poll_cb (gpointer data)
-#line 519 "mn-vfs-mailbox.c"
+#line 552 "mn-vfs-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::update_poll_cb"
{
-#line 294 "mn-vfs-mailbox.gob"
+#line 315 "mn-vfs-mailbox.gob"
Self *self = data;
gboolean polled = FALSE;
@@ -547,20 +580,20 @@ mn_vfs_mailbox_update_poll_cb (gpointer data)
return FALSE; /* remove source */
}}
-#line 551 "mn-vfs-mailbox.c"
+#line 584 "mn-vfs-mailbox.c"
#undef __GOB_FUNCTION__
-#line 322 "mn-vfs-mailbox.gob"
+#line 343 "mn-vfs-mailbox.gob"
static void
-___c_mn_vfs_mailbox_reentrant_check (MNReentrantMailbox * mailbox G_GNUC_UNUSED, unsigned long check_id)
-#line 557 "mn-vfs-mailbox.c"
+___d_mn_vfs_mailbox_reentrant_check (MNReentrantMailbox * mailbox G_GNUC_UNUSED, unsigned long check_id)
+#line 590 "mn-vfs-mailbox.c"
#define PARENT_HANDLER(___mailbox,___check_id) \
{ if(MN_REENTRANT_MAILBOX_CLASS(parent_class)->reentrant_check) \
(* MN_REENTRANT_MAILBOX_CLASS(parent_class)->reentrant_check)(___mailbox,___check_id); }
{
#define __GOB_FUNCTION__ "MN:VFS:Mailbox::reentrant_check"
{
-#line 324 "mn-vfs-mailbox.gob"
+#line 345 "mn-vfs-mailbox.gob"
Self *self = SELF(mailbox);
MNVFSMailboxBackend *backend;
@@ -570,7 +603,15 @@ ___c_mn_vfs_mailbox_reentrant_check (MNReentrantMailbox * mailbox G_GNUC_UNUSED,
mn_reentrant_mailbox_lock(mailbox);
+ /*
+ * For properly detecting the new mailbox type when the file or
+ * directory changes we need install both a file and a directory
+ * monitor, since depending on the underlying implementation we
+ * might not get file events if the URI is a directory, etc.
+ */
+
self_monitor(self, self->uri, NULL, GNOME_VFS_MONITOR_FILE, self_monitor_cb, self);
+ self_monitor(self, self->uri, NULL, GNOME_VFS_MONITOR_DIRECTORY, self_monitor_cb, self);
backend = selfp->backend;
if (backend)
@@ -678,6 +719,6 @@ ___c_mn_vfs_mailbox_reentrant_check (MNReentrantMailbox * mailbox G_GNUC_UNUSED,
mn_reentrant_mailbox_unlock(mailbox);
}
}}
-#line 682 "mn-vfs-mailbox.c"
+#line 723 "mn-vfs-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
diff --git a/src/mn-vfs-mailbox.gob b/src/mn-vfs-mailbox.gob
@@ -65,6 +65,10 @@ typedef struct
{
char *uri;
MNVFSMailboxBackend *owner;
+ GnomeVFSMonitorType type;
+ GnomeVFSMonitorCallback callback;
+ gpointer user_data;
+
GnomeVFSResult result;
GnomeVFSMonitorHandle *handle;
} Monitor;
@@ -182,6 +186,31 @@ class MN:VFS:Mailbox from MN:Reentrant:Mailbox (abstract)
}
}
+ private Monitor *
+ find_monitor (self,
+ const char *uri (check null),
+ MNVFSMailboxBackend *owner,
+ GnomeVFSMonitorType type,
+ GnomeVFSMonitorCallback callback,
+ gpointer user_data)
+ {
+ GSList *l;
+
+ MN_LIST_FOREACH(l, selfp->monitors)
+ {
+ Monitor *monitor = l->data;
+
+ if (monitor->owner == owner
+ && monitor->type == type
+ && monitor->callback == callback
+ && monitor->user_data == user_data
+ && ! strcmp(monitor->uri, uri))
+ return monitor;
+ }
+
+ return NULL;
+ }
+
protected void
monitor (self,
const char *uri (check null),
@@ -190,27 +219,19 @@ class MN:VFS:Mailbox from MN:Reentrant:Mailbox (abstract)
GnomeVFSMonitorCallback callback,
gpointer user_data)
{
- Monitor *monitor = NULL;
- GSList *l;
+ Monitor *monitor;
g_return_if_fail(owner == NULL || MN_IS_VFS_MAILBOX_BACKEND(owner));
- MN_LIST_FOREACH(l, selfp->monitors)
- {
- Monitor *this_monitor = l->data;
-
- if (this_monitor->owner == owner && ! strcmp(this_monitor->uri, uri))
- {
- monitor = this_monitor;
- break;
- }
- }
-
+ monitor = self_find_monitor(self, uri, owner, type, callback, user_data);
if (! monitor)
{
monitor = g_new0(Monitor, 1);
monitor->uri = g_strdup(uri);
monitor->owner = owner;
+ monitor->type = type;
+ monitor->callback = callback;
+ monitor->user_data = user_data;
monitor->result = -1;
selfp->monitors = g_slist_append(selfp->monitors, monitor);
@@ -330,7 +351,15 @@ class MN:VFS:Mailbox from MN:Reentrant:Mailbox (abstract)
mn_reentrant_mailbox_lock(mailbox);
+ /*
+ * For properly detecting the new mailbox type when the file or
+ * directory changes we need install both a file and a directory
+ * monitor, since depending on the underlying implementation we
+ * might not get file events if the URI is a directory, etc.
+ */
+
self_monitor(self, self->uri, NULL, GNOME_VFS_MONITOR_FILE, self_monitor_cb, self);
+ self_monitor(self, self->uri, NULL, GNOME_VFS_MONITOR_DIRECTORY, self_monitor_cb, self);
backend = selfp->backend;
if (backend)
diff --git a/src/mn-vfs-message.c b/src/mn-vfs-message.c
@@ -161,19 +161,19 @@ ___1_mn_vfs_message_mark_as_read_impl (MNMessage * message G_GNUC_UNUSED, GError
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 55 "mn-vfs-message.gob"
+#line 58 "mn-vfs-message.gob"
MNMessage *
mn_vfs_message_new (gpointer backend, GnomeVFSURI * dir_uri, const char * filename, MNMessageFlags flags, gboolean handle_status)
#line 168 "mn-vfs-message.c"
{
#define __GOB_FUNCTION__ "MN:VFS:Message::new"
-#line 55 "mn-vfs-message.gob"
+#line 58 "mn-vfs-message.gob"
g_return_val_if_fail (dir_uri != NULL, (MNMessage * )0);
-#line 55 "mn-vfs-message.gob"
+#line 58 "mn-vfs-message.gob"
g_return_val_if_fail (filename != NULL, (MNMessage * )0);
#line 175 "mn-vfs-message.c"
{
-#line 61 "mn-vfs-message.gob"
+#line 64 "mn-vfs-message.gob"
GnomeVFSURI *message_uri;
MNMessage *message;
diff --git a/src/mn-vfs-message.gob b/src/mn-vfs-message.gob
@@ -51,7 +51,10 @@ class MN:VFS:Message from MN:Message
return class->mark_as_read(NULL, SELF(message), err);
}
- /* in case of error a MNMessage is returned, not a MNVFSMessage */
+ /*
+ * In case of error a MNMessage is returned, not a MNVFSMessage. A
+ * NULL pointer can also be returned (see mn-message-mime.h).
+ */
public MNMessage *
new (gpointer backend, /* cannot include mn-vfs-mailbox-backend.h */
GnomeVFSURI *dir_uri (check null),
diff --git a/src/org-gnome-mail-notification.eplug.in b/src/org-gnome-mail-notification.eplug.in
@@ -1,23 +0,0 @@
-<e-plugin-list>
- <e-plugin
- id="org.gnome.evolution.mail-notification"
- type="shlib"
- name="Mail Notification"
- location="@PLUGINDIR@/liborg-gnome-mail-notification.so">
-
- <description>Provides Evolution mailbox support for Mail Notification.</description>
- <author name="Jean-Yves Lefort" email="jylefort@brutele.be"/>
-
- <hook class="org.gnome.evolution.mail.events:1.0">
- <event id="folder.changed"
- handle="org_gnome_mail_notification_folder_changed"
- target="folder"/>
- </hook>
-
- <hook class="org.gnome.evolution.mail.events:1.0">
- <event id="message.reading"
- handle="org_gnome_mail_notification_message_reading"
- target="message"/>
- </hook>
- </e-plugin>
-</e-plugin-list>
diff --git a/src/org-jylefort-mail-notification.eplug.in b/src/org-jylefort-mail-notification.eplug.in
@@ -0,0 +1,23 @@
+<e-plugin-list>
+ <e-plugin
+ id="org.jylefort.evolution.mail-notification"
+ type="shlib"
+ name="Jean-Yves Lefort's Mail Notification"
+ location="@PLUGINDIR@/liborg-jylefort-mail-notification.so">
+
+ <description>Provides Evolution mailbox support for Mail Notification.</description>
+ <author name="Jean-Yves Lefort" email="jylefort@brutele.be"/>
+
+ <hook class="org.gnome.evolution.mail.events:1.0">
+ <event id="folder.changed"
+ handle="org_jylefort_mail_notification_folder_changed"
+ target="folder"/>
+ </hook>
+
+ <hook class="org.gnome.evolution.mail.events:1.0">
+ <event id="message.reading"
+ handle="org_jylefort_mail_notification_message_reading"
+ target="message"/>
+ </hook>
+ </e-plugin>
+</e-plugin-list>
diff --git a/sylpheed-locking.diff b/sylpheed-locking.diff
@@ -1,16 +1,16 @@
---- libsylph/procmsg.c.orig Fri Mar 10 03:26:28 2006
-+++ libsylph/procmsg.c Tue May 9 04:16:46 2006
-@@ -23,6 +23,9 @@
- #include <glib/gi18n.h>
+--- libsylph/procmsg.c.orig 2007-01-16 07:00:10.000000000 +0100
++++ libsylph/procmsg.c 2007-06-17 08:44:53.000000000 +0200
+@@ -24,6 +24,9 @@
#include <stdio.h>
#include <stdlib.h>
+ #include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
#include "utils.h"
#include "procmsg.h"
-@@ -759,6 +762,20 @@
+@@ -796,6 +799,20 @@
fclose(fp);
}
@@ -31,39 +31,61 @@
FILE *procmsg_open_data_file(const gchar *file, guint version,
DataOpenMode mode, gchar *buf, size_t buf_size)
{
-@@ -768,8 +785,21 @@
+@@ -805,21 +822,38 @@
g_return_val_if_fail(file != NULL, NULL);
if (mode == DATA_WRITE) {
- if ((fp = g_fopen(file, "wb")) == NULL) {
-- FILE_OP_ERROR(file, "fopen");
+ int fd;
+
+ if ((fd = g_open(file, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR)) < 0) {
-+ FILE_OP_ERROR(file, "open");
-+ return NULL;
-+ }
+ if (errno == EACCES) {
+ change_file_mode_rw(NULL, file);
+- if ((fp = g_fopen(file, "wb")) == NULL) {
+- FILE_OP_ERROR(file, "fopen");
++ if ((fd = g_open(file, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR)) < 0) {
++ FILE_OP_ERROR(file, "open");
+ return NULL;
+ }
+ } else {
+- FILE_OP_ERROR(file, "fopen");
++ FILE_OP_ERROR(file, "open");
+ return NULL;
+ }
+ }
++
+ procmsg_lock_data_file(fd);
++
++ if ((fp = fdopen(fd, "wb")) == NULL) {
++ close(fd);
++ FILE_OP_ERROR(file, "fdopen");
++ return NULL;
++ }
++
+ if (change_file_mode_rw(fp, file) < 0)
+ FILE_OP_ERROR(file, "chmod");
+
+ if (ftruncate(fd, 0) < 0) {
+ close(fd);
+ FILE_OP_ERROR(file, "ftruncate");
+ return NULL;
+ }
-+ if ((fp = fdopen(fd, "wb")) == NULL) {
-+ close(fd);
-+ FILE_OP_ERROR(file, "fdopen");
- return NULL;
++
+ WRITE_CACHE_DATA_INT(version, fp);
+ return fp;
+ }
+@@ -859,11 +893,14 @@
+ change_file_mode_rw(NULL, file);
+ if ((fp = g_fopen(file, "ab")) == NULL) {
+ FILE_OP_ERROR(file, "fopen");
++ return NULL;
+ }
+ } else {
+ FILE_OP_ERROR(file, "fopen");
++ return NULL;
+ }
}
- if (change_file_mode_rw(fp, file) < 0)
-@@ -800,8 +830,10 @@
- if (fp) {
- /* reopen with append mode */
- fclose(fp);
-- if ((fp = g_fopen(file, "ab")) == NULL)
-+ if ((fp = g_fopen(file, "ab")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
-+ } else
-+ procmsg_lock_data_file(fileno(fp));
++ procmsg_lock_data_file(fileno(fp));
} else {
/* open with overwrite mode if mark file doesn't exist or
version is different */
diff --git a/tests/Makefile.in b/tests/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -15,15 +15,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -45,7 +41,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/evolution-plugin.m4 \
$(top_srcdir)/m4/gnome.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/openssl.m4 \
$(top_srcdir)/m4/reentrant-resolver.m4 \
$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
@@ -67,17 +63,18 @@ am_test_vfs_read_line_smallblock_OBJECTS = $(am__objects_2)
test_vfs_read_line_smallblock_OBJECTS = \
$(am_test_vfs_read_line_smallblock_OBJECTS)
test_vfs_read_line_smallblock_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
SOURCES = $(test_vfs_read_line_largeblock_SOURCES) \
$(test_vfs_read_line_smallblock_SOURCES)
DIST_SOURCES = $(test_vfs_read_line_largeblock_SOURCES) \
@@ -88,8 +85,6 @@ CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
AMTAR = @AMTAR@
AR = @AR@
@@ -125,8 +120,6 @@ EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -137,8 +130,10 @@ GMSGFMT = @GMSGFMT@
GNOME_CFLAGS = @GNOME_CFLAGS@
GNOME_LIBS = @GNOME_LIBS@
GOB2 = @GOB2@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -178,11 +173,11 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
OPENSSL_LIBS = @OPENSSL_LIBS@
@@ -208,55 +203,15 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
-WITH_EVOLUTION_FALSE = @WITH_EVOLUTION_FALSE@
-WITH_EVOLUTION_TRUE = @WITH_EVOLUTION_TRUE@
-WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
-WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
-WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
-WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
-WITH_MAILDIR_FALSE = @WITH_MAILDIR_FALSE@
-WITH_MAILDIR_TRUE = @WITH_MAILDIR_TRUE@
-WITH_MBOX_FALSE = @WITH_MBOX_FALSE@
-WITH_MBOX_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
-WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_TRUE@
-WITH_MBOX_TRUE = @WITH_MBOX_TRUE@
-WITH_MH_FALSE = @WITH_MH_FALSE@
-WITH_MH_TRUE = @WITH_MH_TRUE@
-WITH_MIME_FALSE = @WITH_MIME_FALSE@
-WITH_MIME_TRUE = @WITH_MIME_TRUE@
-WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
-WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@
-WITH_POP3_FALSE = @WITH_POP3_FALSE@
-WITH_POP3_OR_IMAP_FALSE = @WITH_POP3_OR_IMAP_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_FALSE = @WITH_POP3_OR_IMAP_OR_GMAIL_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_TRUE = @WITH_POP3_OR_IMAP_OR_GMAIL_TRUE@
-WITH_POP3_OR_IMAP_TRUE = @WITH_POP3_OR_IMAP_TRUE@
-WITH_POP3_TRUE = @WITH_POP3_TRUE@
-WITH_REGRESSION_TESTS_FALSE = @WITH_REGRESSION_TESTS_FALSE@
-WITH_REGRESSION_TESTS_TRUE = @WITH_REGRESSION_TESTS_TRUE@
-WITH_SASL_FALSE = @WITH_SASL_FALSE@
-WITH_SASL_TRUE = @WITH_SASL_TRUE@
-WITH_SSL_FALSE = @WITH_SSL_FALSE@
-WITH_SSL_TRUE = @WITH_SSL_TRUE@
-WITH_SYLPHEED_FALSE = @WITH_SYLPHEED_FALSE@
-WITH_SYLPHEED_TRUE = @WITH_SYLPHEED_TRUE@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -268,35 +223,45 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
evolution_plugindir = @evolution_plugindir@
exec_prefix = @exec_prefix@
-gnome_cappletdir = @gnome_cappletdir@
gnome_prefix = @gnome_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
tests = \
test-vfs-read-line1-smallblock.output \
test-vfs-read-line1-largeblock.output \
@@ -372,10 +337,10 @@ clean-noinstPROGRAMS:
done
test-vfs-read-line-largeblock$(EXEEXT): $(test_vfs_read_line_largeblock_OBJECTS) $(test_vfs_read_line_largeblock_DEPENDENCIES)
@rm -f test-vfs-read-line-largeblock$(EXEEXT)
- $(LINK) $(test_vfs_read_line_largeblock_LDFLAGS) $(test_vfs_read_line_largeblock_OBJECTS) $(test_vfs_read_line_largeblock_LDADD) $(LIBS)
+ $(LINK) $(test_vfs_read_line_largeblock_OBJECTS) $(test_vfs_read_line_largeblock_LDADD) $(LIBS)
test-vfs-read-line-smallblock$(EXEEXT): $(test_vfs_read_line_smallblock_OBJECTS) $(test_vfs_read_line_smallblock_DEPENDENCIES)
@rm -f test-vfs-read-line-smallblock$(EXEEXT)
- $(LINK) $(test_vfs_read_line_smallblock_LDFLAGS) $(test_vfs_read_line_smallblock_OBJECTS) $(test_vfs_read_line_smallblock_LDADD) $(LIBS)
+ $(LINK) $(test_vfs_read_line_smallblock_OBJECTS) $(test_vfs_read_line_smallblock_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -389,78 +354,78 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
test_vfs_read_line_largeblock-mn-vfs.o: $(top_srcdir)/src/mn-vfs.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_largeblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_largeblock-mn-vfs.o -MD -MP -MF "$(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Tpo" -c -o test_vfs_read_line_largeblock-mn-vfs.o `test -f '$(top_srcdir)/src/mn-vfs.c' || echo '$(srcdir)/'`$(top_srcdir)/src/mn-vfs.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Tpo" "$(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Po"; else rm -f "$(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_largeblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_largeblock-mn-vfs.o -MD -MP -MF $(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Tpo -c -o test_vfs_read_line_largeblock-mn-vfs.o `test -f '$(top_srcdir)/src/mn-vfs.c' || echo '$(srcdir)/'`$(top_srcdir)/src/mn-vfs.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Tpo $(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/mn-vfs.c' object='test_vfs_read_line_largeblock-mn-vfs.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_largeblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_vfs_read_line_largeblock-mn-vfs.o `test -f '$(top_srcdir)/src/mn-vfs.c' || echo '$(srcdir)/'`$(top_srcdir)/src/mn-vfs.c
test_vfs_read_line_largeblock-mn-vfs.obj: $(top_srcdir)/src/mn-vfs.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_largeblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_largeblock-mn-vfs.obj -MD -MP -MF "$(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Tpo" -c -o test_vfs_read_line_largeblock-mn-vfs.obj `if test -f '$(top_srcdir)/src/mn-vfs.c'; then $(CYGPATH_W) '$(top_srcdir)/src/mn-vfs.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/mn-vfs.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Tpo" "$(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Po"; else rm -f "$(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_largeblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_largeblock-mn-vfs.obj -MD -MP -MF $(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Tpo -c -o test_vfs_read_line_largeblock-mn-vfs.obj `if test -f '$(top_srcdir)/src/mn-vfs.c'; then $(CYGPATH_W) '$(top_srcdir)/src/mn-vfs.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/mn-vfs.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Tpo $(DEPDIR)/test_vfs_read_line_largeblock-mn-vfs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/mn-vfs.c' object='test_vfs_read_line_largeblock-mn-vfs.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_largeblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_vfs_read_line_largeblock-mn-vfs.obj `if test -f '$(top_srcdir)/src/mn-vfs.c'; then $(CYGPATH_W) '$(top_srcdir)/src/mn-vfs.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/mn-vfs.c'; fi`
test_vfs_read_line_largeblock-test-vfs-read-line.o: test-vfs-read-line.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_largeblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_largeblock-test-vfs-read-line.o -MD -MP -MF "$(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Tpo" -c -o test_vfs_read_line_largeblock-test-vfs-read-line.o `test -f 'test-vfs-read-line.c' || echo '$(srcdir)/'`test-vfs-read-line.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Tpo" "$(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Po"; else rm -f "$(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_largeblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_largeblock-test-vfs-read-line.o -MD -MP -MF $(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Tpo -c -o test_vfs_read_line_largeblock-test-vfs-read-line.o `test -f 'test-vfs-read-line.c' || echo '$(srcdir)/'`test-vfs-read-line.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Tpo $(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-vfs-read-line.c' object='test_vfs_read_line_largeblock-test-vfs-read-line.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_largeblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_vfs_read_line_largeblock-test-vfs-read-line.o `test -f 'test-vfs-read-line.c' || echo '$(srcdir)/'`test-vfs-read-line.c
test_vfs_read_line_largeblock-test-vfs-read-line.obj: test-vfs-read-line.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_largeblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_largeblock-test-vfs-read-line.obj -MD -MP -MF "$(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Tpo" -c -o test_vfs_read_line_largeblock-test-vfs-read-line.obj `if test -f 'test-vfs-read-line.c'; then $(CYGPATH_W) 'test-vfs-read-line.c'; else $(CYGPATH_W) '$(srcdir)/test-vfs-read-line.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Tpo" "$(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Po"; else rm -f "$(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_largeblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_largeblock-test-vfs-read-line.obj -MD -MP -MF $(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Tpo -c -o test_vfs_read_line_largeblock-test-vfs-read-line.obj `if test -f 'test-vfs-read-line.c'; then $(CYGPATH_W) 'test-vfs-read-line.c'; else $(CYGPATH_W) '$(srcdir)/test-vfs-read-line.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Tpo $(DEPDIR)/test_vfs_read_line_largeblock-test-vfs-read-line.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-vfs-read-line.c' object='test_vfs_read_line_largeblock-test-vfs-read-line.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_largeblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_vfs_read_line_largeblock-test-vfs-read-line.obj `if test -f 'test-vfs-read-line.c'; then $(CYGPATH_W) 'test-vfs-read-line.c'; else $(CYGPATH_W) '$(srcdir)/test-vfs-read-line.c'; fi`
test_vfs_read_line_smallblock-mn-vfs.o: $(top_srcdir)/src/mn-vfs.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_smallblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_smallblock-mn-vfs.o -MD -MP -MF "$(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Tpo" -c -o test_vfs_read_line_smallblock-mn-vfs.o `test -f '$(top_srcdir)/src/mn-vfs.c' || echo '$(srcdir)/'`$(top_srcdir)/src/mn-vfs.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Tpo" "$(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Po"; else rm -f "$(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_smallblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_smallblock-mn-vfs.o -MD -MP -MF $(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Tpo -c -o test_vfs_read_line_smallblock-mn-vfs.o `test -f '$(top_srcdir)/src/mn-vfs.c' || echo '$(srcdir)/'`$(top_srcdir)/src/mn-vfs.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Tpo $(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/mn-vfs.c' object='test_vfs_read_line_smallblock-mn-vfs.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_smallblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_vfs_read_line_smallblock-mn-vfs.o `test -f '$(top_srcdir)/src/mn-vfs.c' || echo '$(srcdir)/'`$(top_srcdir)/src/mn-vfs.c
test_vfs_read_line_smallblock-mn-vfs.obj: $(top_srcdir)/src/mn-vfs.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_smallblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_smallblock-mn-vfs.obj -MD -MP -MF "$(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Tpo" -c -o test_vfs_read_line_smallblock-mn-vfs.obj `if test -f '$(top_srcdir)/src/mn-vfs.c'; then $(CYGPATH_W) '$(top_srcdir)/src/mn-vfs.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/mn-vfs.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Tpo" "$(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Po"; else rm -f "$(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_smallblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_smallblock-mn-vfs.obj -MD -MP -MF $(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Tpo -c -o test_vfs_read_line_smallblock-mn-vfs.obj `if test -f '$(top_srcdir)/src/mn-vfs.c'; then $(CYGPATH_W) '$(top_srcdir)/src/mn-vfs.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/mn-vfs.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Tpo $(DEPDIR)/test_vfs_read_line_smallblock-mn-vfs.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/mn-vfs.c' object='test_vfs_read_line_smallblock-mn-vfs.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_smallblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_vfs_read_line_smallblock-mn-vfs.obj `if test -f '$(top_srcdir)/src/mn-vfs.c'; then $(CYGPATH_W) '$(top_srcdir)/src/mn-vfs.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/mn-vfs.c'; fi`
test_vfs_read_line_smallblock-test-vfs-read-line.o: test-vfs-read-line.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_smallblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_smallblock-test-vfs-read-line.o -MD -MP -MF "$(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Tpo" -c -o test_vfs_read_line_smallblock-test-vfs-read-line.o `test -f 'test-vfs-read-line.c' || echo '$(srcdir)/'`test-vfs-read-line.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Tpo" "$(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Po"; else rm -f "$(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_smallblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_smallblock-test-vfs-read-line.o -MD -MP -MF $(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Tpo -c -o test_vfs_read_line_smallblock-test-vfs-read-line.o `test -f 'test-vfs-read-line.c' || echo '$(srcdir)/'`test-vfs-read-line.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Tpo $(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-vfs-read-line.c' object='test_vfs_read_line_smallblock-test-vfs-read-line.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_smallblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_vfs_read_line_smallblock-test-vfs-read-line.o `test -f 'test-vfs-read-line.c' || echo '$(srcdir)/'`test-vfs-read-line.c
test_vfs_read_line_smallblock-test-vfs-read-line.obj: test-vfs-read-line.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_smallblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_smallblock-test-vfs-read-line.obj -MD -MP -MF "$(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Tpo" -c -o test_vfs_read_line_smallblock-test-vfs-read-line.obj `if test -f 'test-vfs-read-line.c'; then $(CYGPATH_W) 'test-vfs-read-line.c'; else $(CYGPATH_W) '$(srcdir)/test-vfs-read-line.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Tpo" "$(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Po"; else rm -f "$(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_smallblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_vfs_read_line_smallblock-test-vfs-read-line.obj -MD -MP -MF $(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Tpo -c -o test_vfs_read_line_smallblock-test-vfs-read-line.obj `if test -f 'test-vfs-read-line.c'; then $(CYGPATH_W) 'test-vfs-read-line.c'; else $(CYGPATH_W) '$(srcdir)/test-vfs-read-line.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Tpo $(DEPDIR)/test_vfs_read_line_smallblock-test-vfs-read-line.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-vfs-read-line.c' object='test_vfs_read_line_smallblock-test-vfs-read-line.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vfs_read_line_smallblock_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_vfs_read_line_smallblock-test-vfs-read-line.obj `if test -f 'test-vfs-read-line.c'; then $(CYGPATH_W) 'test-vfs-read-line.c'; else $(CYGPATH_W) '$(srcdir)/test-vfs-read-line.c'; fi`
@@ -471,10 +436,6 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -524,22 +485,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; 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"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -588,7 +548,7 @@ distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+ distclean-tags
dvi: dvi-am
@@ -602,12 +562,20 @@ info-am:
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -628,19 +596,22 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstPROGRAMS ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-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 install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-info-am
+ pdf pdf-am ps ps-am tags uninstall uninstall-am
test-vfs-read-line1-smallblock.output: test-vfs-read-line-smallblock test-vfs-read-line1.input test-vfs-read-line1.expected
diff --git a/ui/Makefile.in b/ui/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -43,7 +39,7 @@ DIST_COMMON = $(dist_ui_DATA) $(srcdir)/Makefile.am \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/evolution-plugin.m4 \
$(top_srcdir)/m4/gnome.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/openssl.m4 \
$(top_srcdir)/m4/reentrant-resolver.m4 \
$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
@@ -66,8 +62,6 @@ DATA = $(dist_ui_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
AMTAR = @AMTAR@
AR = @AR@
@@ -103,8 +97,6 @@ EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -115,8 +107,10 @@ GMSGFMT = @GMSGFMT@
GNOME_CFLAGS = @GNOME_CFLAGS@
GNOME_LIBS = @GNOME_LIBS@
GOB2 = @GOB2@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -156,11 +150,11 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
OPENSSL_LIBS = @OPENSSL_LIBS@
@@ -186,55 +180,15 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
-WITH_EVOLUTION_FALSE = @WITH_EVOLUTION_FALSE@
-WITH_EVOLUTION_TRUE = @WITH_EVOLUTION_TRUE@
-WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
-WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
-WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
-WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
-WITH_MAILDIR_FALSE = @WITH_MAILDIR_FALSE@
-WITH_MAILDIR_TRUE = @WITH_MAILDIR_TRUE@
-WITH_MBOX_FALSE = @WITH_MBOX_FALSE@
-WITH_MBOX_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
-WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
-WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_TRUE@
-WITH_MBOX_TRUE = @WITH_MBOX_TRUE@
-WITH_MH_FALSE = @WITH_MH_FALSE@
-WITH_MH_TRUE = @WITH_MH_TRUE@
-WITH_MIME_FALSE = @WITH_MIME_FALSE@
-WITH_MIME_TRUE = @WITH_MIME_TRUE@
-WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
-WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@
-WITH_POP3_FALSE = @WITH_POP3_FALSE@
-WITH_POP3_OR_IMAP_FALSE = @WITH_POP3_OR_IMAP_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_FALSE = @WITH_POP3_OR_IMAP_OR_GMAIL_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_TRUE = @WITH_POP3_OR_IMAP_OR_GMAIL_TRUE@
-WITH_POP3_OR_IMAP_TRUE = @WITH_POP3_OR_IMAP_TRUE@
-WITH_POP3_TRUE = @WITH_POP3_TRUE@
-WITH_REGRESSION_TESTS_FALSE = @WITH_REGRESSION_TESTS_FALSE@
-WITH_REGRESSION_TESTS_TRUE = @WITH_REGRESSION_TESTS_TRUE@
-WITH_SASL_FALSE = @WITH_SASL_FALSE@
-WITH_SASL_TRUE = @WITH_SASL_TRUE@
-WITH_SSL_FALSE = @WITH_SSL_FALSE@
-WITH_SSL_TRUE = @WITH_SSL_TRUE@
-WITH_SYLPHEED_FALSE = @WITH_SYLPHEED_FALSE@
-WITH_SYLPHEED_TRUE = @WITH_SYLPHEED_TRUE@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -246,35 +200,45 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
evolution_plugindir = @evolution_plugindir@
exec_prefix = @exec_prefix@
-gnome_cappletdir = @gnome_cappletdir@
gnome_prefix = @gnome_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
uidir = $(pkgdatadir)/ui
dist_ui_DATA = \
mailbox-properties-dialog.glade \
@@ -322,13 +286,9 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
install-dist_uiDATA: $(dist_ui_DATA)
@$(NORMAL_INSTALL)
- test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)"
+ test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
@list='$(dist_ui_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -351,22 +311,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; 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"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -382,7 +341,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(uidir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -414,7 +373,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -428,12 +387,20 @@ info-am:
install-data-am: install-dist_uiDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -452,17 +419,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_uiDATA uninstall-info-am
+uninstall-am: uninstall-dist_uiDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dist_uiDATA install-exec \
- install-exec-am install-info install-info-am install-man \
+ install-data install-data-am install-dist_uiDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-dist_uiDATA uninstall-info-am
+ uninstall uninstall-am uninstall-dist_uiDATA
# 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.