Fix patch.
[gpg4win.git] / patches / claws-mail-2.10.0 / 99-auto.patch
1 #! /bin/sh
2 patch -p1 -f $* < $0
3 exit $?
4
5 2007-06-30  Marcus Brinkmann  <marcus@g10code.de>
6
7         * Regenerate all autotool files with
8
9 $ aclocal -I m4   && libtoolize --force --copy   && autoheader   && automake --add-missing --foreign --copy   && autoconf
10
11         but removing autom4te.cache before creating the diff.
12
13
14 diff -rupN claws-mail-2.10.0-orig/aclocal.m4 claws-mail-2.10.0/aclocal.m4
15 --- claws-mail-2.10.0-orig/aclocal.m4   2007-07-02 12:03:02.000000000 +0200
16 +++ claws-mail-2.10.0/aclocal.m4        2007-07-03 18:42:31.000000000 +0200
17 @@ -8029,7 +8029,7 @@ path to pkg-config.
18  
19  _PKG_TEXT
20  
21 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
22 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
23                 [$4])
24  else
25         $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
26 diff -rupN claws-mail-2.10.0-orig/config/config.guess claws-mail-2.10.0/config/config.guess
27 --- claws-mail-2.10.0-orig/config/config.guess  2007-04-20 04:09:10.000000000 +0200
28 +++ claws-mail-2.10.0/config/config.guess       2006-11-08 08:44:58.000000000 +0100
29 @@ -4,7 +4,7 @@
30  #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
31  #   Inc.
32  
33 -timestamp='2007-03-06'
34 +timestamp='2006-07-02'
35  
36  # This file is free software; you can redistribute it and/or modify it
37  # under the terms of the GNU General Public License as published by
38 @@ -161,7 +161,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
39             arm*) machine=arm-unknown ;;
40             sh3el) machine=shl-unknown ;;
41             sh3eb) machine=sh-unknown ;;
42 -           sh5el) machine=sh5le-unknown ;;
43             *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
44         esac
45         # The Operating System including object format, if it has switched
46 @@ -781,7 +780,7 @@ EOF
47      i*:CYGWIN*:*)
48         echo ${UNAME_MACHINE}-pc-cygwin
49         exit ;;
50 -    *:MINGW*:*)
51 +    i*:MINGW*:*)
52         echo ${UNAME_MACHINE}-pc-mingw32
53         exit ;;
54      i*:windows32*:*)
55 @@ -791,15 +790,12 @@ EOF
56      i*:PW*:*)
57         echo ${UNAME_MACHINE}-pc-pw32
58         exit ;;
59 -    *:Interix*:[3456]*)
60 -       case ${UNAME_MACHINE} in
61 -           x86) 
62 -               echo i586-pc-interix${UNAME_RELEASE}
63 -               exit ;;
64 -           EM64T | authenticamd)
65 -               echo x86_64-unknown-interix${UNAME_RELEASE}
66 -               exit ;;
67 -       esac ;;
68 +    x86:Interix*:[3456]*)
69 +       echo i586-pc-interix${UNAME_RELEASE}
70 +       exit ;;
71 +    EM64T:Interix*:[3456]*)
72 +       echo x86_64-unknown-interix${UNAME_RELEASE}
73 +       exit ;;
74      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
75         echo i${UNAME_MACHINE}-pc-mks
76         exit ;;
77 @@ -954,9 +950,6 @@ EOF
78      x86_64:Linux:*:*)
79         echo x86_64-unknown-linux-gnu
80         exit ;;
81 -    xtensa:Linux:*:*)
82 -       echo xtensa-unknown-linux-gnu
83 -       exit ;;
84      i*86:Linux:*:*)
85         # The BFD linker knows what the default object file format is, so
86         # first see if it will tell us. cd to the root directory to prevent
87 @@ -1215,15 +1208,6 @@ EOF
88      SX-6:SUPER-UX:*:*)
89         echo sx6-nec-superux${UNAME_RELEASE}
90         exit ;;
91 -    SX-7:SUPER-UX:*:*)
92 -       echo sx7-nec-superux${UNAME_RELEASE}
93 -       exit ;;
94 -    SX-8:SUPER-UX:*:*)
95 -       echo sx8-nec-superux${UNAME_RELEASE}
96 -       exit ;;
97 -    SX-8R:SUPER-UX:*:*)
98 -       echo sx8r-nec-superux${UNAME_RELEASE}
99 -       exit ;;
100      Power*:Rhapsody:*:*)
101         echo powerpc-apple-rhapsody${UNAME_RELEASE}
102         exit ;;
103 diff -rupN claws-mail-2.10.0-orig/config/config.sub claws-mail-2.10.0/config/config.sub
104 --- claws-mail-2.10.0-orig/config/config.sub    2007-04-20 04:09:10.000000000 +0200
105 +++ claws-mail-2.10.0/config/config.sub 2006-11-08 08:44:58.000000000 +0100
106 @@ -4,7 +4,7 @@
107  #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
108  #   Inc.
109  
110 -timestamp='2007-01-18'
111 +timestamp='2006-09-20'
112  
113  # This file is (in principle) common to ALL GNU software.
114  # The presence of a machine in this file suggests that SOME GNU software
115 @@ -245,12 +245,12 @@ case $basic_machine in
116         | bfin \
117         | c4x | clipper \
118         | d10v | d30v | dlx | dsp16xx \
119 -       | fido | fr30 | frv \
120 +       | fr30 | frv \
121         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
122         | i370 | i860 | i960 | ia64 \
123         | ip2k | iq2000 \
124         | m32c | m32r | m32rle | m68000 | m68k | m88k \
125 -       | maxq | mb | microblaze | mcore | mep \
126 +       | maxq | mb | microblaze | mcore \
127         | mips | mipsbe | mipseb | mipsel | mipsle \
128         | mips16 \
129         | mips64 | mips64el \
130 @@ -324,7 +324,7 @@ case $basic_machine in
131         | clipper-* | craynv-* | cydra-* \
132         | d10v-* | d30v-* | dlx-* \
133         | elxsi-* \
134 -       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
135 +       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
136         | h8300-* | h8500-* \
137         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
138         | i*86-* | i860-* | i960-* | ia64-* \
139 @@ -925,9 +925,6 @@ case $basic_machine in
140                 basic_machine=sh-hitachi
141                 os=-hms
142                 ;;
143 -       sh5el)
144 -               basic_machine=sh5le-unknown
145 -               ;;
146         sh64)
147                 basic_machine=sh64-unknown
148                 ;;
149 @@ -1222,7 +1219,7 @@ case $os in
150               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
151               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
152               | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
153 -             | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
154 +             | -skyos* | -haiku* | -rdos* | -toppers*)
155         # Remember, each alternative MUST END IN *, to match a version number.
156                 ;;
157         -qnx*)
158 @@ -1417,9 +1414,6 @@ case $basic_machine in
159         m68*-cisco)
160                 os=-aout
161                 ;;
162 -        mep-*)
163 -               os=-elf
164 -               ;;
165         mips*-cisco)
166                 os=-elf
167                 ;;
168 diff -rupN claws-mail-2.10.0-orig/configure claws-mail-2.10.0/configure
169 --- claws-mail-2.10.0-orig/configure    2007-07-02 12:03:19.000000000 +0200
170 +++ claws-mail-2.10.0/configure 2007-07-03 18:42:59.000000000 +0200
171 @@ -26664,7 +26664,7 @@ Alternatively, you may set the environme
172  and GLIB_LIBS to avoid the need to call pkg-config.
173  See the pkg-config man page for more details.
174  
175 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.
176 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
177  See \`config.log' for more details." >&5
178  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
179  is in your PATH or set the PKG_CONFIG environment variable to the full
180 @@ -26674,7 +26674,7 @@ Alternatively, you may set the environme
181  and GLIB_LIBS to avoid the need to call pkg-config.
182  See the pkg-config man page for more details.
183  
184 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.
185 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
186  See \`config.log' for more details." >&2;}
187     { (exit 1); exit 1; }; }
188  else
189 @@ -27280,7 +27280,7 @@ Alternatively, you may set the environme
190  and GTK_LIBS to avoid the need to call pkg-config.
191  See the pkg-config man page for more details.
192  
193 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.
194 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
195  See \`config.log' for more details." >&5
196  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
197  is in your PATH or set the PKG_CONFIG environment variable to the full
198 @@ -27290,7 +27290,7 @@ Alternatively, you may set the environme
199  and GTK_LIBS to avoid the need to call pkg-config.
200  See the pkg-config man page for more details.
201  
202 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.
203 +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
204  See \`config.log' for more details." >&2;}
205     { (exit 1); exit 1; }; }
206  else
207 @@ -31347,7 +31347,7 @@ fi
208  
209  
210  
211 -ac_config_files="$ac_config_files Makefile m4/Makefile po/Makefile.in src/common/version.h src/Makefile src/common/Makefile src/common/passcrypt.h src/gtk/Makefile src/etpan/Makefile src/plugins/Makefile src/plugins/demo/Makefile src/plugins/bogofilter/Makefile src/plugins/spamassassin/Makefile src/plugins/dillo_viewer/Makefile src/plugins/trayicon/Makefile src/plugins/trayicon/libeggtrayicon/Makefile src/plugins/clamav/Makefile src/plugins/pgpcore/Makefile src/plugins/pgpmime/Makefile src/plugins/pgpinline/Makefile doc/Makefile doc/man/Makefile tools/Makefile config/Makefile manual/Makefile manual/dtd/Makefile manual/dist/Makefile manual/dist/pdf/Makefile manual/dist/ps/Makefile manual/dist/html/Makefile manual/dist/txt/Makefile manual/fr/Makefile manual/fr/dist/Makefile manual/fr/dist/pdf/Makefile manual/fr/dist/ps/Makefile manual/fr/dist/html/Makefile manual/fr/dist/txt/Makefile manual/pl/Makefile manual/pl/dist/Makefile manual/pl/dist/pdf/Makefile manual/pl/dist/ps/Makefile manual/pl/dist/html/Makefile manual/pl/dist/txt/Makefile manual/es/Makefile manual/es/dist/Makefile manual/es/dist/pdf/Makefile manual/es/dist/ps/Makefile manual/es/dist/html/Makefile manual/es/dist/txt/Makefile claws-mail.pc"
212 +ac_config_files="$ac_config_files Makefile m4/Makefile po/Makefile.in src/common/version.h src/Makefile src/common/Makefile src/common/passcrypt.h src/gtk/Makefile src/etpan/Makefile src/plugins/Makefile src/plugins/demo/Makefile src/plugins/bogofilter/Makefile src/plugins/spamassassin/Makefile src/plugins/dillo_viewer/Makefile src/plugins/trayicon/Makefile src/plugins/trayicon/libeggtrayicon/Makefile src/plugins/clamav/Makefile src/plugins/pgpcore/Makefile src/plugins/pgpmime/Makefile src/plugins/pgpinline/Makefile src/plugins/smime/Makefile doc/Makefile doc/man/Makefile tools/Makefile config/Makefile manual/Makefile manual/dtd/Makefile manual/dist/Makefile manual/dist/pdf/Makefile manual/dist/ps/Makefile manual/dist/html/Makefile manual/dist/txt/Makefile manual/fr/Makefile manual/fr/dist/Makefile manual/fr/dist/pdf/Makefile manual/fr/dist/ps/Makefile manual/fr/dist/html/Makefile manual/fr/dist/txt/Makefile manual/pl/Makefile manual/pl/dist/Makefile manual/pl/dist/pdf/Makefile manual/pl/dist/ps/Makefile manual/pl/dist/html/Makefile manual/pl/dist/txt/Makefile manual/es/Makefile manual/es/dist/Makefile manual/es/dist/pdf/Makefile manual/es/dist/ps/Makefile manual/es/dist/html/Makefile manual/es/dist/txt/Makefile claws-mail.pc"
213  
214  cat >confcache <<\_ACEOF
215  # This file is a shell script that caches the results of configure
216 @@ -32096,6 +32096,7 @@ do
217      "src/plugins/pgpcore/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/pgpcore/Makefile" ;;
218      "src/plugins/pgpmime/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/pgpmime/Makefile" ;;
219      "src/plugins/pgpinline/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/pgpinline/Makefile" ;;
220 +    "src/plugins/smime/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/smime/Makefile" ;;
221      "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
222      "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
223      "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
224 diff -rupN claws-mail-2.10.0-orig/src/common/Makefile.in claws-mail-2.10.0/src/common/Makefile.in
225 --- claws-mail-2.10.0-orig/src/common/Makefile.in       2007-07-02 12:03:14.000000000 +0200
226 +++ claws-mail-2.10.0/src/common/Makefile.in    2007-07-03 18:42:49.000000000 +0200
227 @@ -57,15 +57,16 @@ libclawscommon_la_DEPENDENCIES = $(am__D
228         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
229  am__libclawscommon_la_SOURCES_DIST = fnmatch.c w32_dirent.c w32_reg.c \
230         w32_signal.c w32_stat.c w32_stdio.c w32_stdlib.c w32_string.c \
231 -       w32_time.c w32_unistd.c w32_wait.c base64.c hooks.c log.c \
232 -       md5.c mgutils.c nntp.c passcrypt.c plugin.c prefs.c \
233 -       progressindicator.c quoted-printable.c session.c smtp.c \
234 -       socket.c ssl.c ssl_certificate.c string_match.c stringtable.c \
235 -       claws.c template.c utils.c uuencode.c xml.c xmlprops.c
236 +       w32_time.c w32_unistd.c w32_wait.c w32_account.c base64.c \
237 +       hooks.c log.c md5.c mgutils.c nntp.c passcrypt.c plugin.c \
238 +       prefs.c progressindicator.c quoted-printable.c session.c \
239 +       smtp.c socket.c ssl.c ssl_certificate.c string_match.c \
240 +       stringtable.c claws.c template.c utils.c uuencode.c xml.c \
241 +       xmlprops.c
242  @OS_WIN32_TRUE@am__objects_1 = fnmatch.lo w32_dirent.lo w32_reg.lo \
243  @OS_WIN32_TRUE@        w32_signal.lo w32_stat.lo w32_stdio.lo \
244  @OS_WIN32_TRUE@        w32_stdlib.lo w32_string.lo w32_time.lo \
245 -@OS_WIN32_TRUE@        w32_unistd.lo w32_wait.lo
246 +@OS_WIN32_TRUE@        w32_unistd.lo w32_wait.lo w32_account.lo
247  am_libclawscommon_la_OBJECTS = $(am__objects_1) base64.lo hooks.lo \
248         log.lo md5.lo mgutils.lo nntp.lo passcrypt.lo plugin.lo \
249         prefs.lo progressindicator.lo quoted-printable.lo session.lo \
250 @@ -296,7 +297,7 @@ noinst_LTLIBRARIES = libclawscommon.la
251  @OS_WIN32_TRUE@arch_sources = fnmatch.c \
252  @OS_WIN32_TRUE@               w32_dirent.c w32_reg.c w32_signal.c w32_stat.c \
253  @OS_WIN32_TRUE@               w32_stdio.c w32_stdlib.c w32_string.c w32_time.c \
254 -@OS_WIN32_TRUE@               w32_unistd.c w32_wait.c
255 +@OS_WIN32_TRUE@               w32_unistd.c w32_wait.c w32_account.c
256  
257  @OS_WIN32_TRUE@arch_headers = fnmatch.h w32lib.h
258  @OS_WIN32_FALSE@arch_files = 
259 @@ -456,6 +457,7 @@ distclean-compile:
260  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/template.Plo@am__quote@
261  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@
262  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uuencode.Plo@am__quote@
263 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/w32_account.Plo@am__quote@
264  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/w32_dirent.Plo@am__quote@
265  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/w32_reg.Plo@am__quote@
266  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/w32_signal.Plo@am__quote@
267 diff -rupN claws-mail-2.10.0-orig/src/gtk/Makefile.in claws-mail-2.10.0/src/gtk/Makefile.in
268 --- claws-mail-2.10.0-orig/src/gtk/Makefile.in  2007-07-02 12:03:15.000000000 +0200
269 +++ claws-mail-2.10.0/src/gtk/Makefile.in       2007-07-03 18:42:50.000000000 +0200
270 @@ -340,6 +340,7 @@ clawsgtkinclude_HEADERS = \
271  
272  AM_CPPFLAGS = \
273         -I$(srcdir)/../common \
274 +       -I../common \
275         -I$(srcdir)/.. \
276         $(GTK_CFLAGS) \
277         $(OPENSSL_CFLAGS) \
278 diff -rupN claws-mail-2.10.0-orig/src/Makefile.in claws-mail-2.10.0/src/Makefile.in
279 --- claws-mail-2.10.0-orig/src/Makefile.in      2007-07-02 12:03:14.000000000 +0200
280 +++ claws-mail-2.10.0/src/Makefile.in   2007-07-03 18:42:49.000000000 +0200
281 @@ -115,15 +115,6 @@ am_claws_mail_OBJECTS = account.$(OBJEXT
282  claws_mail_OBJECTS = $(am_claws_mail_OBJECTS)
283  @CLAWS_LIBETPAN_TRUE@am__DEPENDENCIES_1 = etpan/libclawsetpan.la
284  am__DEPENDENCIES_2 =
285 -claws_mail_DEPENDENCIES = $(am__DEPENDENCIES_1) gtk/libclawsgtk.la \
286 -       $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
287 -       $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
288 -       $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
289 -       $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
290 -       $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
291 -       $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
292 -       $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
293 -       $(am__DEPENDENCIES_2)
294  claws_mail_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
295         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
296         $(claws_mail_LDFLAGS) $(LDFLAGS) -o $@
297 @@ -362,6 +353,14 @@ top_srcdir = @top_srcdir@
298  @CLAWS_LIBETPAN_FALSE@etpan_library = 
299  @CLAWS_LIBETPAN_TRUE@etpan_library = etpan/libclawsetpan.la
300  SUBDIRS = common gtk $(etpan_dir) . plugins
301 +@PLATFORM_WIN32_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
302 +@PLATFORM_WIN32_TRUE@     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
303 +@PLATFORM_WIN32_TRUE@     sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
304 +
305 +@PLATFORM_WIN32_FALSE@claws_mail_res_ldflag = 
306 +@PLATFORM_WIN32_TRUE@claws_mail_res_ldflag = -Wl,w32-resource.o
307 +@PLATFORM_WIN32_FALSE@claws_mail_deps = 
308 +@PLATFORM_WIN32_TRUE@claws_mail_deps = w32-resource.o
309  claws_mail_SOURCES = \
310         account.c \
311         action.c \
312 @@ -649,6 +648,7 @@ BUILT_SOURCES = \
313         quote_fmt_parse.h
314  
315  EXTRA_DIST = \
316 +       w32-logo.ico w32-resource.rc \
317         pixmaps/addr_one.xpm \
318         pixmaps/addr_two.xpm \
319         pixmaps/address_book.xpm \
320 @@ -793,13 +793,18 @@ EXTRA_DIST = \
321  
322  INCLUDES = \
323         -I$(srcdir)/common \
324 +       -Icommon \
325         -I$(srcdir)/gtk \
326         -I$(srcdir)/etpan
327  
328  @PLATFORM_WIN32_FALSE@arch_ldflags := 
329  @PLATFORM_WIN32_TRUE@arch_ldflags := -export-all-symbols
330  claws_mail_LDFLAGS = \
331 -       $(arch_ldflags) -export-dynamic
332 +       $(arch_ldflags) -export-dynamic $(claws_mail_res_ldflag)
333 +
334 +claws_mail_DEPENDENCIES = $(claws_mail_deps) \
335 +       $(etpan_library) \
336 +       gtk/libclawsgtk.la
337  
338  claws_mail_LDADD = \
339         $(etpan_library) \
340 @@ -1412,6 +1417,9 @@ install-exec-hook:
341         @rm -f $(DESTDIR)$(bindir)/sylpheed-claws
342         @ln -s claws-mail $(DESTDIR)$(bindir)/sylpheed-claws
343  
344 +@PLATFORM_WIN32_TRUE@%.o : %.rc
345 +@PLATFORM_WIN32_TRUE@  $(LTRCCOMPILE) -i $< -o $@
346 +
347  @CYGWIN_TRUE@claws-mail$(EXEEXT): $(claws_mail_OBJECTS) $(claws_mail_DEPENDENCIES) 
348  @CYGWIN_TRUE@  @rm -f claws-mail$(EXEEXT)
349  @CYGWIN_TRUE@  @rm -f claws-mail.def claws-mail.base claws-mail.exp libclaws-mail.a .libs/libclaws-mail.a
350 diff -rupN claws-mail-2.10.0-orig/src/plugins/Makefile.in claws-mail-2.10.0/src/plugins/Makefile.in
351 --- claws-mail-2.10.0-orig/src/plugins/Makefile.in      2007-07-02 12:03:15.000000000 +0200
352 +++ claws-mail-2.10.0/src/plugins/Makefile.in   2007-07-03 18:42:50.000000000 +0200
353 @@ -60,7 +60,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
354  ETAGS = etags
355  CTAGS = ctags
356  DIST_SUBDIRS = demo spamassassin bogofilter dillo_viewer trayicon \
357 -       clamav pgpcore pgpmime pgpinline
358 +       clamav pgpcore pgpmime pgpinline smime
359  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
360  ACLOCAL = @ACLOCAL@
361  ALLOCA = @ALLOCA@
362 @@ -265,7 +265,8 @@ SUBDIRS = $(demo_dir) \
363         $(clamav_dir) \
364         $(pgpcore_dir) \
365         $(pgpmime_dir) \
366 -       $(pgpinline_dir)
367 +       $(pgpinline_dir) \
368 +       smime
369  
370  all: all-recursive
371  
372 diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpcore/Makefile.in claws-mail-2.10.0/src/plugins/pgpcore/Makefile.in
373 --- claws-mail-2.10.0-orig/src/plugins/pgpcore/Makefile.in      2007-07-02 12:03:17.000000000 +0200
374 +++ claws-mail-2.10.0/src/plugins/pgpcore/Makefile.in   2007-07-03 18:42:52.000000000 +0200
375 @@ -321,6 +321,7 @@ pgpcore_la_LIBADD = $(cygwin_export_lib)
376  INCLUDES = \
377         -I$(top_srcdir)/src \
378         -I$(top_srcdir)/src/common \
379 +       -I$(top_builddir)/src/common \
380         -I$(top_srcdir)/src/gtk
381  
382  AM_CPPFLAGS = \
383 diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpinline/Makefile.in claws-mail-2.10.0/src/plugins/pgpinline/Makefile.in
384 --- claws-mail-2.10.0-orig/src/plugins/pgpinline/Makefile.in    2007-07-02 12:03:17.000000000 +0200
385 +++ claws-mail-2.10.0/src/plugins/pgpinline/Makefile.in 2007-07-03 18:42:53.000000000 +0200
386 @@ -319,6 +319,7 @@ pgpinline_la_LIBADD = $(plugin_ldadd) $(
387  INCLUDES = \
388         -I$(top_srcdir)/src \
389         -I$(top_srcdir)/src/common \
390 +       -I$(top_builddir)/src/common \
391         -I$(top_srcdir)/src/gtk
392  
393  AM_CPPFLAGS = \
394 diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpmime/Makefile.in claws-mail-2.10.0/src/plugins/pgpmime/Makefile.in
395 --- claws-mail-2.10.0-orig/src/plugins/pgpmime/Makefile.in      2007-07-02 12:03:17.000000000 +0200
396 +++ claws-mail-2.10.0/src/plugins/pgpmime/Makefile.in   2007-07-03 18:42:53.000000000 +0200
397 @@ -318,6 +318,7 @@ pgpmime_la_LIBADD = $(plugin_ldadd) $(pg
398  INCLUDES = \
399         -I$(top_srcdir)/src \
400         -I$(top_srcdir)/src/common \
401 +       -I$(top_builddir)/src/common \
402         -I$(top_srcdir)/src/gtk
403  
404  AM_CPPFLAGS = \
405 diff -rupN claws-mail-2.10.0-orig/src/plugins/smime/Makefile.in claws-mail-2.10.0/src/plugins/smime/Makefile.in
406 --- claws-mail-2.10.0-orig/src/plugins/smime/Makefile.in        1970-01-01 01:00:00.000000000 +0100
407 +++ claws-mail-2.10.0/src/plugins/smime/Makefile.in     2007-07-03 18:42:53.000000000 +0200
408 @@ -0,0 +1,661 @@
409 +# Makefile.in generated by automake 1.10 from Makefile.am.
410 +# @configure_input@
411 +
412 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
413 +# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
414 +# This Makefile.in is free software; the Free Software Foundation
415 +# gives unlimited permission to copy and/or distribute it,
416 +# with or without modifications, as long as this notice is preserved.
417 +
418 +# This program is distributed in the hope that it will be useful,
419 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
420 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
421 +# PARTICULAR PURPOSE.
422 +
423 +@SET_MAKE@
424 +
425 +
426 +
427 +VPATH = @srcdir@
428 +pkgdatadir = $(datadir)/@PACKAGE@
429 +pkglibdir = $(libdir)/@PACKAGE@
430 +pkgincludedir = $(includedir)/@PACKAGE@
431 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
432 +install_sh_DATA = $(install_sh) -c -m 644
433 +install_sh_PROGRAM = $(install_sh) -c
434 +install_sh_SCRIPT = $(install_sh) -c
435 +INSTALL_HEADER = $(INSTALL_DATA)
436 +transform = $(program_transform_name)
437 +NORMAL_INSTALL = :
438 +PRE_INSTALL = :
439 +POST_INSTALL = :
440 +NORMAL_UNINSTALL = :
441 +PRE_UNINSTALL = :
442 +POST_UNINSTALL = :
443 +build_triplet = @build@
444 +host_triplet = @host@
445 +target_triplet = @target@
446 +subdir = src/plugins/smime
447 +DIST_COMMON = $(plugininclude_HEADERS) $(srcdir)/Makefile.am \
448 +       $(srcdir)/Makefile.in
449 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
450 +am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal-include.m4 \
451 +       $(top_srcdir)/m4/aspell.m4 $(top_srcdir)/m4/check-type.m4 \
452 +       $(top_srcdir)/m4/gnupg-check-typedef.m4 \
453 +       $(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
454 +       $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
455 +       $(top_srcdir)/configure.ac
456 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
457 +       $(ACLOCAL_M4)
458 +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
459 +CONFIG_HEADER = $(top_builddir)/config.h
460 +CONFIG_CLEAN_FILES =
461 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
462 +am__vpath_adj = case $$p in \
463 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
464 +    *) f=$$p;; \
465 +  esac;
466 +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
467 +am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" \
468 +       "$(DESTDIR)$(pluginincludedir)"
469 +pluginLTLIBRARIES_INSTALL = $(INSTALL)
470 +LTLIBRARIES = $(plugin_LTLIBRARIES)
471 +am__DEPENDENCIES_1 =
472 +@OS_WIN32_TRUE@am__DEPENDENCIES_2 = .
473 +am_smime_la_OBJECTS = plugin.lo smime.lo
474 +smime_la_OBJECTS = $(am_smime_la_OBJECTS)
475 +smime_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
476 +       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(smime_la_LDFLAGS) \
477 +       $(LDFLAGS) -o $@
478 +DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
479 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
480 +am__depfiles_maybe = depfiles
481 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
482 +       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
483 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
484 +       --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
485 +       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
486 +CCLD = $(CC)
487 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
488 +       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
489 +       $(LDFLAGS) -o $@
490 +SOURCES = $(smime_la_SOURCES)
491 +DIST_SOURCES = $(smime_la_SOURCES)
492 +pluginDATA_INSTALL = $(INSTALL_DATA)
493 +DATA = $(plugin_DATA)
494 +pluginincludeHEADERS_INSTALL = $(INSTALL_HEADER)
495 +HEADERS = $(plugininclude_HEADERS)
496 +ETAGS = etags
497 +CTAGS = ctags
498 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
499 +ACLOCAL = @ACLOCAL@
500 +ALLOCA = @ALLOCA@
501 +AMTAR = @AMTAR@
502 +AR = @AR@
503 +AS = @AS@
504 +ASPELL = @ASPELL@
505 +ASPELL_CFLAGS = @ASPELL_CFLAGS@
506 +ASPELL_LIBS = @ASPELL_LIBS@
507 +ASPELL_PATH = @ASPELL_PATH@
508 +AUTOCONF = @AUTOCONF@
509 +AUTOHEADER = @AUTOHEADER@
510 +AUTOMAKE = @AUTOMAKE@
511 +AWK = @AWK@
512 +CC = @CC@
513 +CCDEPMODE = @CCDEPMODE@
514 +CFLAGS = @CFLAGS@
515 +CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
516 +CLAMAV_LIBS = @CLAMAV_LIBS@
517 +COMPFACE_LIBS = @COMPFACE_LIBS@
518 +CPP = @CPP@
519 +CPPFLAGS = @CPPFLAGS@
520 +CRYPT_LIBS = @CRYPT_LIBS@
521 +CXX = @CXX@
522 +CXXCPP = @CXXCPP@
523 +CXXDEPMODE = @CXXDEPMODE@
524 +CXXFLAGS = @CXXFLAGS@
525 +CYGPATH_W = @CYGPATH_W@
526 +DEFS = @DEFS@
527 +DEPDIR = @DEPDIR@
528 +DLLTOOL = @DLLTOOL@
529 +ECHO = @ECHO@
530 +ECHO_C = @ECHO_C@
531 +ECHO_N = @ECHO_N@
532 +ECHO_T = @ECHO_T@
533 +EGREP = @EGREP@
534 +EXEEXT = @EXEEXT@
535 +EXTRA_VERSION = @EXTRA_VERSION@
536 +F77 = @F77@
537 +FFLAGS = @FFLAGS@
538 +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
539 +GLIB_CFLAGS = @GLIB_CFLAGS@
540 +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
541 +GLIB_LIBS = @GLIB_LIBS@
542 +GMSGFMT = @GMSGFMT@
543 +GMSGFMT_015 = @GMSGFMT_015@
544 +GNOME2_CFLAGS = @GNOME2_CFLAGS@
545 +GNOME2_LIBS = @GNOME2_LIBS@
546 +GNOMEPRINT_CFLAGS = @GNOMEPRINT_CFLAGS@
547 +GNOMEPRINT_LIBS = @GNOMEPRINT_LIBS@
548 +GNOME_CONFIG = @GNOME_CONFIG@
549 +GPGME_CFLAGS = @GPGME_CFLAGS@
550 +GPGME_CONFIG = @GPGME_CONFIG@
551 +GPGME_LIBS = @GPGME_LIBS@
552 +GREP = @GREP@
553 +GTK_CFLAGS = @GTK_CFLAGS@
554 +GTK_LIBS = @GTK_LIBS@
555 +INSTALL = @INSTALL@
556 +INSTALL_DATA = @INSTALL_DATA@
557 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
558 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
559 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
560 +INTLLIBS = @INTLLIBS@
561 +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
562 +JPILOT_LIBS = @JPILOT_LIBS@
563 +LDAP_LIBS = @LDAP_LIBS@
564 +LDFLAGS = @LDFLAGS@
565 +LEX = @LEX@
566 +LEXLIB = @LEXLIB@
567 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
568 +LIBETPAN_FLAGS = @LIBETPAN_FLAGS@
569 +LIBETPAN_LIBS = @LIBETPAN_LIBS@
570 +LIBICONV = @LIBICONV@
571 +LIBINTL = @LIBINTL@
572 +LIBOBJS = @LIBOBJS@
573 +LIBRESOLV = @LIBRESOLV@
574 +LIBS = @LIBS@
575 +LIBTOOL = @LIBTOOL@
576 +LN_S = @LN_S@
577 +LTLIBICONV = @LTLIBICONV@
578 +LTLIBINTL = @LTLIBINTL@
579 +LTLIBOBJS = @LTLIBOBJS@
580 +LT_AGE = @LT_AGE@
581 +LT_CURRENT = @LT_CURRENT@
582 +LT_RELEASE = @LT_RELEASE@
583 +LT_REVISION = @LT_REVISION@
584 +MAEMO_CFLAGS = @MAEMO_CFLAGS@
585 +MAEMO_LIBS = @MAEMO_LIBS@
586 +MAINT = @MAINT@
587 +MAJOR_VERSION = @MAJOR_VERSION@
588 +MAKEINFO = @MAKEINFO@
589 +MICRO_VERSION = @MICRO_VERSION@
590 +MINOR_VERSION = @MINOR_VERSION@
591 +MKDIR_P = @MKDIR_P@
592 +MSGFMT = @MSGFMT@
593 +MSGFMT_015 = @MSGFMT_015@
594 +MSGMERGE = @MSGMERGE@
595 +OBJDUMP = @OBJDUMP@
596 +OBJEXT = @OBJEXT@
597 +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
598 +OPENSSL_LIBS = @OPENSSL_LIBS@
599 +PACKAGE = @PACKAGE@
600 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
601 +PACKAGE_NAME = @PACKAGE_NAME@
602 +PACKAGE_STRING = @PACKAGE_STRING@
603 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
604 +PACKAGE_VERSION = @PACKAGE_VERSION@
605 +PASSCRYPT_KEY = @PASSCRYPT_KEY@
606 +PATH_SEPARATOR = @PATH_SEPARATOR@
607 +PKG_CONFIG = @PKG_CONFIG@
608 +POSUB = @POSUB@
609 +PTHREAD_LIBS = @PTHREAD_LIBS@
610 +RANLIB = @RANLIB@
611 +RC = @RC@
612 +SET_MAKE = @SET_MAKE@
613 +SHELL = @SHELL@
614 +SM_LIBS = @SM_LIBS@
615 +STARTUP_NOTIFICATION_CFLAGS = @STARTUP_NOTIFICATION_CFLAGS@
616 +STARTUP_NOTIFICATION_LIBS = @STARTUP_NOTIFICATION_LIBS@
617 +STRIP = @STRIP@
618 +USE_NLS = @USE_NLS@
619 +VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
620 +VALGRIND_LIBS = @VALGRIND_LIBS@
621 +VERSION = @VERSION@
622 +XGETTEXT = @XGETTEXT@
623 +XGETTEXT_015 = @XGETTEXT_015@
624 +YACC = @YACC@
625 +YFLAGS = @YFLAGS@
626 +abs_builddir = @abs_builddir@
627 +abs_srcdir = @abs_srcdir@
628 +abs_top_builddir = @abs_top_builddir@
629 +abs_top_srcdir = @abs_top_srcdir@
630 +ac_ct_CC = @ac_ct_CC@
631 +ac_ct_CXX = @ac_ct_CXX@
632 +ac_ct_F77 = @ac_ct_F77@
633 +ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
634 +am__include = @am__include@
635 +am__leading_dot = @am__leading_dot@
636 +am__quote = @am__quote@
637 +am__tar = @am__tar@
638 +am__untar = @am__untar@
639 +bindir = @bindir@
640 +build = @build@
641 +build_alias = @build_alias@
642 +build_cpu = @build_cpu@
643 +build_os = @build_os@
644 +build_vendor = @build_vendor@
645 +builddir = @builddir@
646 +datadir = @datadir@
647 +datarootdir = @datarootdir@
648 +docdir = @docdir@
649 +dvidir = @dvidir@
650 +exec_prefix = @exec_prefix@
651 +gnomedatadir = @gnomedatadir@
652 +host = @host@
653 +host_alias = @host_alias@
654 +host_cpu = @host_cpu@
655 +host_os = @host_os@
656 +host_vendor = @host_vendor@
657 +htmldir = @htmldir@
658 +includedir = @includedir@
659 +infodir = @infodir@
660 +install_sh = @install_sh@
661 +libdir = @libdir@
662 +libetpanconfig = @libetpanconfig@
663 +libexecdir = @libexecdir@
664 +localedir = @localedir@
665 +localstatedir = @localstatedir@
666 +mandir = @mandir@
667 +manualdir = @manualdir@
668 +mkdir_p = @mkdir_p@
669 +oldincludedir = @oldincludedir@
670 +pdfdir = @pdfdir@
671 +prefix = @prefix@
672 +program_transform_name = @program_transform_name@
673 +psdir = @psdir@
674 +sbindir = @sbindir@
675 +sharedstatedir = @sharedstatedir@
676 +srcdir = @srcdir@
677 +sysconfdir = @sysconfdir@
678 +target = @target@
679 +target_alias = @target_alias@
680 +target_cpu = @target_cpu@
681 +target_os = @target_os@
682 +target_vendor = @target_vendor@
683 +top_builddir = @top_builddir@
684 +top_srcdir = @top_srcdir@
685 +EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def smime.deps
686 +@OS_WIN32_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
687 +@OS_WIN32_TRUE@     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
688 +@OS_WIN32_TRUE@     sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
689 +
690 +@OS_WIN32_FALSE@plugin_res = 
691 +@OS_WIN32_TRUE@plugin_res = version.lo
692 +@OS_WIN32_FALSE@plugin_res_ldflag = 
693 +@OS_WIN32_TRUE@plugin_res_ldflag = -Wl,.libs/version.o
694 +@OS_WIN32_FALSE@export_symbols = 
695 +@OS_WIN32_TRUE@export_symbols = -export-symbols $(srcdir)/plugin.def
696 +@OS_WIN32_FALSE@plugin_deps = 
697 +@OS_WIN32_TRUE@plugin_deps = libclaws.a libmypgpcore.a $(plugin_res) plugin.def
698 +@OS_WIN32_FALSE@plugin_ldadd = 
699 +@OS_WIN32_TRUE@plugin_ldadd = -L . -lclaws -lmypgpcore
700 +@PLATFORM_WIN32_FALSE@no_undefined = 
701 +@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
702 +@CYGWIN_FALSE@cygwin_export_lib = 
703 +@CYGWIN_TRUE@cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
704 +plugindir = $(pkglibdir)/plugins
705 +plugin_DATA = smime.deps
706 +plugin_LTLIBRARIES = smime.la
707 +smime_la_SOURCES = \
708 +       plugin.c \
709 +       smime.c
710 +
711 +pluginincludedir = $(pkgincludedir)/plugins/smime
712 +plugininclude_HEADERS = \
713 +       smime.h
714 +
715 +smime_la_LDFLAGS = \
716 +       $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
717 +       -avoid-version -module 
718 +
719 +smime_la_DEPENDENCIES = $(plugin_deps)
720 +smime_la_LIBADD = $(cygwin_export_lib) $(plugin_ldadd) $(pgpcore_lib) \
721 +        $(GTK_LIBS) \
722 +       $(GPGME_LIBS)
723 +
724 +INCLUDES = \
725 +       -I$(top_srcdir)/src \
726 +       -I$(top_srcdir)/src/common \
727 +       -I$(top_builddir)/src/common \
728 +       -I$(top_srcdir)/src/gtk
729 +
730 +AM_CPPFLAGS = \
731 +       $(GLIB_CFLAGS) \
732 +       $(GTK_CFLAGS) \
733 +       $(GPGME_CFLAGS) \
734 +       -Wno-deprecated-declarations
735 +
736 +all: all-am
737 +
738 +.SUFFIXES:
739 +.SUFFIXES: .c .lo .o .obj
740 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
741 +       @for dep in $?; do \
742 +         case '$(am__configure_deps)' in \
743 +           *$$dep*) \
744 +             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
745 +               && exit 0; \
746 +             exit 1;; \
747 +         esac; \
748 +       done; \
749 +       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/smime/Makefile'; \
750 +       cd $(top_srcdir) && \
751 +         $(AUTOMAKE) --foreign  src/plugins/smime/Makefile
752 +.PRECIOUS: Makefile
753 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
754 +       @case '$?' in \
755 +         *config.status*) \
756 +           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
757 +         *) \
758 +           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
759 +           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
760 +       esac;
761 +
762 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
763 +       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
764 +
765 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
766 +       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
767 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
768 +       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
769 +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
770 +       @$(NORMAL_INSTALL)
771 +       test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
772 +       @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
773 +         if test -f $$p; then \
774 +           f=$(am__strip_dir) \
775 +           echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
776 +           $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
777 +         else :; fi; \
778 +       done
779 +
780 +uninstall-pluginLTLIBRARIES:
781 +       @$(NORMAL_UNINSTALL)
782 +       @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
783 +         p=$(am__strip_dir) \
784 +         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
785 +         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
786 +       done
787 +
788 +clean-pluginLTLIBRARIES:
789 +       -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
790 +       @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
791 +         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
792 +         test "$$dir" != "$$p" || dir=.; \
793 +         echo "rm -f \"$${dir}/so_locations\""; \
794 +         rm -f "$${dir}/so_locations"; \
795 +       done
796 +smime.la: $(smime_la_OBJECTS) $(smime_la_DEPENDENCIES) 
797 +       $(smime_la_LINK) -rpath $(plugindir) $(smime_la_OBJECTS) $(smime_la_LIBADD) $(LIBS)
798 +
799 +mostlyclean-compile:
800 +       -rm -f *.$(OBJEXT)
801 +
802 +distclean-compile:
803 +       -rm -f *.tab.c
804 +
805 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
806 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smime.Plo@am__quote@
807 +
808 +.c.o:
809 +@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
810 +@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
811 +@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
812 +@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
813 +@am__fastdepCC_FALSE@  $(COMPILE) -c $<
814 +
815 +.c.obj:
816 +@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
817 +@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
818 +@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
819 +@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
820 +@am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
821 +
822 +.c.lo:
823 +@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
824 +@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
825 +@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
826 +@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
827 +@am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
828 +
829 +mostlyclean-libtool:
830 +       -rm -f *.lo
831 +
832 +clean-libtool:
833 +       -rm -rf .libs _libs
834 +install-pluginDATA: $(plugin_DATA)
835 +       @$(NORMAL_INSTALL)
836 +       test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
837 +       @list='$(plugin_DATA)'; for p in $$list; do \
838 +         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
839 +         f=$(am__strip_dir) \
840 +         echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
841 +         $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \
842 +       done
843 +
844 +uninstall-pluginDATA:
845 +       @$(NORMAL_UNINSTALL)
846 +       @list='$(plugin_DATA)'; for p in $$list; do \
847 +         f=$(am__strip_dir) \
848 +         echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
849 +         rm -f "$(DESTDIR)$(plugindir)/$$f"; \
850 +       done
851 +install-pluginincludeHEADERS: $(plugininclude_HEADERS)
852 +       @$(NORMAL_INSTALL)
853 +       test -z "$(pluginincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pluginincludedir)"
854 +       @list='$(plugininclude_HEADERS)'; for p in $$list; do \
855 +         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
856 +         f=$(am__strip_dir) \
857 +         echo " $(pluginincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pluginincludedir)/$$f'"; \
858 +         $(pluginincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pluginincludedir)/$$f"; \
859 +       done
860 +
861 +uninstall-pluginincludeHEADERS:
862 +       @$(NORMAL_UNINSTALL)
863 +       @list='$(plugininclude_HEADERS)'; for p in $$list; do \
864 +         f=$(am__strip_dir) \
865 +         echo " rm -f '$(DESTDIR)$(pluginincludedir)/$$f'"; \
866 +         rm -f "$(DESTDIR)$(pluginincludedir)/$$f"; \
867 +       done
868 +
869 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
870 +       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
871 +       unique=`for i in $$list; do \
872 +           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
873 +         done | \
874 +         $(AWK) '    { files[$$0] = 1; } \
875 +              END { for (i in files) print i; }'`; \
876 +       mkid -fID $$unique
877 +tags: TAGS
878 +
879 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
880 +               $(TAGS_FILES) $(LISP)
881 +       tags=; \
882 +       here=`pwd`; \
883 +       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
884 +       unique=`for i in $$list; do \
885 +           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
886 +         done | \
887 +         $(AWK) '    { files[$$0] = 1; } \
888 +              END { for (i in files) print i; }'`; \
889 +       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
890 +         test -n "$$unique" || unique=$$empty_fix; \
891 +         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
892 +           $$tags $$unique; \
893 +       fi
894 +ctags: CTAGS
895 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
896 +               $(TAGS_FILES) $(LISP)
897 +       tags=; \
898 +       here=`pwd`; \
899 +       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
900 +       unique=`for i in $$list; do \
901 +           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
902 +         done | \
903 +         $(AWK) '    { files[$$0] = 1; } \
904 +              END { for (i in files) print i; }'`; \
905 +       test -z "$(CTAGS_ARGS)$$tags$$unique" \
906 +         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
907 +            $$tags $$unique
908 +
909 +GTAGS:
910 +       here=`$(am__cd) $(top_builddir) && pwd` \
911 +         && cd $(top_srcdir) \
912 +         && gtags -i $(GTAGS_ARGS) $$here
913 +
914 +distclean-tags:
915 +       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
916 +
917 +distdir: $(DISTFILES)
918 +       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
919 +       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
920 +       list='$(DISTFILES)'; \
921 +         dist_files=`for file in $$list; do echo $$file; done | \
922 +         sed -e "s|^$$srcdirstrip/||;t" \
923 +             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
924 +       case $$dist_files in \
925 +         */*) $(MKDIR_P) `echo "$$dist_files" | \
926 +                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
927 +                          sort -u` ;; \
928 +       esac; \
929 +       for file in $$dist_files; do \
930 +         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
931 +         if test -d $$d/$$file; then \
932 +           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
933 +           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
934 +             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
935 +           fi; \
936 +           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
937 +         else \
938 +           test -f $(distdir)/$$file \
939 +           || cp -p $$d/$$file $(distdir)/$$file \
940 +           || exit 1; \
941 +         fi; \
942 +       done
943 +check-am: all-am
944 +check: check-am
945 +all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
946 +installdirs:
947 +       for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(pluginincludedir)"; do \
948 +         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
949 +       done
950 +install: install-am
951 +install-exec: install-exec-am
952 +install-data: install-data-am
953 +uninstall: uninstall-am
954 +
955 +install-am: all-am
956 +       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
957 +
958 +installcheck: installcheck-am
959 +install-strip:
960 +       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
961 +         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
962 +         `test -z '$(STRIP)' || \
963 +           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
964 +mostlyclean-generic:
965 +
966 +clean-generic:
967 +
968 +distclean-generic:
969 +       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
970 +
971 +maintainer-clean-generic:
972 +       @echo "This command is intended for maintainers to use"
973 +       @echo "it deletes files that may require special tools to rebuild."
974 +clean: clean-am
975 +
976 +clean-am: clean-generic clean-libtool clean-local \
977 +       clean-pluginLTLIBRARIES mostlyclean-am
978 +
979 +distclean: distclean-am
980 +       -rm -rf ./$(DEPDIR)
981 +       -rm -f Makefile
982 +distclean-am: clean-am distclean-compile distclean-generic \
983 +       distclean-tags
984 +
985 +dvi: dvi-am
986 +
987 +dvi-am:
988 +
989 +html: html-am
990 +
991 +info: info-am
992 +
993 +info-am:
994 +
995 +install-data-am: install-pluginDATA install-pluginLTLIBRARIES \
996 +       install-pluginincludeHEADERS
997 +
998 +install-dvi: install-dvi-am
999 +
1000 +install-exec-am:
1001 +
1002 +install-html: install-html-am
1003 +
1004 +install-info: install-info-am
1005 +
1006 +install-man:
1007 +
1008 +install-pdf: install-pdf-am
1009 +
1010 +install-ps: install-ps-am
1011 +
1012 +installcheck-am:
1013 +
1014 +maintainer-clean: maintainer-clean-am
1015 +       -rm -rf ./$(DEPDIR)
1016 +       -rm -f Makefile
1017 +maintainer-clean-am: distclean-am maintainer-clean-generic
1018 +
1019 +mostlyclean: mostlyclean-am
1020 +
1021 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
1022 +       mostlyclean-libtool
1023 +
1024 +pdf: pdf-am
1025 +
1026 +pdf-am:
1027 +
1028 +ps: ps-am
1029 +
1030 +ps-am:
1031 +
1032 +uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
1033 +       uninstall-pluginincludeHEADERS
1034 +
1035 +.MAKE: install-am install-strip
1036 +
1037 +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
1038 +       clean-libtool clean-local clean-pluginLTLIBRARIES ctags \
1039 +       distclean distclean-compile distclean-generic \
1040 +       distclean-libtool distclean-tags distdir dvi dvi-am html \
1041 +       html-am info info-am install install-am install-data \
1042 +       install-data-am install-dvi install-dvi-am install-exec \
1043 +       install-exec-am install-html install-html-am install-info \
1044 +       install-info-am install-man install-pdf install-pdf-am \
1045 +       install-pluginDATA install-pluginLTLIBRARIES \
1046 +       install-pluginincludeHEADERS install-ps install-ps-am \
1047 +       install-strip installcheck installcheck-am installdirs \
1048 +       maintainer-clean maintainer-clean-generic mostlyclean \
1049 +       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
1050 +       pdf pdf-am ps ps-am tags uninstall uninstall-am \
1051 +       uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
1052 +       uninstall-pluginincludeHEADERS
1053 +
1054 +
1055 +@OS_WIN32_TRUE@%.lo : %.rc
1056 +@OS_WIN32_TRUE@        $(LTRCCOMPILE) -i $< -o $@
1057 +
1058 +@OS_WIN32_TRUE@libclaws.a: claws.def
1059 +@OS_WIN32_TRUE@        $(DLLTOOL) --output-lib $@ --def $<
1060 +
1061 +@OS_WIN32_TRUE@libmypgpcore.a: mypgpcore.def
1062 +@OS_WIN32_TRUE@        $(DLLTOOL) --output-lib $@ --def $<
1063 +
1064 +clean-local:
1065 +       rm -f libclaws.a
1066 +       rm -f libmypgpcore.a
1067 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
1068 +# Otherwise a system limit (for SysV at least) may be exceeded.
1069 +.NOEXPORT: