Merge lp:~ricotz/ubuntu/natty/gnupg/natty into lp:ubuntu/natty/gnupg

Proposed by Rico Tzschichholz on 2011-02-19
Status: Merged
Merge reported by: Benjamin Drung
Merged at revision: not available
Proposed branch: lp:~ricotz/ubuntu/natty/gnupg/natty
Merge into: lp:ubuntu/natty/gnupg
Diff against target: 146727 lines (+27423/-42771)
143 files modified
AUTHORS (+7/-1)
ChangeLog (+24/-0)
Makefile.am (+4/-1)
Makefile.in (+8/-4)
NEWS (+8/-0)
README (+4/-4)
TODO (+79/-69)
VERSION (+1/-1)
aclocal.m4 (+28/-18)
checks/ChangeLog (+4/-0)
checks/Makefile.in (+26/-12)
checks/armor.test (+575/-2)
cipher/ChangeLog (+16/-0)
cipher/Makefile.in (+6/-5)
cipher/rand-internal.h (+2/-0)
cipher/random.c (+48/-3)
cipher/rndw32.c (+11/-0)
config.h.in (+47/-6)
configure (+6369/-17032)
configure.ac (+13/-3)
debian/README.Debian (+18/-0)
debian/changelog (+57/-0)
debian/control (+5/-5)
debian/gnupg.doc-base.faq (+0/-11)
debian/gnupg.docs (+0/-1)
debian/patches/00list (+0/-8)
debian/patches/489225_catch_expired_primary_key_with_valid_subkey.dpatch (+0/-28)
debian/patches/551709_fix_info_link_entry.dpatch (+0/-33)
debian/patches/553175_document_primary_uid_sign.dpatch (+0/-23)
debian/patches/560692_fix_fatal_after_homedir_creation.dpatch (+0/-25)
debian/patches/560995_fix_ftbfs_on_sparc64.dpatch (+0/-52)
debian/patches/567580_menu_prompt_reflects_program.dpatch (+0/-36)
debian/patches/567593_improve_info_and_faq.dpatch (+0/-134)
debian/patches/fix_infinite_loop_r5264.dpatch (+0/-23)
debian/patches/mips_gcc4.4.dpatch (+38/-40)
debian/rules (+33/-27)
doc/ChangeLog (+14/-0)
doc/FAQ (+11/-1298)
doc/Makefile.am (+3/-22)
doc/Makefile.in (+16/-31)
doc/README.W32 (+1/-1)
doc/faq.html (+0/-1655)
doc/faq.raw (+0/-1343)
doc/gnupg1.info (+33/-32)
doc/gnupg1.texi (+1/-1)
doc/gpg.texi (+126/-30)
doc/stamp-vti (+4/-4)
doc/version.texi (+4/-4)
g10/ChangeLog (+111/-2)
g10/Makefile.in (+6/-5)
g10/app-openpgp.c (+2/-2)
g10/armor.c (+5/-4)
g10/build-packet.c (+5/-0)
g10/card-util.c (+6/-3)
g10/cardglue.c (+7/-1)
g10/cardglue.h (+1/-0)
g10/ccid-driver.c (+3/-3)
g10/gpg.c (+8/-1)
g10/gpgv.c (+4/-0)
g10/import.c (+59/-1)
g10/iso7816.c (+3/-3)
g10/keydb.c (+3/-3)
g10/keyedit.c (+1/-1)
g10/keygen.c (+1/-1)
g10/keyring.c (+4/-4)
g10/keyserver.c (+3/-1)
g10/mainproc.c (+8/-0)
g10/misc.c (+12/-2)
g10/openfile.c (+19/-0)
g10/options.skel (+8/-7)
g10/parse-packet.c (+10/-2)
g10/passphrase.c (+5/-3)
g10/photoid.c (+4/-2)
g10/plaintext.c (+18/-3)
g10/sig-check.c (+5/-1)
g10/sign.c (+9/-6)
g10/signal.c (+10/-0)
g10/tdbio.c (+2/-1)
g10/trustdb.c (+8/-2)
gnupg.spec (+1/-1)
include/ChangeLog (+8/-0)
include/ttyio.h (+5/-0)
include/util.h (+1/-2)
keyserver/Makefile.in (+6/-5)
m4/Makefile.in (+5/-4)
m4/estream.m4 (+1/-0)
mpi/ChangeLog (+10/-0)
mpi/Makefile.in (+6/-5)
mpi/config.links (+10/-12)
mpi/longlong.h (+9/-2)
po/ChangeLog (+21/-1)
po/be.po (+547/-539)
po/ca.po (+547/-539)
po/cs.po (+547/-539)
po/da.po (+543/-538)
po/de.po (+551/-543)
po/el.po (+547/-539)
po/en@boldquot.po (+594/-589)
po/en@quot.po (+594/-589)
po/eo.po (+547/-539)
po/es.po (+547/-539)
po/et.po (+547/-539)
po/fi.po (+547/-539)
po/fr.po (+548/-540)
po/gl.po (+547/-539)
po/gnupg.pot (+543/-538)
po/hu.po (+547/-539)
po/id.po (+547/-539)
po/it.po (+547/-539)
po/ja.po (+547/-539)
po/nb.po (+547/-539)
po/nl.po (+547/-539)
po/pl.po (+761/-2205)
po/pt.po (+547/-539)
po/pt_BR.po (+547/-539)
po/ro.po (+1936/-1946)
po/ru.po (+547/-539)
po/sk.po (+547/-539)
po/sv.po (+548/-540)
po/tr.po (+547/-539)
po/zh_CN.po (+547/-539)
po/zh_TW.po (+731/-729)
scripts/ChangeLog (+13/-0)
scripts/autogen.sh (+4/-0)
scripts/config.guess (+145/-153)
scripts/config.sub (+149/-40)
scripts/mk-w32-dist (+2/-2)
scripts/w32installer.nsi (+2/-1)
tools/ChangeLog (+4/-0)
tools/Makefile.in (+6/-5)
util/ChangeLog (+30/-0)
util/Makefile.in (+6/-5)
util/argparse.c (+1/-1)
util/cert.c (+4/-1)
util/estream-printf.c (+15/-337)
util/iobuf.c (+21/-3)
util/logger.c (+27/-0)
util/pka.c (+16/-9)
util/secmem.c (+5/-1)
util/srv.c (+4/-1)
util/strgutil.c (+13/-0)
util/ttyio.c (+37/-7)
zlib/Makefile.in (+6/-5)
To merge this branch: bzr merge lp:~ricotz/ubuntu/natty/gnupg/natty
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-02-19 Pending
Review via email: mp+50444@code.launchpad.net

Description of the change

This is a merge with the debian version 1.4.11-3 which includes a upstream bugfix release.

To post a comment you must log in.
lp:~ricotz/ubuntu/natty/gnupg/natty updated on 2011-02-22
36. By Rico Tzschichholz on 2011-02-22

* debian/{control,rules}: Remove the Win32 build (and mingw32
  build-dependency), since mingw32 is in universe, and will remain so for
  the forseeable future.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2009-09-05 15:43:18 +0000
3+++ AUTHORS 2011-02-22 09:58:14 +0000
4@@ -43,7 +43,9 @@
5
6 Jacobo Tarri'o Barreiro <jtarrio@iname.com> Translations [gl]
7
8-Janusz Aleksander Urbanowicz <alex@bofh.torun.pl> Translations [po]
9+Jakub Bogusz <qboosh at pld-linux dot org> Translations [pl]
10+
11+Janusz Aleksander Urbanowicz <alex@bofh.torun.pl> Translations [pl]
12
13 Jedi Lin <Jedi@idej.org> Translations [zh-tw]
14
15@@ -131,6 +133,10 @@
16 and rndwin32.c from cryptlib.
17 Copyright Peter Gutmann, Paul Kendall, and Chris Wedgwood 1996-1999.
18
19+The code to help with the VMS port (indicated by __VMS and
20+corresponding Changelog entries) was contributed by Steven M. Schweda.
21+<sms at antinode dot info>.
22+
23 The RPM specs file scripts/gnupg.spec has been contributed by
24 several people.
25
26
27=== modified file 'ChangeLog'
28--- ChangeLog 2009-09-05 15:43:18 +0000
29+++ ChangeLog 2011-02-22 09:58:14 +0000
30@@ -1,3 +1,27 @@
31+2010-10-18 Werner Koch <wk@g10code.com>
32+
33+ Release 1.4.11.
34+
35+2010-10-10 Werner Koch <wk@g10code.com>
36+
37+ * configure.ac (AH_BOTTOM): Add GNUPG_BAK_SFX and GNUPG_TMP_SFX.
38+ Define GNUPG_HOMEDIR et al for VMS.
39+
40+2010-10-05 Werner Koch <wk@g10code.com>
41+
42+ * configure.ac: Remove check for the faqprog.
43+
44+2010-09-28 Werner Koch <wk@g10code.com>
45+
46+ * configure.ac (AH_BOTTOM) [__VMS]: Fix homedir.
47+
48+2010-09-23 Werner Koch <wk@g10code.com>
49+
50+ Release 1.4.11rc1.
51+
52+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove
53+ --enable-selinux-support option.
54+
55 2009-09-02 Werner Koch <wk@g10code.com>
56
57 Release 1.4.10.
58
59=== modified file 'Makefile.am'
60--- Makefile.am 2009-09-05 15:43:18 +0000
61+++ Makefile.am 2011-02-22 09:58:14 +0000
62@@ -17,7 +17,10 @@
63 ## Process this file with automake to produce Makefile.in
64
65 ACLOCAL_AMFLAGS = -I m4
66-DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support --enable-mailto
67+# We can't use --enable-selinux-support because some of our regression
68+# tests are importing secret keys and that is not allowed if
69+# selinux-support is enabled.
70+DISTCHECK_CONFIGURE_FLAGS = --enable-mailto
71 AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99
72
73 if CROSS_COMPILING
74
75=== modified file 'Makefile.in'
76--- Makefile.in 2009-09-05 15:43:18 +0000
77+++ Makefile.in 2011-02-22 09:58:14 +0000
78@@ -1,4 +1,4 @@
79-# Makefile.in generated by automake 1.10.1 from Makefile.am.
80+# Makefile.in generated by automake 1.10.2 from Makefile.am.
81 # @configure_input@
82
83 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
84@@ -145,7 +145,6 @@
85 ECHO_T = @ECHO_T@
86 EGREP = @EGREP@
87 EXEEXT = @EXEEXT@
88-FAQPROG = @FAQPROG@
89 GENCAT = @GENCAT@
90 GETOPT = @GETOPT@
91 GLIBC2 = @GLIBC2@
92@@ -214,6 +213,7 @@
93 PACKAGE_NAME = @PACKAGE_NAME@
94 PACKAGE_STRING = @PACKAGE_STRING@
95 PACKAGE_TARNAME = @PACKAGE_TARNAME@
96+PACKAGE_URL = @PACKAGE_URL@
97 PACKAGE_VERSION = @PACKAGE_VERSION@
98 PATH_SEPARATOR = @PATH_SEPARATOR@
99 PERL = @PERL@
100@@ -282,10 +282,14 @@
101 srcdir = @srcdir@
102 sysconfdir = @sysconfdir@
103 target_alias = @target_alias@
104+top_build_prefix = @top_build_prefix@
105 top_builddir = @top_builddir@
106 top_srcdir = @top_srcdir@
107 ACLOCAL_AMFLAGS = -I m4
108-DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support --enable-mailto
109+# We can't use --enable-selinux-support because some of our regression
110+# tests are importing secret keys and that is not allowed if
111+# selinux-support is enabled.
112+DISTCHECK_CONFIGURE_FLAGS = --enable-mailto
113 AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99
114 @CROSS_COMPILING_FALSE@checks = checks
115 @CROSS_COMPILING_TRUE@checks =
116@@ -424,7 +428,7 @@
117 unique=`for i in $$list; do \
118 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
119 done | \
120- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
121+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
122 END { if (nonempty) { for (i in files) print i; }; }'`; \
123 mkid -fID $$unique
124 tags: TAGS
125
126=== modified file 'NEWS'
127--- NEWS 2009-09-05 15:43:18 +0000
128+++ NEWS 2011-02-22 09:58:14 +0000
129@@ -1,3 +1,11 @@
130+Noteworthy changes in version 1.4.11 (2010-10-18)
131+-------------------------------------------------
132+
133+ * Bug fixes and portability changes.
134+
135+ * Minor changes for better interoperability with GnuPG-2.
136+
137+
138 Noteworthy changes in version 1.4.10 (2009-09-02)
139 -------------------------------------------------
140
141
142=== modified file 'README'
143--- README 2009-09-05 15:43:18 +0000
144+++ README 2011-02-22 09:58:14 +0000
145@@ -1,11 +1,11 @@
146
147 GnuPG - The GNU Privacy Guard
148 -------------------------------
149- Version 1.4.10
150+ Version 1.4.11
151
152 Copyright 1998, 1999, 2000, 2001, 2002, 2003,
153- 2004, 2005, 2006, 2007, 2008,
154- 2009 Free Software Foundation, Inc.
155+ 2004, 2005, 2006, 2007, 2008, 2009,
156+ 2010 Free Software Foundation, Inc.
157
158 This file is free software; as a special exception the author
159 gives unlimited permission to copy and/or distribute it, with or
160@@ -23,7 +23,7 @@
161 GnuPG is GNU's tool for secure communication and data storage.
162 It can be used to encrypt data and to create digital signatures.
163 It includes an advanced key management facility and is compliant
164- with the proposed OpenPGP Internet standard as described in RFC2440.
165+ with the proposed OpenPGP Internet standard as described in RFC4880.
166
167 GnuPG works best on GNU/Linux or *BSD systems. Most other Unices
168 are also supported but are not as well tested as the Free Unices.
169
170=== modified file 'TODO'
171--- TODO 2006-12-12 15:56:56 +0000
172+++ TODO 2011-02-22 09:58:14 +0000
173@@ -1,73 +1,83 @@
174- * Using an expired key for signing should give an error message
175- "expired key" and not "unusable key'. Furthermore the error should
176- also be thrown when the default key has expired. Reported by
177- Eric.VanBuggenhaut add AdValvas.be.
178-
179- * pause scrolling help in --edit-key and elsewhere.
180-
181- * getkey does not return revoked/expired keys - therefore it is not
182- possible to override it.
183-
184- * Selection using +wordlist does not work.
185- What about adding a feature -word to the +wordlist search mode.
186-
187- * Check the changes to the gpg random gatherer on all W32 platforms.
188-
189- * Show more info does not work from edit->trust. We should give more
190- information on the user ID under question while running
191- --update-trustdb.
192-
193- * Check that no secret temporary results are stored in the result parameter
194- of the mpi functions. We have already done this for mpi-mul.c
195-
196- * We need another special packet at the end of a clearsign message to mark
197- it's end and allow for multiple signature for one message. And
198- add a real grammar to the code in mainproc.c
199-
200- * Fix the bug in the mips assembler code
201-
202- * Add a way to show the fingerprint of an key signator's keys
203-
204- * Concatenated encryption messages don't work corectly - only the
205- first one is processed.
206-
207- * Add option to put the list of recipients (from the encryption
208- layer) into the signatures notation data.
209-
210- * --disable-asm should still assemble _udiv_qrnnd when needed
211-
212- * the pubkey encrypt functions should do some sanity checks.
213-
214- * "gpg filename.tar.gz.asc" should work like --verify (-sab).
215-
216- * for messages created with "-t", it might make sense to append the
217- verification status of the message to the output (i.e. write something to
218- the --output file and not only to stderr. However the problem is
219- that we consider the message transpatrent and don't have any
220- indication of the used character set. To implement this feature
221- we need to make sure that all output is plain 7 bit ascii but
222- given that we need to print a user name, this does not make sense
223- at all. The only way this can be implemented is by assuming that
224- the message is encoded in utf8 and hope tht everyone starts to use
225- utf8 instead of latin-1 or whatever RSN. Hmmm, I myself should
226- start with this.
227-
228- * keyflags don't distinguish between {certify,signature}-only.
229-
230- * cat foo | gpg --sign | gpg --list-packets
231- Does not list the signature packet.
232-
233- * When presenting the result of a verification show the user ID with
234- the highest trust level first instead of the primary one.
235-
236- * allow the use of option in gpg.conf.
237-
238- * Add the NEWSIG status.
239-
240- * Delete a card key as well as a wiping.
241-
242- * passphrase_to_dek does not return NULL after a cancel. There is
243+ -*- org -*-
244+
245+* Using an expired key for signing should give an error message
246+ "expired key" and not "unusable key'. Furthermore the error should
247+ also be thrown when the default key has expired. Reported by
248+ Eric.VanBuggenhaut add AdValvas.be.
249+
250+* pause scrolling help in --edit-key and elsewhere.
251+
252+* getkey does not return revoked/expired keys - therefore it is not
253+ possible to override it.
254+
255+* Selection using +wordlist does not work.
256+ What about adding a feature -word to the +wordlist search mode.
257+
258+* Check the changes to the gpg random gatherer on all W32 platforms.
259+
260+* Show more info does not work from edit->trust. We should give more
261+ information on the user ID under question while running
262+ --update-trustdb.
263+
264+* Check that no secret temporary results are stored in the result parameter
265+ of the mpi functions. We have already done this for mpi-mul.c
266+
267+* We need another special packet at the end of a clearsign message to mark
268+ it's end and allow for multiple signature for one message. And
269+ add a real grammar to the code in mainproc.c
270+
271+* Fix the bug in the mips assembler code
272+
273+* Add a way to show the fingerprint of an key signator's keys
274+
275+* Concatenated encryption messages don't work corectly - only the
276+ first one is processed.
277+
278+* Add option to put the list of recipients (from the encryption
279+ layer) into the signatures notation data.
280+
281+* --disable-asm should still assemble _udiv_qrnnd when needed
282+
283+* the pubkey encrypt functions should do some sanity checks.
284+
285+* "gpg filename.tar.gz.asc" should work like --verify (-sab).
286+
287+* for messages created with "-t", it might make sense to append the
288+ verification status of the message to the output (i.e. write something to
289+ the --output file and not only to stderr. However the problem is
290+ that we consider the message transpatrent and don't have any
291+ indication of the used character set. To implement this feature
292+ we need to make sure that all output is plain 7 bit ascii but
293+ given that we need to print a user name, this does not make sense
294+ at all. The only way this can be implemented is by assuming that
295+ the message is encoded in utf8 and hope tht everyone starts to use
296+ utf8 instead of latin-1 or whatever RSN. Hmmm, I myself should
297+ start with this.
298+
299+* keyflags don't distinguish between {certify,signature}-only.
300+
301+* cat foo | gpg --sign | gpg --list-packets
302+ Does not list the signature packet.
303+
304+* When presenting the result of a verification show the user ID with
305+ the highest trust level first instead of the primary one.
306+
307+* allow the use of option in gpg.conf.
308+
309+* Add the NEWSIG status.
310+
311+* Delete a card key as well as a wiping.
312+
313+* passphrase_to_dek does not return NULL after a cancel. There is
314 no way to issue a cancel when unsing the CLI - this would however
315 be a Good Thing when used with mixed symkey/pubkey encrypted
316 messages. See comment in mainproc.c:proc_symkey_enc.
317 Note, that this has been fixed in 2.0.2 - we should backport it.
318+
319+* Backport from GnuPG-2:
320+
321+ 2009-09-04 Werner Koch <wk@g10code.com>
322+
323+ * keyedit.c (menu_select_uid): Use IDX ==-1 t select all.
324+ (menu_select_key): Ditto.
325+ (keyedit_menu) <cmdSELKEY, cmdSELUID>: Allow '*' to select all.
326
327=== modified file 'VERSION'
328--- VERSION 2009-09-05 15:43:18 +0000
329+++ VERSION 2011-02-22 09:58:14 +0000
330@@ -1,1 +1,1 @@
331-1.4.10
332+1.4.11
333
334=== modified file 'aclocal.m4'
335--- aclocal.m4 2009-09-05 15:43:18 +0000
336+++ aclocal.m4 2011-02-22 09:58:14 +0000
337@@ -1,4 +1,4 @@
338-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
339+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
340
341 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
342 # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
343@@ -13,13 +13,13 @@
344
345 m4_ifndef([AC_AUTOCONF_VERSION],
346 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
347-m4_if(AC_AUTOCONF_VERSION, [2.61],,
348-[m4_warning([this file was generated for autoconf 2.61.
349+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
350+[m4_warning([this file was generated for autoconf 2.64.
351 You have another version of autoconf. It may work, but is not guaranteed to.
352 If you have problems, you may need to regenerate the build system entirely.
353 To do so, use the procedure documented by the package, typically `autoreconf'.])])
354
355-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
356+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
357 #
358 # This file is free software; the Free Software Foundation
359 # gives unlimited permission to copy and/or distribute it,
360@@ -34,7 +34,7 @@
361 [am__api_version='1.10'
362 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
363 dnl require some minimum version. Point them to the right macro.
364-m4_if([$1], [1.10.1], [],
365+m4_if([$1], [1.10.2], [],
366 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
367 ])
368
369@@ -48,12 +48,12 @@
370 # AM_SET_CURRENT_AUTOMAKE_VERSION
371 # -------------------------------
372 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
373-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
374+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
375 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
376-[AM_AUTOMAKE_VERSION([1.10.1])dnl
377+[AM_AUTOMAKE_VERSION([1.10.2])dnl
378 m4_ifndef([AC_AUTOCONF_VERSION],
379 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
380-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
381+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
382
383 # Figure out how to run the assembler. -*- Autoconf -*-
384
385@@ -325,19 +325,28 @@
386
387 # Generate code to set up dependency tracking. -*- Autoconf -*-
388
389-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
390+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
391 # Free Software Foundation, Inc.
392 #
393 # This file is free software; the Free Software Foundation
394 # gives unlimited permission to copy and/or distribute it,
395 # with or without modifications, as long as this notice is preserved.
396
397-#serial 3
398+#serial 4
399
400 # _AM_OUTPUT_DEPENDENCY_COMMANDS
401 # ------------------------------
402 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
403-[for mf in $CONFIG_FILES; do
404+[# Autoconf 2.62 quotes --file arguments for eval, but not when files
405+# are listed without --file. Let's play safe and only enable the eval
406+# if we detect the quoting.
407+case $CONFIG_FILES in
408+*\'*) eval set x "$CONFIG_FILES" ;;
409+*) set x $CONFIG_FILES ;;
410+esac
411+shift
412+for mf
413+do
414 # Strip MF so we end up with the name of the file.
415 mf=`echo "$mf" | sed -e 's/:.*$//'`
416 # Check whether this is an Automake generated Makefile or not.
417@@ -646,14 +655,14 @@
418 rm -f confinc confmf
419 ])
420
421-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
422+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
423 # Free Software Foundation, Inc.
424 #
425 # This file is free software; the Free Software Foundation
426 # gives unlimited permission to copy and/or distribute it,
427 # with or without modifications, as long as this notice is preserved.
428
429-# serial 5
430+# serial 6
431
432 # AM_PROG_CC_C_O
433 # --------------
434@@ -665,8 +674,9 @@
435 # FIXME: we rely on the cache variable name because
436 # there is no other way.
437 set dummy $CC
438-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
439-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
440+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
441+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
442+if test "$am_t" != yes; then
443 # Losing compiler, so override with the script.
444 # FIXME: It is wrong to rewrite CC.
445 # But if we don't then we get into trouble of one sort or another.
446@@ -744,13 +754,13 @@
447
448 # Helper functions for option handling. -*- Autoconf -*-
449
450-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
451+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
452 #
453 # This file is free software; the Free Software Foundation
454 # gives unlimited permission to copy and/or distribute it,
455 # with or without modifications, as long as this notice is preserved.
456
457-# serial 3
458+# serial 4
459
460 # _AM_MANGLE_OPTION(NAME)
461 # -----------------------
462@@ -767,7 +777,7 @@
463 # ----------------------------------
464 # OPTIONS is a space-separated list of Automake options.
465 AC_DEFUN([_AM_SET_OPTIONS],
466-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
467+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
468
469 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
470 # -------------------------------------------
471
472=== modified file 'checks/ChangeLog'
473--- checks/ChangeLog 2008-07-24 22:25:09 +0000
474+++ checks/ChangeLog 2011-02-22 09:58:14 +0000
475@@ -1,3 +1,7 @@
476+2010-05-12 Werner Koch <wk@g10code.com>
477+
478+ * armor.test: Extend to test bug 1179.
479+
480 2007-12-14 Werner Koch <wk@g10code.com>
481
482 * Makefile.am (./gpg_dearmor): Revert last change. The actual fix
483
484=== modified file 'checks/Makefile.in'
485--- checks/Makefile.in 2009-09-05 15:43:18 +0000
486+++ checks/Makefile.in 2011-02-22 09:58:14 +0000
487@@ -1,4 +1,4 @@
488-# Makefile.in generated by automake 1.10.1 from Makefile.am.
489+# Makefile.in generated by automake 1.10.2 from Makefile.am.
490 # @configure_input@
491
492 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
493@@ -114,7 +114,6 @@
494 ECHO_T = @ECHO_T@
495 EGREP = @EGREP@
496 EXEEXT = @EXEEXT@
497-FAQPROG = @FAQPROG@
498 GENCAT = @GENCAT@
499 GETOPT = @GETOPT@
500 GLIBC2 = @GLIBC2@
501@@ -183,6 +182,7 @@
502 PACKAGE_NAME = @PACKAGE_NAME@
503 PACKAGE_STRING = @PACKAGE_STRING@
504 PACKAGE_TARNAME = @PACKAGE_TARNAME@
505+PACKAGE_URL = @PACKAGE_URL@
506 PACKAGE_VERSION = @PACKAGE_VERSION@
507 PATH_SEPARATOR = @PATH_SEPARATOR@
508 PERL = @PERL@
509@@ -251,6 +251,7 @@
510 srcdir = @srcdir@
511 sysconfdir = @sysconfdir@
512 target_alias = @target_alias@
513+top_build_prefix = @top_build_prefix@
514 top_builddir = @top_builddir@
515 top_srcdir = @top_srcdir@
516 GPG_IMPORT = ../g10/gpg --homedir . --quiet --yes --no-permission-warning --import
517@@ -287,8 +288,8 @@
518 @for dep in $?; do \
519 case '$(am__configure_deps)' in \
520 *$$dep*) \
521- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
522- && exit 0; \
523+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
524+ && { if test -f $@; then exit 0; else break; fi; }; \
525 exit 1;; \
526 esac; \
527 done; \
528@@ -320,7 +321,7 @@
529
530
531 check-TESTS: $(TESTS)
532- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
533+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
534 srcdir=$(srcdir); export srcdir; \
535 list=' $(TESTS) '; \
536 if test -n "$$list"; then \
537@@ -331,7 +332,7 @@
538 if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
539 all=`expr $$all + 1`; \
540 case " $(XFAIL_TESTS) " in \
541- *$$ws$$tst$$ws*) \
542+ *[\ \ ]$$tst[\ \ ]*) \
543 xpass=`expr $$xpass + 1`; \
544 failed=`expr $$failed + 1`; \
545 echo "XPASS: $$tst"; \
546@@ -343,7 +344,7 @@
547 elif test $$? -ne 77; then \
548 all=`expr $$all + 1`; \
549 case " $(XFAIL_TESTS) " in \
550- *$$ws$$tst$$ws*) \
551+ *[\ \ ]$$tst[\ \ ]*) \
552 xfail=`expr $$xfail + 1`; \
553 echo "XFAIL: $$tst"; \
554 ;; \
555@@ -357,23 +358,36 @@
556 echo "SKIP: $$tst"; \
557 fi; \
558 done; \
559+ if test "$$all" -eq 1; then \
560+ tests="test"; \
561+ All=""; \
562+ else \
563+ tests="tests"; \
564+ All="All "; \
565+ fi; \
566 if test "$$failed" -eq 0; then \
567 if test "$$xfail" -eq 0; then \
568- banner="All $$all tests passed"; \
569+ banner="$$All$$all $$tests passed"; \
570 else \
571- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
572+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
573+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
574 fi; \
575 else \
576 if test "$$xpass" -eq 0; then \
577- banner="$$failed of $$all tests failed"; \
578+ banner="$$failed of $$all $$tests failed"; \
579 else \
580- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
581+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
582+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
583 fi; \
584 fi; \
585 dashes="$$banner"; \
586 skipped=""; \
587 if test "$$skip" -ne 0; then \
588- skipped="($$skip tests were not run)"; \
589+ if test "$$skip" -eq 1; then \
590+ skipped="($$skip test was not run)"; \
591+ else \
592+ skipped="($$skip tests were not run)"; \
593+ fi; \
594 test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
595 dashes="$$skipped"; \
596 fi; \
597
598=== modified file 'checks/armor.test'
599--- checks/armor.test 2006-11-03 09:18:26 +0000
600+++ checks/armor.test 2011-02-22 09:58:14 +0000
601@@ -177,5 +177,578 @@
602 $GPG --import x || error "the $i bug is back in town"
603
604
605-
606-
607+nopad_armored_msg='-----BEGIN PGP MESSAGE-----
608+Version: GnuPG v1.4.11-svn5139 (GNU/Linux)
609+
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
1122+=3akT
1123+-----END PGP MESSAGE-----
1124+
1125+'
1126+
1127+alpha_seckey='-----BEGIN PGP PRIVATE KEY BLOCK-----
1128+Version: GnuPG v1.4.8 (GNU/Linux)
1129+
1130+lQHhBDbjjp4RBAC2ZbFDX0wmJI8yLDYQdIiZeAuHLmfyHsqXaLGUMZtWiAvn/hNp
1131+ctwahmzKm5oXinHUvUkLOQ0s8rOlu15nhw4azc30rTP1LsIkn5zORNnFdgYC6RKy
1132+hOeim/63+/yGtdnTm49lVfaCqwsEmBCEkXaeWDGq+ie1b89J89T6n/JquwCgoQkj
1133+VeVGG+B/SzJ6+yifdHWQVkcD/RXDyLXX4+WHGP2aet51XlKojWGwsZmc9LPPYhwU
1134+/RcUO7ce1QQb0XFlUVFBhY0JQpM/ty/kNi+aGWFzigbQ+HAWZkUvA8+VIAVneN+p
1135++SHhGIyLTXKpAYTq46AwvllZ5Cpvf02Cp/+W1aVyA0qnBWMyeIxXmR9HOi6lxxn5
1136+cjajA/9VZufOXWqCXkBvz4Oy3Q5FbjQQ0/+ty8rDn8OTaiPi41FyUnEi6LO+qyBS
1137+09FjnZj++PkcRcXW99SNxmEJRY7MuNHt5wIvEH2jNEOJ9lszzZFBDbuwsjXHK35+
1138+lPbGEy69xCP26iEafysKKbRXJhE1C+tk8SnK+Gm62sivmK/5av4CAwKcF1Qep+Pf
1139+ssOqtJhr+klruUBf55onBJi4vkk0gK3m32p/05YB2bbMURGz8R4JxUZfUxjdDk73
1140+LaNYRbQpQWxwaGEgVGVzdCAoZGVtbyBrZXkpIDxhbHBoYUBleGFtcGxlLm5ldD6I
1141+VQQTEQIAFQUCNuOOngMLCgMDFQMCAxYCAQIXgAAKCRAtcnzHaGl3NDl4AJ4rouHB
1142++LpCkNi5C59jHEa1kbANzACgmddtrNSj1yPyTCwUwRghPUomECS0EEFsaWNlIChk
1143+ZW1vIGtleSmIVQQTEQIAFQUCNuO2qwMLCgMDFQMCAxYCAQIXgAAKCRAtcnzHaGl3
1144+NCeMAJ9MeUVrago5Jc6PdwdeN5OMwby37QCghW65cZTQlD1bBlIq/QM8bz9AN4G0
1145+J0FsZmEgVGVzdCAoZGVtbyBrZXkpIDxhbGZhQGV4YW1wbGUubmV0PohVBBMRAgAV
1146+BQI247hYAwsKAwMVAwIDFgIBAheAAAoJEC1yfMdoaXc0t8IAoJPwa6j+Vm5Vi3Nv
1147+uo8JZri4PJ/DAJ9dqbmaJdB8FdJnHfGh1rXK3y/Jcp0BuAQ2448PEAQAnI3XH1f0
1148+uyN9fZnw72zsHMw706g7EW29nD4UDQG4OzRZViSrUa5n39eI7QrfTO+1meVvs0y8
1149+F/PvFst5jH68rPLnGSrXz4sTl1T4cop1FBkquvCAKwPLy0lE7jjtCyItOSwIOo8x
1150+oTfY4JEEXmcqsbm+KHv9yYSF/YK4Cf7bIzcAAwcD/Rnl5jKxoucDA96pD2829TKs
1151+LFQSau+Xiy8bvOSSDdlyABsOkNBSaeKO3eAQEKgDM7dzjVNTnAlpQ0EQ8Y9Z8pxO
1152+WYEQYlaMrnRBC4DZ2IadzEhLlIOz5BVp/jfhrr8oVVBwKZXsrz9PZLz+e4Yn+siU
1153+Uvlei9boD9L2ZgSOHakP/gIDApwXVB6n49+yw6e5k2VJBGTFDkQbxpgi4oslePpT
1154+7Tc2qjAke4zO8JHkgKSokEgnMpMz412q9otFX/3qC5MpPG5P8f4r00Kfy9Am/thk
1155+ri01WTIUqF8L/VZXJxLKVoRAabSXudG0eavfah14fN5/+Bw5i8vSHhc/xmQEKTya
1156+2X8Nt1F5zMrE1LAGVVCL9i/DUygnJYOZzAd1Ct0RJ4kFj7lOBICF2IWWiEYEGBEC
1157+AAYFAjbjjw8ACgkQLXJ8x2hpdzQgqQCgn81AaW8W/lyVwMh/UBeMuVMUb24An2uz
1158+wg7Md81a5RI3F2FG8747t9gX
1159+=VM1e
1160+-----END PGP PRIVATE KEY BLOCK-----
1161+'
1162+
1163+# Bug 1179 solved 2010-05-12:
1164+# It occured for messages of a multiple of the iobuf block size where
1165+# the last line had no pad character. Due to premature popping of the
1166+# armor filter gpg swalled the CRC line and passed the '-----END...'
1167+# line on to the decryption layer.
1168+
1169+i=alpha_seckey
1170+info "importing: $i"
1171+eval "(IFS=; echo \"\$$i\")" >x
1172+$GPG --import x || true
1173+
1174+i=nopad_armored_msg
1175+info "checking: $i"
1176+eval "(IFS=; echo \"\$$i\")" >x
1177+if echo "abc" | $GPG --passphrase-fd 0 -o - x > /dev/null ; then
1178+ :
1179+else
1180+ error "bug#1179 is back in town"
1181+fi
1182
1183=== modified file 'cipher/ChangeLog'
1184--- cipher/ChangeLog 2009-09-05 15:43:18 +0000
1185+++ cipher/ChangeLog 2011-02-22 09:58:14 +0000
1186@@ -1,3 +1,19 @@
1187+2010-10-18 Werner Koch <wk@g10code.com>
1188+
1189+ * rndw32.c (slow_gatherer_windowsNT): Add GNUPG_RNDW32_NOPERF envvar.
1190+
1191+2010-09-28 Steven M. Schweda <sms@antinode.info> (wk)
1192+
1193+ Changes to help the VMS port. See
1194+ http://antinode.info/dec/sw/gnupg.html .
1195+
1196+ * random.c [__VMS]: Include rmsdef.h and vms.h.
1197+ (LOCK_SEED_FILE) [__VMS]: Set to 0.
1198+ (getfnc_gather_random) [USE_RNDVMS]: Call rndvms_gather_random.
1199+ (read_seed_file) [__VMS]: Allow reading by others.
1200+ (update_random_seed_file) [__VMS]: Use VMS specific open call.
1201+ * rand-internal.h (rndvms_gather_random): New.
1202+
1203 2008-04-17 David Shaw <dshaw@jabberwocky.com>
1204
1205 * camellia-glue.c (selftest, camellia_get_info), cipher.c
1206
1207=== modified file 'cipher/Makefile.in'
1208--- cipher/Makefile.in 2009-09-05 15:43:18 +0000
1209+++ cipher/Makefile.in 2011-02-22 09:58:14 +0000
1210@@ -1,4 +1,4 @@
1211-# Makefile.in generated by automake 1.10.1 from Makefile.am.
1212+# Makefile.in generated by automake 1.10.2 from Makefile.am.
1213 # @configure_input@
1214
1215 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1216@@ -155,7 +155,6 @@
1217 ECHO_T = @ECHO_T@
1218 EGREP = @EGREP@
1219 EXEEXT = @EXEEXT@
1220-FAQPROG = @FAQPROG@
1221 GENCAT = @GENCAT@
1222 GETOPT = @GETOPT@
1223 GLIBC2 = @GLIBC2@
1224@@ -224,6 +223,7 @@
1225 PACKAGE_NAME = @PACKAGE_NAME@
1226 PACKAGE_STRING = @PACKAGE_STRING@
1227 PACKAGE_TARNAME = @PACKAGE_TARNAME@
1228+PACKAGE_URL = @PACKAGE_URL@
1229 PACKAGE_VERSION = @PACKAGE_VERSION@
1230 PATH_SEPARATOR = @PATH_SEPARATOR@
1231 PERL = @PERL@
1232@@ -292,6 +292,7 @@
1233 srcdir = @srcdir@
1234 sysconfdir = @sysconfdir@
1235 target_alias = @target_alias@
1236+top_build_prefix = @top_build_prefix@
1237 top_builddir = @top_builddir@
1238 top_srcdir = @top_srcdir@
1239 AM_CPPFLAGS = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl \
1240@@ -315,8 +316,8 @@
1241 @for dep in $?; do \
1242 case '$(am__configure_deps)' in \
1243 *$$dep*) \
1244- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1245- && exit 0; \
1246+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1247+ && { if test -f $@; then exit 0; else break; fi; }; \
1248 exit 1;; \
1249 esac; \
1250 done; \
1251@@ -401,7 +402,7 @@
1252 unique=`for i in $$list; do \
1253 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1254 done | \
1255- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
1256+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1257 END { if (nonempty) { for (i in files) print i; }; }'`; \
1258 mkid -fID $$unique
1259 tags: TAGS
1260
1261=== modified file 'cipher/rand-internal.h'
1262--- cipher/rand-internal.h 2008-07-24 22:25:09 +0000
1263+++ cipher/rand-internal.h 2011-02-22 09:58:14 +0000
1264@@ -23,6 +23,8 @@
1265 int requester, size_t length, int level);
1266 int rndlinux_gather_random (void (*add)(const void*, size_t, int),
1267 int requester, size_t length, int level);
1268+int rndvms_gather_random (void (*add)(const void*, size_t, int),
1269+ int requester, size_t length, int level);
1270 int rndegd_connect_socket (int nofail);
1271 int rndegd_gather_random (void (*add)(const void*, size_t, int),
1272 int requester, size_t length, int level );
1273
1274=== modified file 'cipher/random.c'
1275--- cipher/random.c 2008-07-24 22:25:09 +0000
1276+++ cipher/random.c 2011-02-22 09:58:14 +0000
1277@@ -63,13 +63,23 @@
1278 #include "rand-internal.h"
1279 #include "algorithms.h"
1280
1281+#ifdef __VMS
1282+# include <rmsdef.h>
1283+# include "vms.h"
1284+#endif /* def __VMS */
1285+
1286 #ifndef RAND_MAX /* for SunOS */
1287 #define RAND_MAX 32767
1288 #endif
1289
1290+/* 2008-03-31 SMS.
1291+ * VMS C RTL before V8.3 lacks byte-range file locking, but by default,
1292+ * a file opened for write access is not shared, so mutual exclusion can
1293+ * most generally be handled at the open(). */
1294
1295 /* Check whether we can lock the seed file read write. */
1296-#if defined(HAVE_FCNTL) && defined(HAVE_FTRUNCATE) && !defined(HAVE_W32_SYSTEM)
1297+#if defined(HAVE_FCNTL) && defined(HAVE_FTRUNCATE) \
1298+ && !defined(HAVE_W32_SYSTEM) && !defined(__VMS)
1299 #define LOCK_SEED_FILE 1
1300 #else
1301 #define LOCK_SEED_FILE 0
1302@@ -177,6 +187,9 @@
1303 # ifdef USE_RNDUNIX
1304 return rndunix_gather_random;
1305 # endif
1306+# ifdef USE_RNDVMS
1307+ return rndvms_gather_random;
1308+# endif
1309 # ifdef USE_RNDEGD
1310 return rndegd_gather_random;
1311 # endif
1312@@ -402,7 +415,7 @@
1313 return -1;
1314 }
1315
1316- if (backoff > 2) /* Show the first message after ~2.25 seconds. */
1317+ if (backoff > 2) /* Show the first message after ~3.75 seconds. */
1318 log_info( _("waiting for lock on `%s'...\n"), fname);
1319
1320 tv.tv_sec = backoff;
1321@@ -434,6 +447,9 @@
1322
1323 #if defined(HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__)
1324 fd = open( seed_file_name, O_RDONLY | O_BINARY );
1325+#elif defined( __VMS)
1326+ /* We're only reading, so allow others to do anything. */
1327+ fd = open( seed_file_name, O_RDONLY, 0777, "shr=get,put,upd" );
1328 #else
1329 fd = open( seed_file_name, O_RDONLY );
1330 #endif
1331@@ -535,11 +551,40 @@
1332 # if LOCK_SEED_FILE
1333 fd = open( seed_file_name, O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR );
1334 # else
1335+# ifdef __VMS
1336+ /* Open the seed file for exclusive write access, but allow other
1337+ * readers. Loop until success. Complain after a few failures. */
1338+ {
1339+ int backoff = 0;
1340+
1341+ while ((fd = open( seed_file_name,
1342+ O_WRONLY|O_CREAT,
1343+ S_IRUSR|S_IWUSR,
1344+ "shr=get")) == -1 )
1345+ {
1346+ if ((errno != EVMSERR) || (vaxc$errno != RMS$_FLK))
1347+ {
1348+ /* Some unexpected open failure. */
1349+ log_info (_("can't lock `%s': %s\n"),
1350+ seed_file_name, strerror (errno));
1351+ return;
1352+ }
1353+
1354+ if (backoff > 2) /* Show the first message after ~3.75 seconds. */
1355+ log_info( _("waiting for lock on `%s'...\n"), seed_file_name);
1356+
1357+ wait_vms( backoff+ 0.25);
1358+ if (backoff < 10)
1359+ backoff++ ;
1360+ }
1361+ }
1362+# else /* !def __VMS */
1363 fd = open( seed_file_name, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR );
1364+# endif /* !def __VMS */
1365 # endif
1366 #endif
1367 if( fd == -1 ) {
1368- log_info(_("can't create `%s': %s\n"), seed_file_name, strerror(errno) );
1369+ log_info(_("can't create `%s': %s\n"), seed_file_name, strerror(errno));
1370 return;
1371 }
1372
1373
1374=== modified file 'cipher/rndw32.c'
1375--- cipher/rndw32.c 2008-07-24 22:25:09 +0000
1376+++ cipher/rndw32.c 2011-02-22 09:58:14 +0000
1377@@ -477,6 +477,17 @@
1378 * worst-case estimate which is usually nowhere near the actual amount
1379 * required. For example it may report that 128K of memory is required,
1380 * but only return 64K of data */
1381+ if (getenv("GNUPG_RNDW32_NOPERF"))
1382+ {
1383+ static int shown;
1384+
1385+ if (!shown)
1386+ {
1387+ shown = 1;
1388+ g10_log_info ("note: get performance data has been disabled\n");
1389+ }
1390+ }
1391+ else
1392 { pPerfData = xmalloc (cbPerfData);
1393 for (;;) {
1394 dwSize = cbPerfData;
1395
1396=== modified file 'config.h.in'
1397--- config.h.in 2010-01-04 20:06:01 +0000
1398+++ config.h.in 2011-02-22 09:58:14 +0000
1399@@ -640,6 +640,9 @@
1400 /* Define to the one symbol short name of this package. */
1401 #undef PACKAGE_TARNAME
1402
1403+/* Define to the home page for this package. */
1404+#undef PACKAGE_URL
1405+
1406 /* Define to the version of this package. */
1407 #undef PACKAGE_VERSION
1408
1409@@ -785,6 +788,28 @@
1410 made weak. */
1411 #undef USE_SOLARIS_THREADS_WEAK
1412
1413+/* Enable extensions on AIX 3, Interix. */
1414+#ifndef _ALL_SOURCE
1415+# undef _ALL_SOURCE
1416+#endif
1417+/* Enable GNU extensions on systems that have them. */
1418+#ifndef _GNU_SOURCE
1419+# undef _GNU_SOURCE
1420+#endif
1421+/* Enable threading extensions on Solaris. */
1422+#ifndef _POSIX_PTHREAD_SEMANTICS
1423+# undef _POSIX_PTHREAD_SEMANTICS
1424+#endif
1425+/* Enable extensions on HP NonStop. */
1426+#ifndef _TANDEM_SOURCE
1427+# undef _TANDEM_SOURCE
1428+#endif
1429+/* Enable general extensions on Solaris. */
1430+#ifndef __EXTENSIONS__
1431+# undef __EXTENSIONS__
1432+#endif
1433+
1434+
1435 /* Define to include the TWOFISH cipher */
1436 #undef USE_TWOFISH
1437
1438@@ -800,17 +825,22 @@
1439 /* Number of bits in a file offset, on hosts where this is settable. */
1440 #undef _FILE_OFFSET_BITS
1441
1442-/* Enable GNU extensions on systems that have them. */
1443-#ifndef _GNU_SOURCE
1444-# undef _GNU_SOURCE
1445-#endif
1446-
1447 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
1448 #undef _LARGEFILE_SOURCE
1449
1450 /* Define for large files, on AIX-style hosts. */
1451 #undef _LARGE_FILES
1452
1453+/* Define to 1 if on MINIX. */
1454+#undef _MINIX
1455+
1456+/* Define to 2 if the system does not provide POSIX.1 features except with
1457+ this defined. */
1458+#undef _POSIX_1_SOURCE
1459+
1460+/* Define to 1 if you need to in order for `stat' and other things to work. */
1461+#undef _POSIX_SOURCE
1462+
1463 /* Define to empty if `const' does not conform to ANSI C. */
1464 #undef const
1465
1466@@ -883,6 +913,14 @@
1467 # define PATHSEP_S ":"
1468 #endif
1469
1470+#ifdef __VMS
1471+# define GNUPG_BAK_SFX "_bak"
1472+# define GNUPG_TMP_SFX "_tmp"
1473+#else /*!def __VMS */
1474+# define GNUPG_BAK_SFX "~"
1475+# define GNUPG_TMP_SFX EXTSEP_S "tmp"
1476+#endif /* def __VMS [else] */
1477+
1478
1479 /* For some OSes we need to use fixed strings for certain directories. */
1480 #ifdef HAVE_DRIVE_LETTERS
1481@@ -893,7 +931,10 @@
1482 # define GNUPG_HOMEDIR "c:\\\\gnupg"
1483 #else
1484 # ifdef __VMS
1485-# define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg"
1486+# define GNUPG_DATADIR "/SYS$MANAGER/gnupg_share"
1487+# define GNUPG_HOMEDIR "/SYS$LOGIN/gnupg"
1488+# define GNUPG_LIBDIR "/SYS$MANAGER/gnupg_share"
1489+# define GNUPG_LIBEXECDIR ""
1490 # else
1491 # define GNUPG_HOMEDIR "~/.gnupg"
1492 # endif
1493
1494=== modified file 'configure'
1495--- configure 2009-09-05 15:43:18 +0000
1496+++ configure 2011-02-22 09:58:14 +0000
1497@@ -1,62 +1,83 @@
1498 #! /bin/sh
1499 # Guess values for system-dependent variables and create Makefiles.
1500-# Generated by GNU Autoconf 2.61 for gnupg 1.4.10.
1501+# Generated by GNU Autoconf 2.64 for gnupg 1.4.11.
1502 #
1503 # Report bugs to <bug-gnupg@gnu.org>.
1504 #
1505 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1506-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
1507+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
1508+# Foundation, Inc.
1509+#
1510 # This configure script is free software; the Free Software Foundation
1511 # gives unlimited permission to copy, distribute and modify it.
1512-## --------------------- ##
1513-## M4sh Initialization. ##
1514-## --------------------- ##
1515+## -------------------- ##
1516+## M4sh Initialization. ##
1517+## -------------------- ##
1518
1519 # Be more Bourne compatible
1520 DUALCASE=1; export DUALCASE # for MKS sh
1521-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1522+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
1523 emulate sh
1524 NULLCMD=:
1525- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
1526+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
1527 # is contrary to our usage. Disable this feature.
1528 alias -g '${1+"$@"}'='"$@"'
1529 setopt NO_GLOB_SUBST
1530 else
1531- case `(set -o) 2>/dev/null` in
1532- *posix*) set -o posix ;;
1533+ case `(set -o) 2>/dev/null` in #(
1534+ *posix*) :
1535+ set -o posix ;; #(
1536+ *) :
1537+ ;;
1538 esac
1539-
1540-fi
1541-
1542-
1543-
1544-
1545-# PATH needs CR
1546-# Avoid depending upon Character Ranges.
1547-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
1548-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
1549-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
1550-as_cr_digits='0123456789'
1551-as_cr_alnum=$as_cr_Letters$as_cr_digits
1552+fi
1553+
1554+
1555+as_nl='
1556+'
1557+export as_nl
1558+# Printing a long string crashes Solaris 7 /usr/bin/printf.
1559+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
1560+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
1561+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
1562+# Prefer a ksh shell builtin over an external printf program on Solaris,
1563+# but without wasting forks for bash or zsh.
1564+if test -z "$BASH_VERSION$ZSH_VERSION" \
1565+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
1566+ as_echo='print -r --'
1567+ as_echo_n='print -rn --'
1568+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
1569+ as_echo='printf %s\n'
1570+ as_echo_n='printf %s'
1571+else
1572+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
1573+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
1574+ as_echo_n='/usr/ucb/echo -n'
1575+ else
1576+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
1577+ as_echo_n_body='eval
1578+ arg=$1;
1579+ case $arg in #(
1580+ *"$as_nl"*)
1581+ expr "X$arg" : "X\\(.*\\)$as_nl";
1582+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
1583+ esac;
1584+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
1585+ '
1586+ export as_echo_n_body
1587+ as_echo_n='sh -c $as_echo_n_body as_echo'
1588+ fi
1589+ export as_echo_body
1590+ as_echo='sh -c $as_echo_body as_echo'
1591+fi
1592
1593 # The user is always right.
1594 if test "${PATH_SEPARATOR+set}" != set; then
1595- echo "#! /bin/sh" >conf$$.sh
1596- echo "exit 0" >>conf$$.sh
1597- chmod +x conf$$.sh
1598- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
1599- PATH_SEPARATOR=';'
1600- else
1601- PATH_SEPARATOR=:
1602- fi
1603- rm -f conf$$.sh
1604-fi
1605-
1606-# Support unset when possible.
1607-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
1608- as_unset=unset
1609-else
1610- as_unset=false
1611+ PATH_SEPARATOR=:
1612+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
1613+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
1614+ PATH_SEPARATOR=';'
1615+ }
1616 fi
1617
1618
1619@@ -65,20 +86,18 @@
1620 # there to prevent editors from complaining about space-tab.
1621 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
1622 # splitting by setting IFS to empty value.)
1623-as_nl='
1624-'
1625 IFS=" "" $as_nl"
1626
1627 # Find who we are. Look in the path if we contain no directory separator.
1628-case $0 in
1629+case $0 in #((
1630 *[\\/]* ) as_myself=$0 ;;
1631 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1632 for as_dir in $PATH
1633 do
1634 IFS=$as_save_IFS
1635 test -z "$as_dir" && as_dir=.
1636- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
1637-done
1638+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
1639+ done
1640 IFS=$as_save_IFS
1641
1642 ;;
1643@@ -89,354 +108,322 @@
1644 as_myself=$0
1645 fi
1646 if test ! -f "$as_myself"; then
1647- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
1648- { (exit 1); exit 1; }
1649+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
1650+ exit 1
1651 fi
1652
1653-# Work around bugs in pre-3.0 UWIN ksh.
1654-for as_var in ENV MAIL MAILPATH
1655-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1656+# Unset variables that we do not need and which cause bugs (e.g. in
1657+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
1658+# suppresses any "Segmentation fault" message there. '((' could
1659+# trigger a bug in pdksh 5.2.14.
1660+for as_var in BASH_ENV ENV MAIL MAILPATH
1661+do eval test x\${$as_var+set} = xset \
1662+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
1663 done
1664 PS1='$ '
1665 PS2='> '
1666 PS4='+ '
1667
1668 # NLS nuisances.
1669-for as_var in \
1670- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
1671- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
1672- LC_TELEPHONE LC_TIME
1673-do
1674- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
1675- eval $as_var=C; export $as_var
1676- else
1677- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1678- fi
1679-done
1680-
1681-# Required to use basename.
1682-if expr a : '\(a\)' >/dev/null 2>&1 &&
1683- test "X`expr 00001 : '.*\(...\)'`" = X001; then
1684- as_expr=expr
1685-else
1686- as_expr=false
1687-fi
1688-
1689-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
1690- as_basename=basename
1691-else
1692- as_basename=false
1693-fi
1694-
1695-
1696-# Name of the executable.
1697-as_me=`$as_basename -- "$0" ||
1698-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
1699- X"$0" : 'X\(//\)$' \| \
1700- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
1701-echo X/"$0" |
1702- sed '/^.*\/\([^/][^/]*\)\/*$/{
1703- s//\1/
1704- q
1705- }
1706- /^X\/\(\/\/\)$/{
1707- s//\1/
1708- q
1709- }
1710- /^X\/\(\/\).*/{
1711- s//\1/
1712- q
1713- }
1714- s/.*/./; q'`
1715+LC_ALL=C
1716+export LC_ALL
1717+LANGUAGE=C
1718+export LANGUAGE
1719
1720 # CDPATH.
1721-$as_unset CDPATH
1722-
1723+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1724
1725 if test "x$CONFIG_SHELL" = x; then
1726- if (eval ":") 2>/dev/null; then
1727+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
1728+ emulate sh
1729+ NULLCMD=:
1730+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
1731+ # is contrary to our usage. Disable this feature.
1732+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
1733+ setopt NO_GLOB_SUBST
1734+else
1735+ case \`(set -o) 2>/dev/null\` in #(
1736+ *posix*) :
1737+ set -o posix ;; #(
1738+ *) :
1739+ ;;
1740+esac
1741+fi
1742+"
1743+ as_required="as_fn_return () { (exit \$1); }
1744+as_fn_success () { as_fn_return 0; }
1745+as_fn_failure () { as_fn_return 1; }
1746+as_fn_ret_success () { return 0; }
1747+as_fn_ret_failure () { return 1; }
1748+
1749+exitcode=0
1750+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
1751+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
1752+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
1753+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
1754+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
1755+
1756+else
1757+ exitcode=1; echo positional parameters were not saved.
1758+fi
1759+test x\$exitcode = x0 || exit 1"
1760+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
1761+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
1762+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
1763+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
1764+test \$(( 1 + 1 )) = 2 || exit 1"
1765+ if (eval "$as_required") 2>/dev/null; then :
1766 as_have_required=yes
1767 else
1768 as_have_required=no
1769 fi
1770-
1771- if test $as_have_required = yes && (eval ":
1772-(as_func_return () {
1773- (exit \$1)
1774-}
1775-as_func_success () {
1776- as_func_return 0
1777-}
1778-as_func_failure () {
1779- as_func_return 1
1780-}
1781-as_func_ret_success () {
1782- return 0
1783-}
1784-as_func_ret_failure () {
1785- return 1
1786-}
1787-
1788-exitcode=0
1789-if as_func_success; then
1790- :
1791-else
1792- exitcode=1
1793- echo as_func_success failed.
1794-fi
1795-
1796-if as_func_failure; then
1797- exitcode=1
1798- echo as_func_failure succeeded.
1799-fi
1800-
1801-if as_func_ret_success; then
1802- :
1803-else
1804- exitcode=1
1805- echo as_func_ret_success failed.
1806-fi
1807-
1808-if as_func_ret_failure; then
1809- exitcode=1
1810- echo as_func_ret_failure succeeded.
1811-fi
1812-
1813-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
1814- :
1815-else
1816- exitcode=1
1817- echo positional parameters were not saved.
1818-fi
1819-
1820-test \$exitcode = 0) || { (exit 1); exit 1; }
1821-
1822-(
1823- as_lineno_1=\$LINENO
1824- as_lineno_2=\$LINENO
1825- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
1826- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
1827-") 2> /dev/null; then
1828- :
1829-else
1830- as_candidate_shells=
1831- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1832+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
1833+
1834+else
1835+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1836+as_found=false
1837 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
1838 do
1839 IFS=$as_save_IFS
1840 test -z "$as_dir" && as_dir=.
1841- case $as_dir in
1842+ as_found=:
1843+ case $as_dir in #(
1844 /*)
1845 for as_base in sh bash ksh sh5; do
1846- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
1847+ # Try only shells that exist, to save several forks.
1848+ as_shell=$as_dir/$as_base
1849+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
1850+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
1851+ CONFIG_SHELL=$as_shell as_have_required=yes
1852+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
1853+ break 2
1854+fi
1855+fi
1856 done;;
1857 esac
1858+ as_found=false
1859 done
1860+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
1861+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
1862+ CONFIG_SHELL=$SHELL as_have_required=yes
1863+fi; }
1864 IFS=$as_save_IFS
1865
1866
1867- for as_shell in $as_candidate_shells $SHELL; do
1868- # Try only shells that exist, to save several forks.
1869- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
1870- { ("$as_shell") 2> /dev/null <<\_ASEOF
1871-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1872- emulate sh
1873- NULLCMD=:
1874- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
1875- # is contrary to our usage. Disable this feature.
1876- alias -g '${1+"$@"}'='"$@"'
1877- setopt NO_GLOB_SUBST
1878-else
1879- case `(set -o) 2>/dev/null` in
1880- *posix*) set -o posix ;;
1881-esac
1882-
1883-fi
1884-
1885-
1886-:
1887-_ASEOF
1888-}; then
1889- CONFIG_SHELL=$as_shell
1890- as_have_required=yes
1891- if { "$as_shell" 2> /dev/null <<\_ASEOF
1892-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1893- emulate sh
1894- NULLCMD=:
1895- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
1896- # is contrary to our usage. Disable this feature.
1897- alias -g '${1+"$@"}'='"$@"'
1898- setopt NO_GLOB_SUBST
1899-else
1900- case `(set -o) 2>/dev/null` in
1901- *posix*) set -o posix ;;
1902-esac
1903-
1904-fi
1905-
1906-
1907-:
1908-(as_func_return () {
1909- (exit $1)
1910-}
1911-as_func_success () {
1912- as_func_return 0
1913-}
1914-as_func_failure () {
1915- as_func_return 1
1916-}
1917-as_func_ret_success () {
1918- return 0
1919-}
1920-as_func_ret_failure () {
1921- return 1
1922-}
1923-
1924-exitcode=0
1925-if as_func_success; then
1926- :
1927-else
1928- exitcode=1
1929- echo as_func_success failed.
1930-fi
1931-
1932-if as_func_failure; then
1933- exitcode=1
1934- echo as_func_failure succeeded.
1935-fi
1936-
1937-if as_func_ret_success; then
1938- :
1939-else
1940- exitcode=1
1941- echo as_func_ret_success failed.
1942-fi
1943-
1944-if as_func_ret_failure; then
1945- exitcode=1
1946- echo as_func_ret_failure succeeded.
1947-fi
1948-
1949-if ( set x; as_func_ret_success y && test x = "$1" ); then
1950- :
1951-else
1952- exitcode=1
1953- echo positional parameters were not saved.
1954-fi
1955-
1956-test $exitcode = 0) || { (exit 1); exit 1; }
1957-
1958-(
1959- as_lineno_1=$LINENO
1960- as_lineno_2=$LINENO
1961- test "x$as_lineno_1" != "x$as_lineno_2" &&
1962- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
1963-
1964-_ASEOF
1965-}; then
1966- break
1967-fi
1968-
1969-fi
1970-
1971- done
1972-
1973- if test "x$CONFIG_SHELL" != x; then
1974- for as_var in BASH_ENV ENV
1975- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1976- done
1977- export CONFIG_SHELL
1978- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
1979-fi
1980-
1981-
1982- if test $as_have_required = no; then
1983- echo This script requires a shell more modern than all the
1984- echo shells that I found on your system. Please install a
1985- echo modern shell, or manually run the script under such a
1986- echo shell if you do have one.
1987- { (exit 1); exit 1; }
1988-fi
1989-
1990-
1991-fi
1992-
1993-fi
1994-
1995-
1996-
1997-(eval "as_func_return () {
1998- (exit \$1)
1999-}
2000-as_func_success () {
2001- as_func_return 0
2002-}
2003-as_func_failure () {
2004- as_func_return 1
2005-}
2006-as_func_ret_success () {
2007- return 0
2008-}
2009-as_func_ret_failure () {
2010- return 1
2011-}
2012-
2013-exitcode=0
2014-if as_func_success; then
2015- :
2016-else
2017- exitcode=1
2018- echo as_func_success failed.
2019-fi
2020-
2021-if as_func_failure; then
2022- exitcode=1
2023- echo as_func_failure succeeded.
2024-fi
2025-
2026-if as_func_ret_success; then
2027- :
2028-else
2029- exitcode=1
2030- echo as_func_ret_success failed.
2031-fi
2032-
2033-if as_func_ret_failure; then
2034- exitcode=1
2035- echo as_func_ret_failure succeeded.
2036-fi
2037-
2038-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
2039- :
2040-else
2041- exitcode=1
2042- echo positional parameters were not saved.
2043-fi
2044-
2045-test \$exitcode = 0") || {
2046- echo No shell found that supports shell functions.
2047- echo Please tell autoconf@gnu.org about your system,
2048- echo including any error possibly output before this
2049- echo message
2050-}
2051-
2052-
2053-
2054- as_lineno_1=$LINENO
2055- as_lineno_2=$LINENO
2056- test "x$as_lineno_1" != "x$as_lineno_2" &&
2057- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
2058-
2059- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
2060- # uniformly replaced by the line number. The first 'sed' inserts a
2061- # line-number line after each line using $LINENO; the second 'sed'
2062- # does the real work. The second script uses 'N' to pair each
2063- # line-number line with the line containing $LINENO, and appends
2064- # trailing '-' during substitution so that $LINENO is not a special
2065- # case at line end.
2066- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
2067- # scripts with optimization help from Paolo Bonzini. Blame Lee
2068- # E. McMahon (1931-1989) for sed's syntax. :-)
2069+ if test "x$CONFIG_SHELL" != x; then :
2070+ # We cannot yet assume a decent shell, so we have to provide a
2071+ # neutralization value for shells without unset; and this also
2072+ # works around shells that cannot unset nonexistent variables.
2073+ BASH_ENV=/dev/null
2074+ ENV=/dev/null
2075+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
2076+ export CONFIG_SHELL
2077+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
2078+fi
2079+
2080+ if test x$as_have_required = xno; then :
2081+ $as_echo "$0: This script requires a shell more modern than all"
2082+ $as_echo "$0: the shells that I found on your system."
2083+ if test x${ZSH_VERSION+set} = xset ; then
2084+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
2085+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
2086+ else
2087+ $as_echo "$0: Please tell bug-autoconf@gnu.org and bug-gnupg@gnu.org
2088+$0: about your system, including any error possibly output
2089+$0: before this message. Then install a modern shell, or
2090+$0: manually run the script under such a shell if you do
2091+$0: have one."
2092+ fi
2093+ exit 1
2094+fi
2095+fi
2096+fi
2097+SHELL=${CONFIG_SHELL-/bin/sh}
2098+export SHELL
2099+# Unset more variables known to interfere with behavior of common tools.
2100+CLICOLOR_FORCE= GREP_OPTIONS=
2101+unset CLICOLOR_FORCE GREP_OPTIONS
2102+
2103+## --------------------- ##
2104+## M4sh Shell Functions. ##
2105+## --------------------- ##
2106+# as_fn_unset VAR
2107+# ---------------
2108+# Portably unset VAR.
2109+as_fn_unset ()
2110+{
2111+ { eval $1=; unset $1;}
2112+}
2113+as_unset=as_fn_unset
2114+
2115+# as_fn_set_status STATUS
2116+# -----------------------
2117+# Set $? to STATUS, without forking.
2118+as_fn_set_status ()
2119+{
2120+ return $1
2121+} # as_fn_set_status
2122+
2123+# as_fn_exit STATUS
2124+# -----------------
2125+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
2126+as_fn_exit ()
2127+{
2128+ set +e
2129+ as_fn_set_status $1
2130+ exit $1
2131+} # as_fn_exit
2132+
2133+# as_fn_mkdir_p
2134+# -------------
2135+# Create "$as_dir" as a directory, including parents if necessary.
2136+as_fn_mkdir_p ()
2137+{
2138+
2139+ case $as_dir in #(
2140+ -*) as_dir=./$as_dir;;
2141+ esac
2142+ test -d "$as_dir" || eval $as_mkdir_p || {
2143+ as_dirs=
2144+ while :; do
2145+ case $as_dir in #(
2146+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
2147+ *) as_qdir=$as_dir;;
2148+ esac
2149+ as_dirs="'$as_qdir' $as_dirs"
2150+ as_dir=`$as_dirname -- "$as_dir" ||
2151+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
2152+ X"$as_dir" : 'X\(//\)[^/]' \| \
2153+ X"$as_dir" : 'X\(//\)$' \| \
2154+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
2155+$as_echo X"$as_dir" |
2156+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
2157+ s//\1/
2158+ q
2159+ }
2160+ /^X\(\/\/\)[^/].*/{
2161+ s//\1/
2162+ q
2163+ }
2164+ /^X\(\/\/\)$/{
2165+ s//\1/
2166+ q
2167+ }
2168+ /^X\(\/\).*/{
2169+ s//\1/
2170+ q
2171+ }
2172+ s/.*/./; q'`
2173+ test -d "$as_dir" && break
2174+ done
2175+ test -z "$as_dirs" || eval "mkdir $as_dirs"
2176+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
2177+
2178+
2179+} # as_fn_mkdir_p
2180+# as_fn_append VAR VALUE
2181+# ----------------------
2182+# Append the text in VALUE to the end of the definition contained in VAR. Take
2183+# advantage of any shell optimizations that allow amortized linear growth over
2184+# repeated appends, instead of the typical quadratic growth present in naive
2185+# implementations.
2186+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
2187+ eval 'as_fn_append ()
2188+ {
2189+ eval $1+=\$2
2190+ }'
2191+else
2192+ as_fn_append ()
2193+ {
2194+ eval $1=\$$1\$2
2195+ }
2196+fi # as_fn_append
2197+
2198+# as_fn_arith ARG...
2199+# ------------------
2200+# Perform arithmetic evaluation on the ARGs, and store the result in the
2201+# global $as_val. Take advantage of shells that can avoid forks. The arguments
2202+# must be portable across $(()) and expr.
2203+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
2204+ eval 'as_fn_arith ()
2205+ {
2206+ as_val=$(( $* ))
2207+ }'
2208+else
2209+ as_fn_arith ()
2210+ {
2211+ as_val=`expr "$@" || test $? -eq 1`
2212+ }
2213+fi # as_fn_arith
2214+
2215+
2216+# as_fn_error ERROR [LINENO LOG_FD]
2217+# ---------------------------------
2218+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
2219+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
2220+# script with status $?, using 1 if that was 0.
2221+as_fn_error ()
2222+{
2223+ as_status=$?; test $as_status -eq 0 && as_status=1
2224+ if test "$3"; then
2225+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2226+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
2227+ fi
2228+ $as_echo "$as_me: error: $1" >&2
2229+ as_fn_exit $as_status
2230+} # as_fn_error
2231+
2232+if expr a : '\(a\)' >/dev/null 2>&1 &&
2233+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
2234+ as_expr=expr
2235+else
2236+ as_expr=false
2237+fi
2238+
2239+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
2240+ as_basename=basename
2241+else
2242+ as_basename=false
2243+fi
2244+
2245+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
2246+ as_dirname=dirname
2247+else
2248+ as_dirname=false
2249+fi
2250+
2251+as_me=`$as_basename -- "$0" ||
2252+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
2253+ X"$0" : 'X\(//\)$' \| \
2254+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
2255+$as_echo X/"$0" |
2256+ sed '/^.*\/\([^/][^/]*\)\/*$/{
2257+ s//\1/
2258+ q
2259+ }
2260+ /^X\/\(\/\/\)$/{
2261+ s//\1/
2262+ q
2263+ }
2264+ /^X\/\(\/\).*/{
2265+ s//\1/
2266+ q
2267+ }
2268+ s/.*/./; q'`
2269+
2270+# Avoid depending upon Character Ranges.
2271+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
2272+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
2273+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
2274+as_cr_digits='0123456789'
2275+as_cr_alnum=$as_cr_Letters$as_cr_digits
2276+
2277+
2278+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
2279+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
2280+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
2281+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
2282+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
2283 sed -n '
2284 p
2285 /[$]LINENO/=
2286@@ -453,8 +440,7 @@
2287 s/-\n.*//
2288 ' >$as_me.lineno &&
2289 chmod +x "$as_me.lineno" ||
2290- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
2291- { (exit 1); exit 1; }; }
2292+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
2293
2294 # Don't try to exec as it changes $[0], causing all sort of problems
2295 # (the dirname of $[0] is not the place where we might find the
2296@@ -464,49 +450,40 @@
2297 exit
2298 }
2299
2300-
2301-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
2302- as_dirname=dirname
2303-else
2304- as_dirname=false
2305-fi
2306-
2307 ECHO_C= ECHO_N= ECHO_T=
2308-case `echo -n x` in
2309+case `echo -n x` in #(((((
2310 -n*)
2311- case `echo 'x\c'` in
2312+ case `echo 'xy\c'` in
2313 *c*) ECHO_T=' ';; # ECHO_T is single tab character.
2314- *) ECHO_C='\c';;
2315+ xy) ECHO_C='\c';;
2316+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
2317+ ECHO_T=' ';;
2318 esac;;
2319 *)
2320 ECHO_N='-n';;
2321 esac
2322
2323-if expr a : '\(a\)' >/dev/null 2>&1 &&
2324- test "X`expr 00001 : '.*\(...\)'`" = X001; then
2325- as_expr=expr
2326-else
2327- as_expr=false
2328-fi
2329-
2330 rm -f conf$$ conf$$.exe conf$$.file
2331 if test -d conf$$.dir; then
2332 rm -f conf$$.dir/conf$$.file
2333 else
2334 rm -f conf$$.dir
2335- mkdir conf$$.dir
2336+ mkdir conf$$.dir 2>/dev/null
2337 fi
2338-echo >conf$$.file
2339-if ln -s conf$$.file conf$$ 2>/dev/null; then
2340- as_ln_s='ln -s'
2341- # ... but there are two gotchas:
2342- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
2343- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
2344- # In both cases, we have to default to `cp -p'.
2345- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
2346+if (echo >conf$$.file) 2>/dev/null; then
2347+ if ln -s conf$$.file conf$$ 2>/dev/null; then
2348+ as_ln_s='ln -s'
2349+ # ... but there are two gotchas:
2350+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
2351+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
2352+ # In both cases, we have to default to `cp -p'.
2353+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
2354+ as_ln_s='cp -p'
2355+ elif ln conf$$.file conf$$ 2>/dev/null; then
2356+ as_ln_s=ln
2357+ else
2358 as_ln_s='cp -p'
2359-elif ln conf$$.file conf$$ 2>/dev/null; then
2360- as_ln_s=ln
2361+ fi
2362 else
2363 as_ln_s='cp -p'
2364 fi
2365@@ -514,7 +491,7 @@
2366 rmdir conf$$.dir 2>/dev/null
2367
2368 if mkdir -p . 2>/dev/null; then
2369- as_mkdir_p=:
2370+ as_mkdir_p='mkdir -p "$as_dir"'
2371 else
2372 test -d ./-p && rmdir ./-p
2373 as_mkdir_p=false
2374@@ -531,12 +508,12 @@
2375 as_test_x='
2376 eval sh -c '\''
2377 if test -d "$1"; then
2378- test -d "$1/.";
2379+ test -d "$1/.";
2380 else
2381- case $1 in
2382- -*)set "./$1";;
2383+ case $1 in #(
2384+ -*)set "./$1";;
2385 esac;
2386- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
2387+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
2388 ???[sx]*):;;*)false;;esac;fi
2389 '\'' sh
2390 '
2391@@ -550,7 +527,6 @@
2392 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
2393
2394
2395-
2396 exec 7<&0 </dev/null 6>&1
2397
2398 # Name of the host.
2399@@ -569,17 +545,16 @@
2400 subdirs=
2401 MFLAGS=
2402 MAKEFLAGS=
2403-SHELL=${CONFIG_SHELL-/bin/sh}
2404
2405 # Identity of this package.
2406 PACKAGE_NAME='gnupg'
2407 PACKAGE_TARNAME='gnupg'
2408-PACKAGE_VERSION='1.4.10'
2409-PACKAGE_STRING='gnupg 1.4.10'
2410+PACKAGE_VERSION='1.4.11'
2411+PACKAGE_STRING='gnupg 1.4.11'
2412 PACKAGE_BUGREPORT='bug-gnupg@gnu.org'
2413+PACKAGE_URL=''
2414
2415 ac_unique_file="g10/gpg.c"
2416-gt_needs=
2417 # Factoring default headers for most tests.
2418 ac_includes_default="\
2419 #include <stdio.h>
2420@@ -616,219 +591,281 @@
2421 # include <unistd.h>
2422 #endif"
2423
2424-ac_subst_vars='SHELL
2425-PATH_SEPARATOR
2426-PACKAGE_NAME
2427-PACKAGE_TARNAME
2428-PACKAGE_VERSION
2429-PACKAGE_STRING
2430-PACKAGE_BUGREPORT
2431-exec_prefix
2432-prefix
2433-program_transform_name
2434-bindir
2435-sbindir
2436-libexecdir
2437-datarootdir
2438-datadir
2439-sysconfdir
2440-sharedstatedir
2441-localstatedir
2442-includedir
2443-oldincludedir
2444-docdir
2445-infodir
2446-htmldir
2447-dvidir
2448-pdfdir
2449-psdir
2450-libdir
2451-localedir
2452-mandir
2453-DEFS
2454-ECHO_C
2455-ECHO_N
2456-ECHO_T
2457-LIBS
2458-build_alias
2459-host_alias
2460-target_alias
2461-build
2462-build_cpu
2463-build_vendor
2464-build_os
2465-host
2466-host_cpu
2467-host_vendor
2468-host_os
2469-INSTALL_PROGRAM
2470-INSTALL_SCRIPT
2471-INSTALL_DATA
2472-am__isrc
2473-CYGPATH_W
2474-PACKAGE
2475-VERSION
2476-ACLOCAL
2477-AUTOCONF
2478-AUTOMAKE
2479-AUTOHEADER
2480-MAKEINFO
2481-install_sh
2482-STRIP
2483-INSTALL_STRIP_PROGRAM
2484-mkdir_p
2485-AWK
2486-SET_MAKE
2487-am__leading_dot
2488-AMTAR
2489-am__tar
2490-am__untar
2491+gt_needs=
2492+ac_subst_vars='LTLIBOBJS
2493+NOEXECSTACK_FLAGS
2494+am__fastdepCCAS_FALSE
2495+am__fastdepCCAS_TRUE
2496+CCASDEPMODE
2497+CCASFLAGS
2498+CCAS
2499+W32LIBS
2500+NETLIBS
2501+CROSS_COMPILING_FALSE
2502+CROSS_COMPILING_TRUE
2503+LIBREADLINE
2504+LIBUSB
2505+LIBUSB_CPPFLAGS
2506+_usb_config
2507+ZLIBS
2508+ENABLE_BZIP2_SUPPORT_FALSE
2509+ENABLE_BZIP2_SUPPORT_TRUE
2510+ENABLE_LOCAL_ZLIB_FALSE
2511+ENABLE_LOCAL_ZLIB_TRUE
2512+USE_INTERNAL_REGEX_FALSE
2513+USE_INTERNAL_REGEX_TRUE
2514+MPI_SFLAGS
2515+MPI_EXTRA_ASM_OBJS
2516+USE_RNDW32_FALSE
2517+USE_RNDW32_TRUE
2518+USE_RNDEGD_FALSE
2519+USE_RNDEGD_TRUE
2520+USE_RNDUNIX_FALSE
2521+USE_RNDUNIX_TRUE
2522+USE_RNDLINUX_FALSE
2523+USE_RNDLINUX_TRUE
2524+HAVE_SHM_FALSE
2525+HAVE_SHM_TRUE
2526+CAPLIBS
2527+GETOPT
2528+LIBOBJS
2529+USE_SHA512_FALSE
2530+USE_SHA512_TRUE
2531+ENABLE_AGENT_SUPPORT_FALSE
2532+ENABLE_AGENT_SUPPORT_TRUE
2533+ENABLE_CARD_SUPPORT_FALSE
2534+ENABLE_CARD_SUPPORT_TRUE
2535+DLLIBS
2536+POSUB
2537+LTLIBINTL
2538+LIBINTL
2539+INTLLIBS
2540+INTL_LIBTOOL_SUFFIX_PREFIX
2541+INTLOBJS
2542+GENCAT
2543+INSTOBJEXT
2544+DATADIRNAME
2545+CATOBJEXT
2546+USE_INCLUDED_LIBINTL
2547+BUILD_INCLUDED_LIBINTL
2548+WOE32DLL
2549+HAVE_WPRINTF
2550+HAVE_SNPRINTF
2551+HAVE_ASPRINTF
2552+HAVE_POSIX_PRINTF
2553+INTL_MACOSX_LIBS
2554+GLIBC21
2555+INTLBISON
2556+LTLIBICONV
2557+LIBICONV
2558+LTLIBMULTITHREAD
2559+LIBMULTITHREAD
2560+LTLIBTHREAD
2561+LIBTHREAD
2562+LTLIBPTH
2563+LIBPTH
2564+PRI_MACROS_BROKEN
2565+ALLOCA
2566+HAVE_VISIBILITY
2567+CFLAG_VISIBILITY
2568+GLIBC2
2569+MSGMERGE
2570+XGETTEXT_015
2571+XGETTEXT
2572+GMSGFMT_015
2573+MSGFMT_015
2574+GMSGFMT
2575+MSGFMT
2576+USE_NLS
2577+GPGKEYS_MAILTO
2578+SENDMAIL
2579+GPGKEYS_CURL
2580+FAKE_CURL_FALSE
2581+FAKE_CURL_TRUE
2582+LIBCURL
2583+LIBCURL_CPPFLAGS
2584+_libcurl_config
2585+LDAP_CPPFLAGS
2586+LDAPLIBS
2587+GPGKEYS_LDAP
2588+USE_DNS_SRV_FALSE
2589+USE_DNS_SRV_TRUE
2590+DNSLIBS
2591+GPGKEYS_FINGER
2592+GPGKEYS_HKP
2593+NM
2594+MPI_OPT_FLAGS
2595+HAVE_W32_SYSTEM_FALSE
2596+HAVE_W32_SYSTEM_TRUE
2597+USE_SIMPLE_GETTEXT_FALSE
2598+USE_SIMPLE_GETTEXT_TRUE
2599+HAVE_DOSISH_SYSTEM_FALSE
2600+HAVE_DOSISH_SYSTEM_TRUE
2601+CC_FOR_BUILD
2602+HAVE_USTAR_FALSE
2603+HAVE_USTAR_TRUE
2604+TAR
2605+HAVE_DOCBOOK_TO_MAN_FALSE
2606+HAVE_DOCBOOK_TO_MAN_TRUE
2607+DOCBOOK_TO_MAN
2608+PERL
2609+AR
2610+RANLIB
2611+MAINT
2612+MAINTAINER_MODE_FALSE
2613+MAINTAINER_MODE_TRUE
2614 IDEA_O
2615-MAINTAINER_MODE_TRUE
2616-MAINTAINER_MODE_FALSE
2617-MAINT
2618-CC
2619-CFLAGS
2620-LDFLAGS
2621-CPPFLAGS
2622+EGREP
2623+GREP
2624+CPP
2625+am__fastdepCC_FALSE
2626+am__fastdepCC_TRUE
2627+CCDEPMODE
2628+AMDEPBACKSLASH
2629+AMDEP_FALSE
2630+AMDEP_TRUE
2631+am__quote
2632+am__include
2633+DEPDIR
2634+OBJEXT
2635+EXEEXT
2636 ac_ct_CC
2637-EXEEXT
2638-OBJEXT
2639-DEPDIR
2640-am__include
2641-am__quote
2642-AMDEP_TRUE
2643-AMDEP_FALSE
2644-AMDEPBACKSLASH
2645-CCDEPMODE
2646-am__fastdepCC_TRUE
2647-am__fastdepCC_FALSE
2648-CPP
2649-RANLIB
2650-AR
2651-PERL
2652-DOCBOOK_TO_MAN
2653-HAVE_DOCBOOK_TO_MAN_TRUE
2654-HAVE_DOCBOOK_TO_MAN_FALSE
2655-FAQPROG
2656-WORKING_FAQPROG_TRUE
2657-WORKING_FAQPROG_FALSE
2658-TAR
2659-HAVE_USTAR_TRUE
2660-HAVE_USTAR_FALSE
2661-CC_FOR_BUILD
2662-HAVE_DOSISH_SYSTEM_TRUE
2663-HAVE_DOSISH_SYSTEM_FALSE
2664-USE_SIMPLE_GETTEXT_TRUE
2665-USE_SIMPLE_GETTEXT_FALSE
2666-HAVE_W32_SYSTEM_TRUE
2667-HAVE_W32_SYSTEM_FALSE
2668-MPI_OPT_FLAGS
2669-NM
2670-GPGKEYS_HKP
2671-GPGKEYS_FINGER
2672-DNSLIBS
2673-USE_DNS_SRV_TRUE
2674-USE_DNS_SRV_FALSE
2675-GPGKEYS_LDAP
2676-LDAPLIBS
2677-LDAP_CPPFLAGS
2678-_libcurl_config
2679-LIBCURL_CPPFLAGS
2680-LIBCURL
2681-FAKE_CURL_TRUE
2682-FAKE_CURL_FALSE
2683-GPGKEYS_CURL
2684-SENDMAIL
2685-GPGKEYS_MAILTO
2686-USE_NLS
2687-MSGFMT
2688-GMSGFMT
2689-MSGFMT_015
2690-GMSGFMT_015
2691-XGETTEXT
2692-XGETTEXT_015
2693-MSGMERGE
2694-GREP
2695-EGREP
2696-GLIBC2
2697-CFLAG_VISIBILITY
2698-HAVE_VISIBILITY
2699-ALLOCA
2700-PRI_MACROS_BROKEN
2701-LIBPTH
2702-LTLIBPTH
2703-LIBTHREAD
2704-LTLIBTHREAD
2705-LIBMULTITHREAD
2706-LTLIBMULTITHREAD
2707-LIBICONV
2708-LTLIBICONV
2709-INTLBISON
2710-GLIBC21
2711-INTL_MACOSX_LIBS
2712-HAVE_POSIX_PRINTF
2713-HAVE_ASPRINTF
2714-HAVE_SNPRINTF
2715-HAVE_WPRINTF
2716-WOE32DLL
2717-BUILD_INCLUDED_LIBINTL
2718-USE_INCLUDED_LIBINTL
2719-CATOBJEXT
2720-DATADIRNAME
2721-INSTOBJEXT
2722-GENCAT
2723-INTLOBJS
2724-INTL_LIBTOOL_SUFFIX_PREFIX
2725-INTLLIBS
2726-LIBINTL
2727-LTLIBINTL
2728-POSUB
2729-DLLIBS
2730-ENABLE_CARD_SUPPORT_TRUE
2731-ENABLE_CARD_SUPPORT_FALSE
2732-ENABLE_AGENT_SUPPORT_TRUE
2733-ENABLE_AGENT_SUPPORT_FALSE
2734-USE_SHA512_TRUE
2735-USE_SHA512_FALSE
2736-LIBOBJS
2737-GETOPT
2738-CAPLIBS
2739-HAVE_SHM_TRUE
2740-HAVE_SHM_FALSE
2741-USE_RNDLINUX_TRUE
2742-USE_RNDLINUX_FALSE
2743-USE_RNDUNIX_TRUE
2744-USE_RNDUNIX_FALSE
2745-USE_RNDEGD_TRUE
2746-USE_RNDEGD_FALSE
2747-USE_RNDW32_TRUE
2748-USE_RNDW32_FALSE
2749-MPI_EXTRA_ASM_OBJS
2750-MPI_SFLAGS
2751-USE_INTERNAL_REGEX_TRUE
2752-USE_INTERNAL_REGEX_FALSE
2753-ENABLE_LOCAL_ZLIB_TRUE
2754-ENABLE_LOCAL_ZLIB_FALSE
2755-ENABLE_BZIP2_SUPPORT_TRUE
2756-ENABLE_BZIP2_SUPPORT_FALSE
2757-ZLIBS
2758-_usb_config
2759-LIBUSB_CPPFLAGS
2760-LIBUSB
2761-LIBREADLINE
2762-CROSS_COMPILING_TRUE
2763-CROSS_COMPILING_FALSE
2764-NETLIBS
2765-W32LIBS
2766-CCAS
2767-CCASFLAGS
2768-CCASDEPMODE
2769-am__fastdepCCAS_TRUE
2770-am__fastdepCCAS_FALSE
2771-NOEXECSTACK_FLAGS
2772-LTLIBOBJS'
2773+CPPFLAGS
2774+LDFLAGS
2775+CFLAGS
2776+CC
2777+am__untar
2778+am__tar
2779+AMTAR
2780+am__leading_dot
2781+SET_MAKE
2782+AWK
2783+mkdir_p
2784+MKDIR_P
2785+INSTALL_STRIP_PROGRAM
2786+STRIP
2787+install_sh
2788+MAKEINFO
2789+AUTOHEADER
2790+AUTOMAKE
2791+AUTOCONF
2792+ACLOCAL
2793+VERSION
2794+PACKAGE
2795+CYGPATH_W
2796+am__isrc
2797+INSTALL_DATA
2798+INSTALL_SCRIPT
2799+INSTALL_PROGRAM
2800+host_os
2801+host_vendor
2802+host_cpu
2803+host
2804+build_os
2805+build_vendor
2806+build_cpu
2807+build
2808+target_alias
2809+host_alias
2810+build_alias
2811+LIBS
2812+ECHO_T
2813+ECHO_N
2814+ECHO_C
2815+DEFS
2816+mandir
2817+localedir
2818+libdir
2819+psdir
2820+pdfdir
2821+dvidir
2822+htmldir
2823+infodir
2824+docdir
2825+oldincludedir
2826+includedir
2827+localstatedir
2828+sharedstatedir
2829+sysconfdir
2830+datadir
2831+datarootdir
2832+libexecdir
2833+sbindir
2834+bindir
2835+program_transform_name
2836+prefix
2837+exec_prefix
2838+PACKAGE_URL
2839+PACKAGE_BUGREPORT
2840+PACKAGE_STRING
2841+PACKAGE_VERSION
2842+PACKAGE_TARNAME
2843+PACKAGE_NAME
2844+PATH_SEPARATOR
2845+SHELL'
2846 ac_subst_files=''
2847+ac_user_opts='
2848+enable_option_checking
2849+enable_dependency_tracking
2850+enable_static_rnd
2851+with_egd_socket
2852+enable_dev_random
2853+enable_asm
2854+enable_selinux_support
2855+enable_gnupg_iconv
2856+enable_minimal
2857+enable_card_support
2858+enable_agent_support
2859+enable_rsa
2860+enable_idea
2861+enable_cast5
2862+enable_blowfish
2863+enable_aes
2864+enable_twofish
2865+enable_camellia
2866+enable_sha256
2867+enable_sha512
2868+enable_bzip2
2869+enable_exec
2870+enable_photo_viewers
2871+with_photo_viewer
2872+enable_keyserver_helpers
2873+enable_ldap
2874+enable_hkp
2875+enable_finger
2876+enable_generic
2877+enable_mailto
2878+enable_keyserver_path
2879+with_included_zlib
2880+enable_key_cache
2881+with_capabilities
2882+enable_maintainer_mode
2883+enable_largefile
2884+with_tar
2885+enable_dns_srv
2886+enable_dns_pka
2887+enable_dns_cert
2888+with_ldap
2889+with_libcurl
2890+with_mailprog
2891+enable_nls
2892+enable_threads
2893+with_gnu_ld
2894+enable_rpath
2895+with_libpth_prefix
2896+with_libiconv_prefix
2897+with_included_gettext
2898+with_libintl_prefix
2899+enable_endian_check
2900+enable_regex
2901+with_included_regex
2902+with_zlib
2903+with_bzip2
2904+with_libusb
2905+with_readline
2906+enable_optimization
2907+enable_noexecstack
2908+'
2909 ac_precious_vars='build_alias
2910 host_alias
2911 target_alias
2912@@ -846,6 +883,8 @@
2913 # Initialize some variables set by options.
2914 ac_init_help=
2915 ac_init_version=false
2916+ac_unrecognized_opts=
2917+ac_unrecognized_sep=
2918 # The variables have the same names as the options, with
2919 # dashes changed to underlines.
2920 cache_file=/dev/null
2921@@ -944,13 +983,20 @@
2922 datarootdir=$ac_optarg ;;
2923
2924 -disable-* | --disable-*)
2925- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
2926+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
2927 # Reject names that are not valid shell variable names.
2928- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
2929- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
2930- { (exit 1); exit 1; }; }
2931- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
2932- eval enable_$ac_feature=no ;;
2933+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
2934+ as_fn_error "invalid feature name: $ac_useropt"
2935+ ac_useropt_orig=$ac_useropt
2936+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
2937+ case $ac_user_opts in
2938+ *"
2939+"enable_$ac_useropt"
2940+"*) ;;
2941+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
2942+ ac_unrecognized_sep=', ';;
2943+ esac
2944+ eval enable_$ac_useropt=no ;;
2945
2946 -docdir | --docdir | --docdi | --doc | --do)
2947 ac_prev=docdir ;;
2948@@ -963,13 +1009,20 @@
2949 dvidir=$ac_optarg ;;
2950
2951 -enable-* | --enable-*)
2952- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
2953+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
2954 # Reject names that are not valid shell variable names.
2955- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
2956- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
2957- { (exit 1); exit 1; }; }
2958- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
2959- eval enable_$ac_feature=\$ac_optarg ;;
2960+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
2961+ as_fn_error "invalid feature name: $ac_useropt"
2962+ ac_useropt_orig=$ac_useropt
2963+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
2964+ case $ac_user_opts in
2965+ *"
2966+"enable_$ac_useropt"
2967+"*) ;;
2968+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
2969+ ac_unrecognized_sep=', ';;
2970+ esac
2971+ eval enable_$ac_useropt=\$ac_optarg ;;
2972
2973 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
2974 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
2975@@ -1160,22 +1213,36 @@
2976 ac_init_version=: ;;
2977
2978 -with-* | --with-*)
2979- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
2980+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
2981 # Reject names that are not valid shell variable names.
2982- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
2983- { echo "$as_me: error: invalid package name: $ac_package" >&2
2984- { (exit 1); exit 1; }; }
2985- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
2986- eval with_$ac_package=\$ac_optarg ;;
2987+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
2988+ as_fn_error "invalid package name: $ac_useropt"
2989+ ac_useropt_orig=$ac_useropt
2990+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
2991+ case $ac_user_opts in
2992+ *"
2993+"with_$ac_useropt"
2994+"*) ;;
2995+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
2996+ ac_unrecognized_sep=', ';;
2997+ esac
2998+ eval with_$ac_useropt=\$ac_optarg ;;
2999
3000 -without-* | --without-*)
3001- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
3002+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
3003 # Reject names that are not valid shell variable names.
3004- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3005- { echo "$as_me: error: invalid package name: $ac_package" >&2
3006- { (exit 1); exit 1; }; }
3007- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
3008- eval with_$ac_package=no ;;
3009+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
3010+ as_fn_error "invalid package name: $ac_useropt"
3011+ ac_useropt_orig=$ac_useropt
3012+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
3013+ case $ac_user_opts in
3014+ *"
3015+"with_$ac_useropt"
3016+"*) ;;
3017+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
3018+ ac_unrecognized_sep=', ';;
3019+ esac
3020+ eval with_$ac_useropt=no ;;
3021
3022 --x)
3023 # Obsolete; use --with-x.
3024@@ -1195,25 +1262,25 @@
3025 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
3026 x_libraries=$ac_optarg ;;
3027
3028- -*) { echo "$as_me: error: unrecognized option: $ac_option
3029-Try \`$0 --help' for more information." >&2
3030- { (exit 1); exit 1; }; }
3031+ -*) as_fn_error "unrecognized option: \`$ac_option'
3032+Try \`$0 --help' for more information."
3033 ;;
3034
3035 *=*)
3036 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
3037 # Reject names that are not valid shell variable names.
3038- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
3039- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
3040- { (exit 1); exit 1; }; }
3041+ case $ac_envvar in #(
3042+ '' | [0-9]* | *[!_$as_cr_alnum]* )
3043+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
3044+ esac
3045 eval $ac_envvar=\$ac_optarg
3046 export $ac_envvar ;;
3047
3048 *)
3049 # FIXME: should be removed in autoconf 3.0.
3050- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
3051+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
3052 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3053- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
3054+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
3055 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
3056 ;;
3057
3058@@ -1222,23 +1289,36 @@
3059
3060 if test -n "$ac_prev"; then
3061 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
3062- { echo "$as_me: error: missing argument to $ac_option" >&2
3063- { (exit 1); exit 1; }; }
3064-fi
3065-
3066-# Be sure to have absolute directory names.
3067+ as_fn_error "missing argument to $ac_option"
3068+fi
3069+
3070+if test -n "$ac_unrecognized_opts"; then
3071+ case $enable_option_checking in
3072+ no) ;;
3073+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
3074+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
3075+ esac
3076+fi
3077+
3078+# Check all directory arguments for consistency.
3079 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
3080 datadir sysconfdir sharedstatedir localstatedir includedir \
3081 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
3082 libdir localedir mandir
3083 do
3084 eval ac_val=\$$ac_var
3085+ # Remove trailing slashes.
3086+ case $ac_val in
3087+ */ )
3088+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
3089+ eval $ac_var=\$ac_val;;
3090+ esac
3091+ # Be sure to have absolute directory names.
3092 case $ac_val in
3093 [\\/$]* | ?:[\\/]* ) continue;;
3094 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
3095 esac
3096- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
3097- { (exit 1); exit 1; }; }
3098+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
3099 done
3100
3101 # There might be people who depend on the old broken behavior: `$host'
3102@@ -1252,7 +1332,7 @@
3103 if test "x$host_alias" != x; then
3104 if test "x$build_alias" = x; then
3105 cross_compiling=maybe
3106- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
3107+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
3108 If a cross compiler is detected then cross compile mode will be used." >&2
3109 elif test "x$build_alias" != "x$host_alias"; then
3110 cross_compiling=yes
3111@@ -1268,23 +1348,21 @@
3112 ac_pwd=`pwd` && test -n "$ac_pwd" &&
3113 ac_ls_di=`ls -di .` &&
3114 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
3115- { echo "$as_me: error: Working directory cannot be determined" >&2
3116- { (exit 1); exit 1; }; }
3117+ as_fn_error "working directory cannot be determined"
3118 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
3119- { echo "$as_me: error: pwd does not report name of working directory" >&2
3120- { (exit 1); exit 1; }; }
3121+ as_fn_error "pwd does not report name of working directory"
3122
3123
3124 # Find the source files, if location was not specified.
3125 if test -z "$srcdir"; then
3126 ac_srcdir_defaulted=yes
3127 # Try the directory containing this script, then the parent directory.
3128- ac_confdir=`$as_dirname -- "$0" ||
3129-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
3130- X"$0" : 'X\(//\)[^/]' \| \
3131- X"$0" : 'X\(//\)$' \| \
3132- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
3133-echo X"$0" |
3134+ ac_confdir=`$as_dirname -- "$as_myself" ||
3135+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
3136+ X"$as_myself" : 'X\(//\)[^/]' \| \
3137+ X"$as_myself" : 'X\(//\)$' \| \
3138+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
3139+$as_echo X"$as_myself" |
3140 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
3141 s//\1/
3142 q
3143@@ -1311,13 +1389,11 @@
3144 fi
3145 if test ! -r "$srcdir/$ac_unique_file"; then
3146 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
3147- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
3148- { (exit 1); exit 1; }; }
3149+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
3150 fi
3151 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
3152 ac_abs_confdir=`(
3153- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
3154- { (exit 1); exit 1; }; }
3155+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
3156 pwd)`
3157 # When building in place, set srcdir=.
3158 if test "$ac_abs_confdir" = "$ac_pwd"; then
3159@@ -1343,7 +1419,7 @@
3160 # Omit some internal or obsolete options to make the list less imposing.
3161 # This message is too long to be a string in the A/UX 3.1 sh.
3162 cat <<_ACEOF
3163-\`configure' configures gnupg 1.4.10 to adapt to many kinds of systems.
3164+\`configure' configures gnupg 1.4.11 to adapt to many kinds of systems.
3165
3166 Usage: $0 [OPTION]... [VAR=VALUE]...
3167
3168@@ -1365,9 +1441,9 @@
3169
3170 Installation directories:
3171 --prefix=PREFIX install architecture-independent files in PREFIX
3172- [$ac_default_prefix]
3173+ [$ac_default_prefix]
3174 --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
3175- [PREFIX]
3176+ [PREFIX]
3177
3178 By default, \`make install' will install all the files in
3179 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
3180@@ -1377,25 +1453,25 @@
3181 For better control, use the options below.
3182
3183 Fine tuning of the installation directories:
3184- --bindir=DIR user executables [EPREFIX/bin]
3185- --sbindir=DIR system admin executables [EPREFIX/sbin]
3186- --libexecdir=DIR program executables [EPREFIX/libexec]
3187- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
3188- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
3189- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
3190- --libdir=DIR object code libraries [EPREFIX/lib]
3191- --includedir=DIR C header files [PREFIX/include]
3192- --oldincludedir=DIR C header files for non-gcc [/usr/include]
3193- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
3194- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
3195- --infodir=DIR info documentation [DATAROOTDIR/info]
3196- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
3197- --mandir=DIR man documentation [DATAROOTDIR/man]
3198- --docdir=DIR documentation root [DATAROOTDIR/doc/gnupg]
3199- --htmldir=DIR html documentation [DOCDIR]
3200- --dvidir=DIR dvi documentation [DOCDIR]
3201- --pdfdir=DIR pdf documentation [DOCDIR]
3202- --psdir=DIR ps documentation [DOCDIR]
3203+ --bindir=DIR user executables [EPREFIX/bin]
3204+ --sbindir=DIR system admin executables [EPREFIX/sbin]
3205+ --libexecdir=DIR program executables [EPREFIX/libexec]
3206+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
3207+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
3208+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
3209+ --libdir=DIR object code libraries [EPREFIX/lib]
3210+ --includedir=DIR C header files [PREFIX/include]
3211+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
3212+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
3213+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
3214+ --infodir=DIR info documentation [DATAROOTDIR/info]
3215+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
3216+ --mandir=DIR man documentation [DATAROOTDIR/man]
3217+ --docdir=DIR documentation root [DATAROOTDIR/doc/gnupg]
3218+ --htmldir=DIR html documentation [DOCDIR]
3219+ --dvidir=DIR dvi documentation [DOCDIR]
3220+ --pdfdir=DIR pdf documentation [DOCDIR]
3221+ --psdir=DIR ps documentation [DOCDIR]
3222 _ACEOF
3223
3224 cat <<\_ACEOF
3225@@ -1413,13 +1489,16 @@
3226
3227 if test -n "$ac_init_help"; then
3228 case $ac_init_help in
3229- short | recursive ) echo "Configuration of gnupg 1.4.10:";;
3230+ short | recursive ) echo "Configuration of gnupg 1.4.11:";;
3231 esac
3232 cat <<\_ACEOF
3233
3234 Optional Features:
3235+ --disable-option-checking ignore unrecognized --enable/--with options
3236 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
3237 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
3238+ --disable-dependency-tracking speeds up one-time build
3239+ --enable-dependency-tracking do not reject slow dependency extractors
3240 --enable-static-rnd=egd|unix|linux|auto
3241 specify a random number source
3242 --disable-dev-random disable the use of dev random
3243@@ -1454,8 +1533,6 @@
3244 --enable-key-cache=SIZE Set key cache to SIZE (default 4096)
3245 --enable-maintainer-mode enable make rules and dependencies not useful
3246 (and sometimes confusing) to the casual installer
3247- --disable-dependency-tracking speeds up one-time build
3248- --enable-dependency-tracking do not reject slow dependency extractors
3249 --disable-largefile omit support for large files
3250 --disable-dns-srv disable the use of DNS SRV in HKP and HTTP
3251 --disable-dns-pka disable the use of PKA records in DNS
3252@@ -1523,15 +1600,17 @@
3253 if test "$ac_init_help" = "recursive"; then
3254 # If there are subdirs, report their specific --help.
3255 for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
3256- test -d "$ac_dir" || continue
3257+ test -d "$ac_dir" ||
3258+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
3259+ continue
3260 ac_builddir=.
3261
3262 case "$ac_dir" in
3263 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
3264 *)
3265- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
3266+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
3267 # A ".." for each directory in $ac_dir_suffix.
3268- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
3269+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
3270 case $ac_top_builddir_sub in
3271 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
3272 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
3273@@ -1567,7 +1646,7 @@
3274 echo &&
3275 $SHELL "$ac_srcdir/configure" --help=recursive
3276 else
3277- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
3278+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
3279 fi || ac_status=$?
3280 cd "$ac_pwd" || { ac_status=$?; break; }
3281 done
3282@@ -1576,22 +1655,650 @@
3283 test -n "$ac_init_help" && exit $ac_status
3284 if $ac_init_version; then
3285 cat <<\_ACEOF
3286-gnupg configure 1.4.10
3287-generated by GNU Autoconf 2.61
3288+gnupg configure 1.4.11
3289+generated by GNU Autoconf 2.64
3290
3291-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
3292-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
3293+Copyright (C) 2009 Free Software Foundation, Inc.
3294 This configure script is free software; the Free Software Foundation
3295 gives unlimited permission to copy, distribute and modify it.
3296 _ACEOF
3297 exit
3298 fi
3299+
3300+## ------------------------ ##
3301+## Autoconf initialization. ##
3302+## ------------------------ ##
3303+
3304+# ac_fn_c_try_compile LINENO
3305+# --------------------------
3306+# Try to compile conftest.$ac_ext, and return whether this succeeded.
3307+ac_fn_c_try_compile ()
3308+{
3309+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3310+ rm -f conftest.$ac_objext
3311+ if { { ac_try="$ac_compile"
3312+case "(($ac_try" in
3313+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3314+ *) ac_try_echo=$ac_try;;
3315+esac
3316+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3317+$as_echo "$ac_try_echo"; } >&5
3318+ (eval "$ac_compile") 2>conftest.err
3319+ ac_status=$?
3320+ if test -s conftest.err; then
3321+ grep -v '^ *+' conftest.err >conftest.er1
3322+ cat conftest.er1 >&5
3323+ mv -f conftest.er1 conftest.err
3324+ fi
3325+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3326+ test $ac_status = 0; } && {
3327+ test -z "$ac_c_werror_flag" ||
3328+ test ! -s conftest.err
3329+ } && test -s conftest.$ac_objext; then :
3330+ ac_retval=0
3331+else
3332+ $as_echo "$as_me: failed program was:" >&5
3333+sed 's/^/| /' conftest.$ac_ext >&5
3334+
3335+ ac_retval=1
3336+fi
3337+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3338+ return $ac_retval
3339+
3340+} # ac_fn_c_try_compile
3341+
3342+# ac_fn_c_try_cpp LINENO
3343+# ----------------------
3344+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
3345+ac_fn_c_try_cpp ()
3346+{
3347+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3348+ if { { ac_try="$ac_cpp conftest.$ac_ext"
3349+case "(($ac_try" in
3350+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3351+ *) ac_try_echo=$ac_try;;
3352+esac
3353+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3354+$as_echo "$ac_try_echo"; } >&5
3355+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
3356+ ac_status=$?
3357+ if test -s conftest.err; then
3358+ grep -v '^ *+' conftest.err >conftest.er1
3359+ cat conftest.er1 >&5
3360+ mv -f conftest.er1 conftest.err
3361+ fi
3362+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3363+ test $ac_status = 0; } >/dev/null && {
3364+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3365+ test ! -s conftest.err
3366+ }; then :
3367+ ac_retval=0
3368+else
3369+ $as_echo "$as_me: failed program was:" >&5
3370+sed 's/^/| /' conftest.$ac_ext >&5
3371+
3372+ ac_retval=1
3373+fi
3374+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3375+ return $ac_retval
3376+
3377+} # ac_fn_c_try_cpp
3378+
3379+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
3380+# -------------------------------------------------------
3381+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
3382+# the include files in INCLUDES and setting the cache variable VAR
3383+# accordingly.
3384+ac_fn_c_check_header_mongrel ()
3385+{
3386+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3387+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
3388+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3389+$as_echo_n "checking for $2... " >&6; }
3390+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
3391+ $as_echo_n "(cached) " >&6
3392+fi
3393+eval ac_res=\$$3
3394+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3395+$as_echo "$ac_res" >&6; }
3396+else
3397+ # Is the header compilable?
3398+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
3399+$as_echo_n "checking $2 usability... " >&6; }
3400+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3401+/* end confdefs.h. */
3402+$4
3403+#include <$2>
3404+_ACEOF
3405+if ac_fn_c_try_compile "$LINENO"; then :
3406+ ac_header_compiler=yes
3407+else
3408+ ac_header_compiler=no
3409+fi
3410+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3411+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
3412+$as_echo "$ac_header_compiler" >&6; }
3413+
3414+# Is the header present?
3415+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
3416+$as_echo_n "checking $2 presence... " >&6; }
3417+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3418+/* end confdefs.h. */
3419+#include <$2>
3420+_ACEOF
3421+if ac_fn_c_try_cpp "$LINENO"; then :
3422+ ac_header_preproc=yes
3423+else
3424+ ac_header_preproc=no
3425+fi
3426+rm -f conftest.err conftest.$ac_ext
3427+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
3428+$as_echo "$ac_header_preproc" >&6; }
3429+
3430+# So? What about this header?
3431+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
3432+ yes:no: )
3433+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
3434+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
3435+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
3436+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
3437+ ;;
3438+ no:yes:* )
3439+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
3440+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
3441+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
3442+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
3443+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
3444+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
3445+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
3446+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
3447+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
3448+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
3449+( cat <<\_ASBOX
3450+## -------------------------------- ##
3451+## Report this to bug-gnupg@gnu.org ##
3452+## -------------------------------- ##
3453+_ASBOX
3454+ ) | sed "s/^/$as_me: WARNING: /" >&2
3455+ ;;
3456+esac
3457+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3458+$as_echo_n "checking for $2... " >&6; }
3459+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
3460+ $as_echo_n "(cached) " >&6
3461+else
3462+ eval "$3=\$ac_header_compiler"
3463+fi
3464+eval ac_res=\$$3
3465+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3466+$as_echo "$ac_res" >&6; }
3467+fi
3468+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3469+
3470+} # ac_fn_c_check_header_mongrel
3471+
3472+# ac_fn_c_try_run LINENO
3473+# ----------------------
3474+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
3475+# that executables *can* be run.
3476+ac_fn_c_try_run ()
3477+{
3478+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3479+ if { { ac_try="$ac_link"
3480+case "(($ac_try" in
3481+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3482+ *) ac_try_echo=$ac_try;;
3483+esac
3484+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3485+$as_echo "$ac_try_echo"; } >&5
3486+ (eval "$ac_link") 2>&5
3487+ ac_status=$?
3488+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3489+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
3490+ { { case "(($ac_try" in
3491+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3492+ *) ac_try_echo=$ac_try;;
3493+esac
3494+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3495+$as_echo "$ac_try_echo"; } >&5
3496+ (eval "$ac_try") 2>&5
3497+ ac_status=$?
3498+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3499+ test $ac_status = 0; }; }; then :
3500+ ac_retval=0
3501+else
3502+ $as_echo "$as_me: program exited with status $ac_status" >&5
3503+ $as_echo "$as_me: failed program was:" >&5
3504+sed 's/^/| /' conftest.$ac_ext >&5
3505+
3506+ ac_retval=$ac_status
3507+fi
3508+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
3509+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3510+ return $ac_retval
3511+
3512+} # ac_fn_c_try_run
3513+
3514+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
3515+# -------------------------------------------------------
3516+# Tests whether HEADER exists and can be compiled using the include files in
3517+# INCLUDES, setting the cache variable VAR accordingly.
3518+ac_fn_c_check_header_compile ()
3519+{
3520+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3521+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3522+$as_echo_n "checking for $2... " >&6; }
3523+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
3524+ $as_echo_n "(cached) " >&6
3525+else
3526+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3527+/* end confdefs.h. */
3528+$4
3529+#include <$2>
3530+_ACEOF
3531+if ac_fn_c_try_compile "$LINENO"; then :
3532+ eval "$3=yes"
3533+else
3534+ eval "$3=no"
3535+fi
3536+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3537+fi
3538+eval ac_res=\$$3
3539+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3540+$as_echo "$ac_res" >&6; }
3541+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3542+
3543+} # ac_fn_c_check_header_compile
3544+
3545+# ac_fn_c_try_link LINENO
3546+# -----------------------
3547+# Try to link conftest.$ac_ext, and return whether this succeeded.
3548+ac_fn_c_try_link ()
3549+{
3550+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3551+ rm -f conftest.$ac_objext conftest$ac_exeext
3552+ if { { ac_try="$ac_link"
3553+case "(($ac_try" in
3554+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3555+ *) ac_try_echo=$ac_try;;
3556+esac
3557+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3558+$as_echo "$ac_try_echo"; } >&5
3559+ (eval "$ac_link") 2>conftest.err
3560+ ac_status=$?
3561+ if test -s conftest.err; then
3562+ grep -v '^ *+' conftest.err >conftest.er1
3563+ cat conftest.er1 >&5
3564+ mv -f conftest.er1 conftest.err
3565+ fi
3566+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3567+ test $ac_status = 0; } && {
3568+ test -z "$ac_c_werror_flag" ||
3569+ test ! -s conftest.err
3570+ } && test -s conftest$ac_exeext && {
3571+ test "$cross_compiling" = yes ||
3572+ $as_test_x conftest$ac_exeext
3573+ }; then :
3574+ ac_retval=0
3575+else
3576+ $as_echo "$as_me: failed program was:" >&5
3577+sed 's/^/| /' conftest.$ac_ext >&5
3578+
3579+ ac_retval=1
3580+fi
3581+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
3582+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
3583+ # interfere with the next link command; also delete a directory that is
3584+ # left behind by Apple's compiler. We do this before executing the actions.
3585+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
3586+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3587+ return $ac_retval
3588+
3589+} # ac_fn_c_try_link
3590+
3591+# ac_fn_c_check_func LINENO FUNC VAR
3592+# ----------------------------------
3593+# Tests whether FUNC exists, setting the cache variable VAR accordingly
3594+ac_fn_c_check_func ()
3595+{
3596+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3597+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3598+$as_echo_n "checking for $2... " >&6; }
3599+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
3600+ $as_echo_n "(cached) " >&6
3601+else
3602+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3603+/* end confdefs.h. */
3604+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
3605+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
3606+#define $2 innocuous_$2
3607+
3608+/* System header to define __stub macros and hopefully few prototypes,
3609+ which can conflict with char $2 (); below.
3610+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3611+ <limits.h> exists even on freestanding compilers. */
3612+
3613+#ifdef __STDC__
3614+# include <limits.h>
3615+#else
3616+# include <assert.h>
3617+#endif
3618+
3619+#undef $2
3620+
3621+/* Override any GCC internal prototype to avoid an error.
3622+ Use char because int might match the return type of a GCC
3623+ builtin and then its argument prototype would still apply. */
3624+#ifdef __cplusplus
3625+extern "C"
3626+#endif
3627+char $2 ();
3628+/* The GNU C library defines this for functions which it implements
3629+ to always fail with ENOSYS. Some functions are actually named
3630+ something starting with __ and the normal name is an alias. */
3631+#if defined __stub_$2 || defined __stub___$2
3632+choke me
3633+#endif
3634+
3635+int
3636+main ()
3637+{
3638+return $2 ();
3639+ ;
3640+ return 0;
3641+}
3642+_ACEOF
3643+if ac_fn_c_try_link "$LINENO"; then :
3644+ eval "$3=yes"
3645+else
3646+ eval "$3=no"
3647+fi
3648+rm -f core conftest.err conftest.$ac_objext \
3649+ conftest$ac_exeext conftest.$ac_ext
3650+fi
3651+eval ac_res=\$$3
3652+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3653+$as_echo "$ac_res" >&6; }
3654+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3655+
3656+} # ac_fn_c_check_func
3657+
3658+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
3659+# -------------------------------------------
3660+# Tests whether TYPE exists after having included INCLUDES, setting cache
3661+# variable VAR accordingly.
3662+ac_fn_c_check_type ()
3663+{
3664+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3665+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3666+$as_echo_n "checking for $2... " >&6; }
3667+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
3668+ $as_echo_n "(cached) " >&6
3669+else
3670+ eval "$3=no"
3671+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3672+/* end confdefs.h. */
3673+$4
3674+int
3675+main ()
3676+{
3677+if (sizeof ($2))
3678+ return 0;
3679+ ;
3680+ return 0;
3681+}
3682+_ACEOF
3683+if ac_fn_c_try_compile "$LINENO"; then :
3684+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3685+/* end confdefs.h. */
3686+$4
3687+int
3688+main ()
3689+{
3690+if (sizeof (($2)))
3691+ return 0;
3692+ ;
3693+ return 0;
3694+}
3695+_ACEOF
3696+if ac_fn_c_try_compile "$LINENO"; then :
3697+
3698+else
3699+ eval "$3=yes"
3700+fi
3701+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3702+fi
3703+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3704+fi
3705+eval ac_res=\$$3
3706+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3707+$as_echo "$ac_res" >&6; }
3708+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3709+
3710+} # ac_fn_c_check_type
3711+
3712+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
3713+# --------------------------------------------
3714+# Tries to find the compile-time value of EXPR in a program that includes
3715+# INCLUDES, setting VAR accordingly. Returns whether the value could be
3716+# computed
3717+ac_fn_c_compute_int ()
3718+{
3719+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3720+ if test "$cross_compiling" = yes; then
3721+ # Depending upon the size, compute the lo and hi bounds.
3722+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3723+/* end confdefs.h. */
3724+$4
3725+int
3726+main ()
3727+{
3728+static int test_array [1 - 2 * !(($2) >= 0)];
3729+test_array [0] = 0
3730+
3731+ ;
3732+ return 0;
3733+}
3734+_ACEOF
3735+if ac_fn_c_try_compile "$LINENO"; then :
3736+ ac_lo=0 ac_mid=0
3737+ while :; do
3738+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3739+/* end confdefs.h. */
3740+$4
3741+int
3742+main ()
3743+{
3744+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
3745+test_array [0] = 0
3746+
3747+ ;
3748+ return 0;
3749+}
3750+_ACEOF
3751+if ac_fn_c_try_compile "$LINENO"; then :
3752+ ac_hi=$ac_mid; break
3753+else
3754+ as_fn_arith $ac_mid + 1 && ac_lo=$as_val
3755+ if test $ac_lo -le $ac_mid; then
3756+ ac_lo= ac_hi=
3757+ break
3758+ fi
3759+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
3760+fi
3761+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3762+ done
3763+else
3764+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3765+/* end confdefs.h. */
3766+$4
3767+int
3768+main ()
3769+{
3770+static int test_array [1 - 2 * !(($2) < 0)];
3771+test_array [0] = 0
3772+
3773+ ;
3774+ return 0;
3775+}
3776+_ACEOF
3777+if ac_fn_c_try_compile "$LINENO"; then :
3778+ ac_hi=-1 ac_mid=-1
3779+ while :; do
3780+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3781+/* end confdefs.h. */
3782+$4
3783+int
3784+main ()
3785+{
3786+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
3787+test_array [0] = 0
3788+
3789+ ;
3790+ return 0;
3791+}
3792+_ACEOF
3793+if ac_fn_c_try_compile "$LINENO"; then :
3794+ ac_lo=$ac_mid; break
3795+else
3796+ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
3797+ if test $ac_mid -le $ac_hi; then
3798+ ac_lo= ac_hi=
3799+ break
3800+ fi
3801+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
3802+fi
3803+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3804+ done
3805+else
3806+ ac_lo= ac_hi=
3807+fi
3808+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3809+fi
3810+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3811+# Binary search between lo and hi bounds.
3812+while test "x$ac_lo" != "x$ac_hi"; do
3813+ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
3814+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3815+/* end confdefs.h. */
3816+$4
3817+int
3818+main ()
3819+{
3820+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
3821+test_array [0] = 0
3822+
3823+ ;
3824+ return 0;
3825+}
3826+_ACEOF
3827+if ac_fn_c_try_compile "$LINENO"; then :
3828+ ac_hi=$ac_mid
3829+else
3830+ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
3831+fi
3832+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3833+done
3834+case $ac_lo in #((
3835+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
3836+'') ac_retval=1 ;;
3837+esac
3838+ else
3839+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3840+/* end confdefs.h. */
3841+$4
3842+static long int longval () { return $2; }
3843+static unsigned long int ulongval () { return $2; }
3844+#include <stdio.h>
3845+#include <stdlib.h>
3846+int
3847+main ()
3848+{
3849+
3850+ FILE *f = fopen ("conftest.val", "w");
3851+ if (! f)
3852+ return 1;
3853+ if (($2) < 0)
3854+ {
3855+ long int i = longval ();
3856+ if (i != ($2))
3857+ return 1;
3858+ fprintf (f, "%ld", i);
3859+ }
3860+ else
3861+ {
3862+ unsigned long int i = ulongval ();
3863+ if (i != ($2))
3864+ return 1;
3865+ fprintf (f, "%lu", i);
3866+ }
3867+ /* Do not output a trailing newline, as this causes \r\n confusion
3868+ on some platforms. */
3869+ return ferror (f) || fclose (f) != 0;
3870+
3871+ ;
3872+ return 0;
3873+}
3874+_ACEOF
3875+if ac_fn_c_try_run "$LINENO"; then :
3876+ echo >>conftest.val; read $3 <conftest.val; ac_retval=0
3877+else
3878+ ac_retval=1
3879+fi
3880+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
3881+ conftest.$ac_objext conftest.beam conftest.$ac_ext
3882+rm -f conftest.val
3883+
3884+ fi
3885+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3886+ return $ac_retval
3887+
3888+} # ac_fn_c_compute_int
3889+
3890+# ac_fn_c_check_decl LINENO SYMBOL VAR
3891+# ------------------------------------
3892+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
3893+ac_fn_c_check_decl ()
3894+{
3895+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3896+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
3897+$as_echo_n "checking whether $2 is declared... " >&6; }
3898+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
3899+ $as_echo_n "(cached) " >&6
3900+else
3901+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3902+/* end confdefs.h. */
3903+$4
3904+int
3905+main ()
3906+{
3907+#ifndef $2
3908+ (void) $2;
3909+#endif
3910+
3911+ ;
3912+ return 0;
3913+}
3914+_ACEOF
3915+if ac_fn_c_try_compile "$LINENO"; then :
3916+ eval "$3=yes"
3917+else
3918+ eval "$3=no"
3919+fi
3920+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3921+fi
3922+eval ac_res=\$$3
3923+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3924+$as_echo "$ac_res" >&6; }
3925+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3926+
3927+} # ac_fn_c_check_decl
3928 cat >config.log <<_ACEOF
3929 This file contains any messages produced by compilers while
3930 running configure, to aid debugging if configure makes a mistake.
3931
3932-It was created by gnupg $as_me 1.4.10, which was
3933-generated by GNU Autoconf 2.61. Invocation command line was
3934+It was created by gnupg $as_me 1.4.11, which was
3935+generated by GNU Autoconf 2.64. Invocation command line was
3936
3937 $ $0 $@
3938
3939@@ -1627,8 +2334,8 @@
3940 do
3941 IFS=$as_save_IFS
3942 test -z "$as_dir" && as_dir=.
3943- echo "PATH: $as_dir"
3944-done
3945+ $as_echo "PATH: $as_dir"
3946+ done
3947 IFS=$as_save_IFS
3948
3949 } >&5
3950@@ -1662,12 +2369,12 @@
3951 | -silent | --silent | --silen | --sile | --sil)
3952 continue ;;
3953 *\'*)
3954- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
3955+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
3956 esac
3957 case $ac_pass in
3958- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
3959+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
3960 2)
3961- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
3962+ as_fn_append ac_configure_args1 " '$ac_arg'"
3963 if test $ac_must_keep_next = true; then
3964 ac_must_keep_next=false # Got value, back to normal.
3965 else
3966@@ -1683,13 +2390,13 @@
3967 -* ) ac_must_keep_next=true ;;
3968 esac
3969 fi
3970- ac_configure_args="$ac_configure_args '$ac_arg'"
3971+ as_fn_append ac_configure_args " '$ac_arg'"
3972 ;;
3973 esac
3974 done
3975 done
3976-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
3977-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
3978+{ ac_configure_args0=; unset ac_configure_args0;}
3979+{ ac_configure_args1=; unset ac_configure_args1;}
3980
3981 # When interrupted or exit'd, cleanup temporary files, and complete
3982 # config.log. We remove comments because anyway the quotes in there
3983@@ -1714,12 +2421,13 @@
3984 case $ac_val in #(
3985 *${as_nl}*)
3986 case $ac_var in #(
3987- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
3988-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
3989+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
3990+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
3991 esac
3992 case $ac_var in #(
3993 _ | IFS | as_nl) ;; #(
3994- *) $as_unset $ac_var ;;
3995+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
3996+ *) { eval $ac_var=; unset $ac_var;} ;;
3997 esac ;;
3998 esac
3999 done
4000@@ -1748,9 +2456,9 @@
4001 do
4002 eval ac_val=\$$ac_var
4003 case $ac_val in
4004- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
4005+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
4006 esac
4007- echo "$ac_var='\''$ac_val'\''"
4008+ $as_echo "$ac_var='\''$ac_val'\''"
4009 done | sort
4010 echo
4011
4012@@ -1765,9 +2473,9 @@
4013 do
4014 eval ac_val=\$$ac_var
4015 case $ac_val in
4016- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
4017+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
4018 esac
4019- echo "$ac_var='\''$ac_val'\''"
4020+ $as_echo "$ac_var='\''$ac_val'\''"
4021 done | sort
4022 echo
4023 fi
4024@@ -1783,64 +2491,69 @@
4025 echo
4026 fi
4027 test "$ac_signal" != 0 &&
4028- echo "$as_me: caught signal $ac_signal"
4029- echo "$as_me: exit $exit_status"
4030+ $as_echo "$as_me: caught signal $ac_signal"
4031+ $as_echo "$as_me: exit $exit_status"
4032 } >&5
4033 rm -f core *.core core.conftest.* &&
4034 rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
4035 exit $exit_status
4036 ' 0
4037 for ac_signal in 1 2 13 15; do
4038- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
4039+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
4040 done
4041 ac_signal=0
4042
4043 # confdefs.h avoids OS command line length limits that DEFS can exceed.
4044 rm -f -r conftest* confdefs.h
4045
4046+$as_echo "/* confdefs.h */" > confdefs.h
4047+
4048 # Predefined preprocessor variables.
4049
4050 cat >>confdefs.h <<_ACEOF
4051 #define PACKAGE_NAME "$PACKAGE_NAME"
4052 _ACEOF
4053
4054-
4055 cat >>confdefs.h <<_ACEOF
4056 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
4057 _ACEOF
4058
4059-
4060 cat >>confdefs.h <<_ACEOF
4061 #define PACKAGE_VERSION "$PACKAGE_VERSION"
4062 _ACEOF
4063
4064-
4065 cat >>confdefs.h <<_ACEOF
4066 #define PACKAGE_STRING "$PACKAGE_STRING"
4067 _ACEOF
4068
4069-
4070 cat >>confdefs.h <<_ACEOF
4071 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
4072 _ACEOF
4073
4074+cat >>confdefs.h <<_ACEOF
4075+#define PACKAGE_URL "$PACKAGE_URL"
4076+_ACEOF
4077+
4078
4079 # Let the site file select an alternate cache file if it wants to.
4080-# Prefer explicitly selected file to automatically selected ones.
4081+# Prefer an explicitly selected file to automatically selected ones.
4082+ac_site_file1=NONE
4083+ac_site_file2=NONE
4084 if test -n "$CONFIG_SITE"; then
4085- set x "$CONFIG_SITE"
4086+ ac_site_file1=$CONFIG_SITE
4087 elif test "x$prefix" != xNONE; then
4088- set x "$prefix/share/config.site" "$prefix/etc/config.site"
4089+ ac_site_file1=$prefix/share/config.site
4090+ ac_site_file2=$prefix/etc/config.site
4091 else
4092- set x "$ac_default_prefix/share/config.site" \
4093- "$ac_default_prefix/etc/config.site"
4094+ ac_site_file1=$ac_default_prefix/share/config.site
4095+ ac_site_file2=$ac_default_prefix/etc/config.site
4096 fi
4097-shift
4098-for ac_site_file
4099+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
4100 do
4101+ test "x$ac_site_file" = xNONE && continue
4102 if test -r "$ac_site_file"; then
4103- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
4104-echo "$as_me: loading site script $ac_site_file" >&6;}
4105+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
4106+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
4107 sed 's/^/| /' "$ac_site_file" >&5
4108 . "$ac_site_file"
4109 fi
4110@@ -1850,16 +2563,16 @@
4111 # Some versions of bash will fail to source /dev/null (special
4112 # files actually), so we avoid doing that.
4113 if test -f "$cache_file"; then
4114- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
4115-echo "$as_me: loading cache $cache_file" >&6;}
4116+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
4117+$as_echo "$as_me: loading cache $cache_file" >&6;}
4118 case $cache_file in
4119 [\\/]* | ?:[\\/]* ) . "$cache_file";;
4120 *) . "./$cache_file";;
4121 esac
4122 fi
4123 else
4124- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
4125-echo "$as_me: creating cache $cache_file" >&6;}
4126+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
4127+$as_echo "$as_me: creating cache $cache_file" >&6;}
4128 >$cache_file
4129 fi
4130
4131@@ -1874,68 +2587,56 @@
4132 eval ac_new_val=\$ac_env_${ac_var}_value
4133 case $ac_old_set,$ac_new_set in
4134 set,)
4135- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
4136-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
4137+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
4138+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
4139 ac_cache_corrupted=: ;;
4140 ,set)
4141- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
4142-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
4143+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
4144+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
4145 ac_cache_corrupted=: ;;
4146 ,);;
4147 *)
4148 if test "x$ac_old_val" != "x$ac_new_val"; then
4149- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
4150-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
4151- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
4152-echo "$as_me: former value: $ac_old_val" >&2;}
4153- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
4154-echo "$as_me: current value: $ac_new_val" >&2;}
4155- ac_cache_corrupted=:
4156+ # differences in whitespace do not lead to failure.
4157+ ac_old_val_w=`echo x $ac_old_val`
4158+ ac_new_val_w=`echo x $ac_new_val`
4159+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
4160+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
4161+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
4162+ ac_cache_corrupted=:
4163+ else
4164+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
4165+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
4166+ eval $ac_var=\$ac_old_val
4167+ fi
4168+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
4169+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
4170+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
4171+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
4172 fi;;
4173 esac
4174 # Pass precious variables to config.status.
4175 if test "$ac_new_set" = set; then
4176 case $ac_new_val in
4177- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
4178+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
4179 *) ac_arg=$ac_var=$ac_new_val ;;
4180 esac
4181 case " $ac_configure_args " in
4182 *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
4183- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
4184+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
4185 esac
4186 fi
4187 done
4188 if $ac_cache_corrupted; then
4189- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
4190-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
4191- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
4192-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
4193- { (exit 1); exit 1; }; }
4194+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4195+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4196+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
4197+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
4198+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
4199 fi
4200-
4201-
4202-
4203-
4204-
4205-
4206-
4207-
4208-
4209-
4210-
4211-
4212-
4213-
4214-
4215-
4216-
4217-
4218-
4219-
4220-
4221-
4222-
4223-
4224+## -------------------- ##
4225+## Main body of script. ##
4226+## -------------------- ##
4227
4228 ac_ext=c
4229 ac_cpp='$CPP $CPPFLAGS'
4230@@ -1951,24 +2652,16 @@
4231
4232 ac_aux_dir=
4233 for ac_dir in scripts "$srcdir"/scripts; do
4234- if test -f "$ac_dir/install-sh"; then
4235- ac_aux_dir=$ac_dir
4236- ac_install_sh="$ac_aux_dir/install-sh -c"
4237- break
4238- elif test -f "$ac_dir/install.sh"; then
4239- ac_aux_dir=$ac_dir
4240- ac_install_sh="$ac_aux_dir/install.sh -c"
4241- break
4242- elif test -f "$ac_dir/shtool"; then
4243- ac_aux_dir=$ac_dir
4244- ac_install_sh="$ac_aux_dir/shtool install -c"
4245- break
4246- fi
4247+ for ac_t in install-sh install.sh shtool; do
4248+ if test -f "$ac_dir/$ac_t"; then
4249+ ac_aux_dir=$ac_dir
4250+ ac_install_sh="$ac_aux_dir/$ac_t -c"
4251+ break 2
4252+ fi
4253+ done
4254 done
4255 if test -z "$ac_aux_dir"; then
4256- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&5
4257-echo "$as_me: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&2;}
4258- { (exit 1); exit 1; }; }
4259+ as_fn_error "cannot find install-sh, install.sh, or shtool in scripts \"$srcdir\"/scripts" "$LINENO" 5
4260 fi
4261
4262 # These three variables are undocumented and unsupported,
4263@@ -1983,35 +2676,27 @@
4264
4265 # Make sure we can run config.sub.
4266 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
4267- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
4268-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
4269- { (exit 1); exit 1; }; }
4270+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
4271
4272-{ echo "$as_me:$LINENO: checking build system type" >&5
4273-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
4274-if test "${ac_cv_build+set}" = set; then
4275- echo $ECHO_N "(cached) $ECHO_C" >&6
4276+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
4277+$as_echo_n "checking build system type... " >&6; }
4278+if test "${ac_cv_build+set}" = set; then :
4279+ $as_echo_n "(cached) " >&6
4280 else
4281 ac_build_alias=$build_alias
4282 test "x$ac_build_alias" = x &&
4283 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
4284 test "x$ac_build_alias" = x &&
4285- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
4286-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
4287- { (exit 1); exit 1; }; }
4288+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
4289 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
4290- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
4291-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
4292- { (exit 1); exit 1; }; }
4293+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
4294
4295 fi
4296-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
4297-echo "${ECHO_T}$ac_cv_build" >&6; }
4298+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
4299+$as_echo "$ac_cv_build" >&6; }
4300 case $ac_cv_build in
4301 *-*-*) ;;
4302-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
4303-echo "$as_me: error: invalid value of canonical build" >&2;}
4304- { (exit 1); exit 1; }; };;
4305+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
4306 esac
4307 build=$ac_cv_build
4308 ac_save_IFS=$IFS; IFS='-'
4309@@ -2027,28 +2712,24 @@
4310 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
4311
4312
4313-{ echo "$as_me:$LINENO: checking host system type" >&5
4314-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
4315-if test "${ac_cv_host+set}" = set; then
4316- echo $ECHO_N "(cached) $ECHO_C" >&6
4317+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
4318+$as_echo_n "checking host system type... " >&6; }
4319+if test "${ac_cv_host+set}" = set; then :
4320+ $as_echo_n "(cached) " >&6
4321 else
4322 if test "x$host_alias" = x; then
4323 ac_cv_host=$ac_cv_build
4324 else
4325 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
4326- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
4327-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
4328- { (exit 1); exit 1; }; }
4329+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
4330 fi
4331
4332 fi
4333-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
4334-echo "${ECHO_T}$ac_cv_host" >&6; }
4335+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
4336+$as_echo "$ac_cv_host" >&6; }
4337 case $ac_cv_host in
4338 *-*-*) ;;
4339-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
4340-echo "$as_me: error: invalid value of canonical host" >&2;}
4341- { (exit 1); exit 1; }; };;
4342+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
4343 esac
4344 host=$ac_cv_host
4345 ac_save_IFS=$IFS; IFS='-'
4346@@ -2079,22 +2760,23 @@
4347 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
4348 # OS/2's system install, which has a completely different semantic
4349 # ./install, which can be erroneously created by make from ./install.sh.
4350-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
4351-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
4352+# Reject install programs that cannot install multiple files.
4353+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
4354+$as_echo_n "checking for a BSD-compatible install... " >&6; }
4355 if test -z "$INSTALL"; then
4356-if test "${ac_cv_path_install+set}" = set; then
4357- echo $ECHO_N "(cached) $ECHO_C" >&6
4358+if test "${ac_cv_path_install+set}" = set; then :
4359+ $as_echo_n "(cached) " >&6
4360 else
4361 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4362 for as_dir in $PATH
4363 do
4364 IFS=$as_save_IFS
4365 test -z "$as_dir" && as_dir=.
4366- # Account for people who put trailing slashes in PATH elements.
4367-case $as_dir/ in
4368- ./ | .// | /cC/* | \
4369+ # Account for people who put trailing slashes in PATH elements.
4370+case $as_dir/ in #((
4371+ ./ | .// | /[cC]/* | \
4372 /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
4373- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
4374+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
4375 /usr/ucb/* ) ;;
4376 *)
4377 # OSF1 and SCO ODT 3.0 have their own names for install.
4378@@ -2112,17 +2794,29 @@
4379 # program-specific install script used by HP pwplus--don't use.
4380 :
4381 else
4382- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
4383- break 3
4384+ rm -rf conftest.one conftest.two conftest.dir
4385+ echo one > conftest.one
4386+ echo two > conftest.two
4387+ mkdir conftest.dir
4388+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
4389+ test -s conftest.one && test -s conftest.two &&
4390+ test -s conftest.dir/conftest.one &&
4391+ test -s conftest.dir/conftest.two
4392+ then
4393+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
4394+ break 3
4395+ fi
4396 fi
4397 fi
4398 done
4399 done
4400 ;;
4401 esac
4402-done
4403+
4404+ done
4405 IFS=$as_save_IFS
4406
4407+rm -rf conftest.one conftest.two conftest.dir
4408
4409 fi
4410 if test "${ac_cv_path_install+set}" = set; then
4411@@ -2135,8 +2829,8 @@
4412 INSTALL=$ac_install_sh
4413 fi
4414 fi
4415-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
4416-echo "${ECHO_T}$INSTALL" >&6; }
4417+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
4418+$as_echo "$INSTALL" >&6; }
4419
4420 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
4421 # It thinks the first close brace ends the variable substitution.
4422@@ -2146,8 +2840,8 @@
4423
4424 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
4425
4426-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
4427-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
4428+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
4429+$as_echo_n "checking whether build environment is sane... " >&6; }
4430 # Just in case
4431 sleep 1
4432 echo timestamp > conftest.file
4433@@ -2170,11 +2864,8 @@
4434 # if, for instance, CONFIG_SHELL is bash and it inherits a
4435 # broken ls alias from the environment. This has actually
4436 # happened. Such a system could not be considered "sane".
4437- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
4438-alias in your environment" >&5
4439-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
4440-alias in your environment" >&2;}
4441- { (exit 1); exit 1; }; }
4442+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
4443+alias in your environment" "$LINENO" 5
4444 fi
4445
4446 test "$2" = conftest.file
4447@@ -2183,26 +2874,20 @@
4448 # Ok.
4449 :
4450 else
4451- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
4452-Check your system clock" >&5
4453-echo "$as_me: error: newly created file is older than distributed files!
4454-Check your system clock" >&2;}
4455- { (exit 1); exit 1; }; }
4456+ as_fn_error "newly created file is older than distributed files!
4457+Check your system clock" "$LINENO" 5
4458 fi
4459-{ echo "$as_me:$LINENO: result: yes" >&5
4460-echo "${ECHO_T}yes" >&6; }
4461+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4462+$as_echo "yes" >&6; }
4463 test "$program_prefix" != NONE &&
4464 program_transform_name="s&^&$program_prefix&;$program_transform_name"
4465 # Use a double $ so make ignores it.
4466 test "$program_suffix" != NONE &&
4467 program_transform_name="s&\$&$program_suffix&;$program_transform_name"
4468-# Double any \ or $. echo might interpret backslashes.
4469+# Double any \ or $.
4470 # By default was `s,x,x', remove it if useless.
4471-cat <<\_ACEOF >conftest.sed
4472-s/[\\$]/&&/g;s/;s,x,x,$//
4473-_ACEOF
4474-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
4475-rm -f conftest.sed
4476+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
4477+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
4478
4479 # expand $ac_aux_dir to an absolute path
4480 am_aux_dir=`cd $ac_aux_dir && pwd`
4481@@ -2213,22 +2898,22 @@
4482 am_missing_run="$MISSING --run "
4483 else
4484 am_missing_run=
4485- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
4486-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
4487+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
4488+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
4489 fi
4490
4491-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
4492-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
4493+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
4494+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
4495 if test -z "$MKDIR_P"; then
4496- if test "${ac_cv_path_mkdir+set}" = set; then
4497- echo $ECHO_N "(cached) $ECHO_C" >&6
4498+ if test "${ac_cv_path_mkdir+set}" = set; then :
4499+ $as_echo_n "(cached) " >&6
4500 else
4501 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4502 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
4503 do
4504 IFS=$as_save_IFS
4505 test -z "$as_dir" && as_dir=.
4506- for ac_prog in mkdir gmkdir; do
4507+ for ac_prog in mkdir gmkdir; do
4508 for ac_exec_ext in '' $ac_executable_extensions; do
4509 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
4510 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
4511@@ -2240,7 +2925,7 @@
4512 esac
4513 done
4514 done
4515-done
4516+ done
4517 IFS=$as_save_IFS
4518
4519 fi
4520@@ -2256,8 +2941,8 @@
4521 MKDIR_P="$ac_install_sh -d"
4522 fi
4523 fi
4524-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
4525-echo "${ECHO_T}$MKDIR_P" >&6; }
4526+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
4527+$as_echo "$MKDIR_P" >&6; }
4528
4529 mkdir_p="$MKDIR_P"
4530 case $mkdir_p in
4531@@ -2269,10 +2954,10 @@
4532 do
4533 # Extract the first word of "$ac_prog", so it can be a program name with args.
4534 set dummy $ac_prog; ac_word=$2
4535-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4536-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4537-if test "${ac_cv_prog_AWK+set}" = set; then
4538- echo $ECHO_N "(cached) $ECHO_C" >&6
4539+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4540+$as_echo_n "checking for $ac_word... " >&6; }
4541+if test "${ac_cv_prog_AWK+set}" = set; then :
4542+ $as_echo_n "(cached) " >&6
4543 else
4544 if test -n "$AWK"; then
4545 ac_cv_prog_AWK="$AWK" # Let the user override the test.
4546@@ -2282,36 +2967,37 @@
4547 do
4548 IFS=$as_save_IFS
4549 test -z "$as_dir" && as_dir=.
4550- for ac_exec_ext in '' $ac_executable_extensions; do
4551+ for ac_exec_ext in '' $ac_executable_extensions; do
4552 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4553 ac_cv_prog_AWK="$ac_prog"
4554- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4555+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4556 break 2
4557 fi
4558 done
4559-done
4560+ done
4561 IFS=$as_save_IFS
4562
4563 fi
4564 fi
4565 AWK=$ac_cv_prog_AWK
4566 if test -n "$AWK"; then
4567- { echo "$as_me:$LINENO: result: $AWK" >&5
4568-echo "${ECHO_T}$AWK" >&6; }
4569+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
4570+$as_echo "$AWK" >&6; }
4571 else
4572- { echo "$as_me:$LINENO: result: no" >&5
4573-echo "${ECHO_T}no" >&6; }
4574+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4575+$as_echo "no" >&6; }
4576 fi
4577
4578
4579 test -n "$AWK" && break
4580 done
4581
4582-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
4583-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
4584-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
4585-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
4586- echo $ECHO_N "(cached) $ECHO_C" >&6
4587+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
4588+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
4589+set x ${MAKE-make}
4590+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
4591+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
4592+ $as_echo_n "(cached) " >&6
4593 else
4594 cat >conftest.make <<\_ACEOF
4595 SHELL = /bin/sh
4596@@ -2328,12 +3014,12 @@
4597 rm -f conftest.make
4598 fi
4599 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
4600- { echo "$as_me:$LINENO: result: yes" >&5
4601-echo "${ECHO_T}yes" >&6; }
4602+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4603+$as_echo "yes" >&6; }
4604 SET_MAKE=
4605 else
4606- { echo "$as_me:$LINENO: result: no" >&5
4607-echo "${ECHO_T}no" >&6; }
4608+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4609+$as_echo "no" >&6; }
4610 SET_MAKE="MAKE=${MAKE-make}"
4611 fi
4612
4613@@ -2352,9 +3038,7 @@
4614 am__isrc=' -I$(srcdir)'
4615 # test to see if srcdir already configured
4616 if test -f $srcdir/config.status; then
4617- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
4618-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
4619- { (exit 1); exit 1; }; }
4620+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
4621 fi
4622 fi
4623
4624@@ -2370,7 +3054,7 @@
4625
4626 # Define the identity of the package.
4627 PACKAGE='gnupg'
4628- VERSION='1.4.10'
4629+ VERSION='1.4.11'
4630
4631
4632 cat >>confdefs.h <<_ACEOF
4633@@ -2408,10 +3092,10 @@
4634 if test -n "$ac_tool_prefix"; then
4635 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4636 set dummy ${ac_tool_prefix}strip; ac_word=$2
4637-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4638-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4639-if test "${ac_cv_prog_STRIP+set}" = set; then
4640- echo $ECHO_N "(cached) $ECHO_C" >&6
4641+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4642+$as_echo_n "checking for $ac_word... " >&6; }
4643+if test "${ac_cv_prog_STRIP+set}" = set; then :
4644+ $as_echo_n "(cached) " >&6
4645 else
4646 if test -n "$STRIP"; then
4647 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
4648@@ -2421,25 +3105,25 @@
4649 do
4650 IFS=$as_save_IFS
4651 test -z "$as_dir" && as_dir=.
4652- for ac_exec_ext in '' $ac_executable_extensions; do
4653+ for ac_exec_ext in '' $ac_executable_extensions; do
4654 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4655 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
4656- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4657+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4658 break 2
4659 fi
4660 done
4661-done
4662+ done
4663 IFS=$as_save_IFS
4664
4665 fi
4666 fi
4667 STRIP=$ac_cv_prog_STRIP
4668 if test -n "$STRIP"; then
4669- { echo "$as_me:$LINENO: result: $STRIP" >&5
4670-echo "${ECHO_T}$STRIP" >&6; }
4671+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
4672+$as_echo "$STRIP" >&6; }
4673 else
4674- { echo "$as_me:$LINENO: result: no" >&5
4675-echo "${ECHO_T}no" >&6; }
4676+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4677+$as_echo "no" >&6; }
4678 fi
4679
4680
4681@@ -2448,10 +3132,10 @@
4682 ac_ct_STRIP=$STRIP
4683 # Extract the first word of "strip", so it can be a program name with args.
4684 set dummy strip; ac_word=$2
4685-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4686-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4687-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
4688- echo $ECHO_N "(cached) $ECHO_C" >&6
4689+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4690+$as_echo_n "checking for $ac_word... " >&6; }
4691+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
4692+ $as_echo_n "(cached) " >&6
4693 else
4694 if test -n "$ac_ct_STRIP"; then
4695 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
4696@@ -2461,25 +3145,25 @@
4697 do
4698 IFS=$as_save_IFS
4699 test -z "$as_dir" && as_dir=.
4700- for ac_exec_ext in '' $ac_executable_extensions; do
4701+ for ac_exec_ext in '' $ac_executable_extensions; do
4702 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4703 ac_cv_prog_ac_ct_STRIP="strip"
4704- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4705+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4706 break 2
4707 fi
4708 done
4709-done
4710+ done
4711 IFS=$as_save_IFS
4712
4713 fi
4714 fi
4715 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
4716 if test -n "$ac_ct_STRIP"; then
4717- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
4718-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
4719+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
4720+$as_echo "$ac_ct_STRIP" >&6; }
4721 else
4722- { echo "$as_me:$LINENO: result: no" >&5
4723-echo "${ECHO_T}no" >&6; }
4724+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4725+$as_echo "no" >&6; }
4726 fi
4727
4728 if test "x$ac_ct_STRIP" = x; then
4729@@ -2487,12 +3171,8 @@
4730 else
4731 case $cross_compiling:$ac_tool_warned in
4732 yes:)
4733-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
4734-whose name does not start with the host triplet. If you think this
4735-configuration is useful to you, please write to autoconf@gnu.org." >&5
4736-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
4737-whose name does not start with the host triplet. If you think this
4738-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
4739+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4740+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4741 ac_tool_warned=yes ;;
4742 esac
4743 STRIP=$ac_ct_STRIP
4744@@ -2520,14 +3200,14 @@
4745
4746
4747
4748- { echo "$as_me:$LINENO: autobuild project... ${PACKAGE_NAME:-$PACKAGE}" >&5
4749-echo "$as_me: autobuild project... ${PACKAGE_NAME:-$PACKAGE}" >&6;}
4750- { echo "$as_me:$LINENO: autobuild revision... ${PACKAGE_VERSION:-$VERSION}" >&5
4751-echo "$as_me: autobuild revision... ${PACKAGE_VERSION:-$VERSION}" >&6;}
4752+ { $as_echo "$as_me:${as_lineno-$LINENO}: autobuild project... ${PACKAGE_NAME:-$PACKAGE}" >&5
4753+$as_echo "$as_me: autobuild project... ${PACKAGE_NAME:-$PACKAGE}" >&6;}
4754+ { $as_echo "$as_me:${as_lineno-$LINENO}: autobuild revision... ${PACKAGE_VERSION:-$VERSION}" >&5
4755+$as_echo "$as_me: autobuild revision... ${PACKAGE_VERSION:-$VERSION}" >&6;}
4756 hostname=`hostname`
4757 if test "$hostname"; then
4758- { echo "$as_me:$LINENO: autobuild hostname... $hostname" >&5
4759-echo "$as_me: autobuild hostname... $hostname" >&6;}
4760+ { $as_echo "$as_me:${as_lineno-$LINENO}: autobuild hostname... $hostname" >&5
4761+$as_echo "$as_me: autobuild hostname... $hostname" >&6;}
4762 fi
4763
4764 date=`date +%Y%m%d-%H%M%S`
4765@@ -2535,24 +3215,1416 @@
4766 date=`date`
4767 fi
4768 if test "$date"; then
4769- { echo "$as_me:$LINENO: autobuild timestamp... $date" >&5
4770-echo "$as_me: autobuild timestamp... $date" >&6;}
4771+ { $as_echo "$as_me:${as_lineno-$LINENO}: autobuild timestamp... $date" >&5
4772+$as_echo "$as_me: autobuild timestamp... $date" >&6;}
4773 fi
4774
4775 ac_config_headers="$ac_config_headers config.h"
4776
4777
4778-
4779-cat >>confdefs.h <<\_ACEOF
4780-#define _GNU_SOURCE 1
4781-_ACEOF
4782-
4783-
4784-
4785-{ echo "$as_me:$LINENO: checking which random module to use" >&5
4786-echo $ECHO_N "checking which random module to use... $ECHO_C" >&6; }
4787+DEPDIR="${am__leading_dot}deps"
4788+
4789+ac_config_commands="$ac_config_commands depfiles"
4790+
4791+
4792+am_make=${MAKE-make}
4793+cat > confinc << 'END'
4794+am__doit:
4795+ @echo done
4796+.PHONY: am__doit
4797+END
4798+# If we don't find an include directive, just comment out the code.
4799+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
4800+$as_echo_n "checking for style of include used by $am_make... " >&6; }
4801+am__include="#"
4802+am__quote=
4803+_am_result=none
4804+# First try GNU make style include.
4805+echo "include confinc" > confmf
4806+# We grep out `Entering directory' and `Leaving directory'
4807+# messages which can occur if `w' ends up in MAKEFLAGS.
4808+# In particular we don't look at `^make:' because GNU make might
4809+# be invoked under some other name (usually "gmake"), in which
4810+# case it prints its new name instead of `make'.
4811+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
4812+ am__include=include
4813+ am__quote=
4814+ _am_result=GNU
4815+fi
4816+# Now try BSD make style include.
4817+if test "$am__include" = "#"; then
4818+ echo '.include "confinc"' > confmf
4819+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
4820+ am__include=.include
4821+ am__quote="\""
4822+ _am_result=BSD
4823+ fi
4824+fi
4825+
4826+
4827+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
4828+$as_echo "$_am_result" >&6; }
4829+rm -f confinc confmf
4830+
4831+# Check whether --enable-dependency-tracking was given.
4832+if test "${enable_dependency_tracking+set}" = set; then :
4833+ enableval=$enable_dependency_tracking;
4834+fi
4835+
4836+if test "x$enable_dependency_tracking" != xno; then
4837+ am_depcomp="$ac_aux_dir/depcomp"
4838+ AMDEPBACKSLASH='\'
4839+fi
4840+ if test "x$enable_dependency_tracking" != xno; then
4841+ AMDEP_TRUE=
4842+ AMDEP_FALSE='#'
4843+else
4844+ AMDEP_TRUE='#'
4845+ AMDEP_FALSE=
4846+fi
4847+
4848+
4849+ac_ext=c
4850+ac_cpp='$CPP $CPPFLAGS'
4851+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4852+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4853+ac_compiler_gnu=$ac_cv_c_compiler_gnu
4854+if test -n "$ac_tool_prefix"; then
4855+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
4856+set dummy ${ac_tool_prefix}gcc; ac_word=$2
4857+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4858+$as_echo_n "checking for $ac_word... " >&6; }
4859+if test "${ac_cv_prog_CC+set}" = set; then :
4860+ $as_echo_n "(cached) " >&6
4861+else
4862+ if test -n "$CC"; then
4863+ ac_cv_prog_CC="$CC" # Let the user override the test.
4864+else
4865+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4866+for as_dir in $PATH
4867+do
4868+ IFS=$as_save_IFS
4869+ test -z "$as_dir" && as_dir=.
4870+ for ac_exec_ext in '' $ac_executable_extensions; do
4871+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4872+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
4873+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4874+ break 2
4875+ fi
4876+done
4877+ done
4878+IFS=$as_save_IFS
4879+
4880+fi
4881+fi
4882+CC=$ac_cv_prog_CC
4883+if test -n "$CC"; then
4884+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4885+$as_echo "$CC" >&6; }
4886+else
4887+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4888+$as_echo "no" >&6; }
4889+fi
4890+
4891+
4892+fi
4893+if test -z "$ac_cv_prog_CC"; then
4894+ ac_ct_CC=$CC
4895+ # Extract the first word of "gcc", so it can be a program name with args.
4896+set dummy gcc; ac_word=$2
4897+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4898+$as_echo_n "checking for $ac_word... " >&6; }
4899+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
4900+ $as_echo_n "(cached) " >&6
4901+else
4902+ if test -n "$ac_ct_CC"; then
4903+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
4904+else
4905+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4906+for as_dir in $PATH
4907+do
4908+ IFS=$as_save_IFS
4909+ test -z "$as_dir" && as_dir=.
4910+ for ac_exec_ext in '' $ac_executable_extensions; do
4911+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4912+ ac_cv_prog_ac_ct_CC="gcc"
4913+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4914+ break 2
4915+ fi
4916+done
4917+ done
4918+IFS=$as_save_IFS
4919+
4920+fi
4921+fi
4922+ac_ct_CC=$ac_cv_prog_ac_ct_CC
4923+if test -n "$ac_ct_CC"; then
4924+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
4925+$as_echo "$ac_ct_CC" >&6; }
4926+else
4927+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4928+$as_echo "no" >&6; }
4929+fi
4930+
4931+ if test "x$ac_ct_CC" = x; then
4932+ CC=""
4933+ else
4934+ case $cross_compiling:$ac_tool_warned in
4935+yes:)
4936+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4937+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4938+ac_tool_warned=yes ;;
4939+esac
4940+ CC=$ac_ct_CC
4941+ fi
4942+else
4943+ CC="$ac_cv_prog_CC"
4944+fi
4945+
4946+if test -z "$CC"; then
4947+ if test -n "$ac_tool_prefix"; then
4948+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
4949+set dummy ${ac_tool_prefix}cc; ac_word=$2
4950+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4951+$as_echo_n "checking for $ac_word... " >&6; }
4952+if test "${ac_cv_prog_CC+set}" = set; then :
4953+ $as_echo_n "(cached) " >&6
4954+else
4955+ if test -n "$CC"; then
4956+ ac_cv_prog_CC="$CC" # Let the user override the test.
4957+else
4958+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4959+for as_dir in $PATH
4960+do
4961+ IFS=$as_save_IFS
4962+ test -z "$as_dir" && as_dir=.
4963+ for ac_exec_ext in '' $ac_executable_extensions; do
4964+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4965+ ac_cv_prog_CC="${ac_tool_prefix}cc"
4966+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4967+ break 2
4968+ fi
4969+done
4970+ done
4971+IFS=$as_save_IFS
4972+
4973+fi
4974+fi
4975+CC=$ac_cv_prog_CC
4976+if test -n "$CC"; then
4977+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4978+$as_echo "$CC" >&6; }
4979+else
4980+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4981+$as_echo "no" >&6; }
4982+fi
4983+
4984+
4985+ fi
4986+fi
4987+if test -z "$CC"; then
4988+ # Extract the first word of "cc", so it can be a program name with args.
4989+set dummy cc; ac_word=$2
4990+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4991+$as_echo_n "checking for $ac_word... " >&6; }
4992+if test "${ac_cv_prog_CC+set}" = set; then :
4993+ $as_echo_n "(cached) " >&6
4994+else
4995+ if test -n "$CC"; then
4996+ ac_cv_prog_CC="$CC" # Let the user override the test.
4997+else
4998+ ac_prog_rejected=no
4999+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5000+for as_dir in $PATH
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches