Merge lp:~logan/ubuntu/wily/pinentry/0.9.2 into lp:ubuntu/wily/pinentry
- Wily (15.10)
- 0.9.2
- Merge into wily
Proposed by
Logan Rosen
Status: | Merged |
---|---|
Merge reported by: | Martin Pitt |
Merged at revision: | not available |
Proposed branch: | lp:~logan/ubuntu/wily/pinentry/0.9.2 |
Merge into: | lp:ubuntu/wily/pinentry |
Diff against target: |
59107 lines (+23052/-25245) 149 files modified
.pc/applied-patches (+4/-0) .pc/kubuntu_fix_stayontop.diff/qt4/pinentrydialog.cpp (+56/-21) AUTHORS (+1/-0) ChangeLog (+356/-0) Makefile.am (+7/-15) Makefile.in (+199/-183) NEWS (+52/-0) README (+7/-9) VERSION (+1/-1) aclocal.m4 (+542/-341) assuan/Makefile.am (+1/-1) assuan/Makefile.in (+145/-99) assuan/assuan-errors.c (+3/-0) assuan/assuan.h (+6/-3) autogen.rc (+25/-0) autogen.sh (+328/-76) build-aux/compile (+347/-0) build-aux/config.guess (+1421/-0) build-aux/config.rpath (+690/-0) build-aux/config.sub (+1807/-0) build-aux/depcomp (+791/-0) build-aux/install-sh (+527/-0) build-aux/mdate-sh (+224/-0) build-aux/missing (+215/-0) build-aux/texinfo.tex (+8638/-0) config.guess (+0/-1534) config.h.in (+9/-19) config.rpath (+0/-571) config.sub (+0/-1786) configure (+642/-3129) configure.ac (+109/-135) curses/Makefile.am (+5/-7) curses/Makefile.in (+158/-112) curses/Manifest (+0/-3) curses/pinentry-curses.c (+6/-11) debian/Makefile (+0/-24) debian/README.Debian (+51/-0) debian/changelog (+39/-0) debian/compat (+1/-1) debian/control (+49/-14) debian/copyright (+171/-36) debian/gbp.conf (+3/-0) debian/patches/0001-avoid-self-describing-as-a-beta.patch (+33/-0) debian/patches/0002-curses-app-should-terminate-when-tty-fails.patch (+30/-0) debian/patches/0003-Fix-linking-order-to-work-when-linked-with-as-needed.patch (+85/-0) debian/patches/0004-avoid-implicit-declaration-of-function-addnwstr.patch (+32/-0) debian/patches/kubuntu_fix_stayontop.diff (+6/-11) debian/patches/series (+4/-0) debian/pinentry-curses.1 (+77/-0) debian/pinentry-curses.install (+1/-0) debian/pinentry-curses.manpages (+1/-0) debian/pinentry-curses.postinst (+11/-0) debian/pinentry-curses.prerm (+9/-0) debian/pinentry-gtk-2.1 (+75/-0) debian/pinentry-gtk2.install (+1/-0) debian/pinentry-gtk2.manpages (+1/-0) debian/pinentry-gtk2.postinst (+14/-0) debian/pinentry-gtk2.prerm (+10/-0) debian/pinentry-qt4.1 (+75/-0) debian/pinentry-qt4.install (+1/-0) debian/pinentry-qt4.manpages (+1/-0) debian/pinentry-qt4.postinst (+14/-0) debian/pinentry-qt4.prerm (+10/-0) debian/pinentry-tty.1 (+80/-0) debian/pinentry-tty.install (+1/-0) debian/pinentry-tty.manpages (+1/-0) debian/pinentry-tty.postinst (+11/-0) debian/pinentry-tty.prerm (+9/-0) debian/pinentry.1.in (+0/-95) debian/pinentry.README.Debian.in (+0/-52) debian/pinentry.install.in (+0/-1) debian/pinentry.manpages.in (+0/-1) debian/pinentry.postinst.in (+0/-25) debian/pinentry.prerm.in (+0/-16) debian/rules (+13/-27) debian/upstream/signing-key.asc (+33/-0) debian/watch (+1/-1) doc/Makefile.in (+130/-87) doc/gpl.texi (+6/-11) doc/pinentry.info (+236/-187) doc/pinentry.texi (+99/-47) doc/stamp-vti (+4/-4) doc/version.texi (+4/-4) gtk+-2/Makefile.am (+3/-3) gtk+-2/Makefile.in (+155/-109) gtk+-2/gtksecentry.c (+144/-5) gtk+-2/gtksecentry.h (+11/-6) gtk+-2/pinentry-gtk-2.c (+162/-34) gtk/Makefile.am (+0/-40) gtk/Makefile.in (+0/-587) gtk/Manifest (+0/-5) gtk/gtksecentry.c (+0/-2410) gtk/gtksecentry.h (+0/-114) gtk/pinentry-gtk.c (+0/-428) m4/glib.m4 (+0/-196) m4/gtk.m4 (+0/-194) m4/qt.m4 (+1/-1) pinentry/Makefile.am (+5/-3) pinentry/Makefile.in (+158/-105) pinentry/argparse.c (+1607/-0) pinentry/argparse.h (+203/-0) pinentry/password-cache.c (+137/-0) pinentry/password-cache.h (+27/-0) pinentry/pinentry-curses.c (+61/-15) pinentry/pinentry.c (+259/-99) pinentry/pinentry.h (+53/-15) qt/Makefile.am (+0/-54) qt/Makefile.in (+0/-615) qt/Manifest (+0/-9) qt/README.SecQ (+0/-17) qt/main.cpp (+0/-240) qt/pinentrydialog.cpp (+0/-232) qt/pinentrydialog.h (+0/-92) qt/secqinternal.cpp (+0/-635) qt/secqinternal_p.h (+0/-140) qt/secqlineedit.cpp (+0/-1953) qt/secqlineedit.h (+0/-228) qt/secqstring.cpp (+0/-940) qt/secqstring.h (+0/-307) qt4/Makefile.am (+0/-49) qt4/Makefile.in (+0/-604) qt4/main.cpp (+0/-321) qt4/pinentry.qrc (+0/-6) qt4/pinentryconfirm.cpp (+0/-42) qt4/pinentryconfirm.h (+0/-41) qt4/pinentryconfirm.moc (+0/-94) qt4/pinentrydialog.cpp (+0/-321) qt4/pinentrydialog.h (+0/-100) qt4/pinentrydialog.moc (+0/-136) qt4/qrc_pinentry.cpp (+0/-180) qt4/qsecurelineedit.cpp (+0/-3591) qt4/qsecurelineedit.h (+0/-314) qt4/qsecurelineedit.moc (+0/-269) qt4/qsecurelineedit_p.h (+0/-256) qt4/secstring.cpp (+0/-104) qt4/secstring.h (+0/-40) secmem/Makefile.am (+2/-4) secmem/Makefile.in (+146/-101) secmem/Manifest (+0/-7) secmem/secmem.c (+4/-0) tty/Makefile.am (+28/-0) tty/Makefile.in (+618/-0) tty/pinentry-tty.c (+257/-0) w32/Makefile.am (+7/-5) w32/Makefile.in (+155/-109) w32/Manifest (+0/-2) w32/main.c (+66/-8) w32/pinentry-w32.rc (+19/-8) w32/resource.h (+9/-2) |
To merge this branch: | bzr merge lp:~logan/ubuntu/wily/pinentry/0.9.2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt | Approve | ||
Review via email:
|
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Martin Pitt (pitti) wrote : | # |
My upload was rejected. Seems Iain already uploaded that yesterday without following up here.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.pc/applied-patches' |
2 | --- .pc/applied-patches 2014-01-23 22:10:38 +0000 |
3 | +++ .pc/applied-patches 2015-05-26 02:58:11 +0000 |
4 | @@ -1,1 +1,5 @@ |
5 | +0001-avoid-self-describing-as-a-beta.patch |
6 | +0002-curses-app-should-terminate-when-tty-fails.patch |
7 | +0003-Fix-linking-order-to-work-when-linked-with-as-needed.patch |
8 | +0004-avoid-implicit-declaration-of-function-addnwstr.patch |
9 | kubuntu_fix_stayontop.diff |
10 | |
11 | === modified file '.pc/kubuntu_fix_stayontop.diff/qt4/pinentrydialog.cpp' |
12 | --- .pc/kubuntu_fix_stayontop.diff/qt4/pinentrydialog.cpp 2014-01-23 22:10:38 +0000 |
13 | +++ .pc/kubuntu_fix_stayontop.diff/qt4/pinentrydialog.cpp 2015-05-26 02:58:11 +0000 |
14 | @@ -45,31 +45,50 @@ |
15 | versions. This is the reason why gpg-agent employs its |
16 | AllowSetForegroundWindow callback machinery to ask the supposed to |
17 | be be calling process to allow a pinentry to go into the |
18 | - foreground. */ |
19 | -// #ifdef Q_WS_WIN |
20 | -// void SetForegroundWindowEx( HWND hWnd ) |
21 | -// { |
22 | -// //Attach foreground window thread to our thread |
23 | -// const DWORD ForeGroundID = GetWindowThreadProcessId(::GetForegroundWindow(),NULL); |
24 | -// const DWORD CurrentID = GetCurrentThreadId(); |
25 | - |
26 | -// AttachThreadInput ( ForeGroundID, CurrentID, TRUE ); |
27 | -// //Do our stuff here |
28 | -// HWND hLastActivePopupWnd = GetLastActivePopup( hWnd ); |
29 | -// SetForegroundWindow( hLastActivePopupWnd ); |
30 | - |
31 | -// //Detach the attached thread |
32 | -// AttachThreadInput ( ForeGroundID, CurrentID, FALSE ); |
33 | -// }// End SetForegroundWindowEx |
34 | -// #endif |
35 | + foreground. |
36 | + |
37 | + [ah] This is a Hack to workaround the fact that Foregrounding |
38 | + a Window is so restricted that it AllowSetForegroundWindow |
39 | + does not always work (e.g. when the ForegroundWindow timeout |
40 | + has not expired. |
41 | + */ |
42 | +#ifdef Q_WS_WIN |
43 | +WINBOOL SetForegroundWindowEx( HWND hWnd ) |
44 | +{ |
45 | + //Attach foreground window thread to our thread |
46 | + const DWORD ForeGroundID = GetWindowThreadProcessId(::GetForegroundWindow(),NULL); |
47 | + const DWORD CurrentID = GetCurrentThreadId(); |
48 | + WINBOOL retval; |
49 | + |
50 | + AttachThreadInput ( ForeGroundID, CurrentID, TRUE ); |
51 | + //Do our stuff here |
52 | + HWND hLastActivePopupWnd = GetLastActivePopup( hWnd ); |
53 | + retval = SetForegroundWindow( hLastActivePopupWnd ); |
54 | + |
55 | + //Detach the attached thread |
56 | + AttachThreadInput ( ForeGroundID, CurrentID, FALSE ); |
57 | + return retval; |
58 | +}// End SetForegroundWindowEx |
59 | +#endif |
60 | |
61 | void raiseWindow( QWidget* w ) |
62 | { |
63 | -#ifdef Q_WS_WIN |
64 | - SetForegroundWindow( w->winId() ); |
65 | -#endif |
66 | + /* Maybe Qt will become agressive enough one day that |
67 | + * this is enough on windows too*/ |
68 | w->raise(); |
69 | w->activateWindow(); |
70 | +#ifdef Q_WS_WIN |
71 | + /* In the meantime we do our own attention grabbing */ |
72 | + if (!SetForegroundWindow (w->winId()) && |
73 | + !SetForegroundWindowEx (w->winId())) { |
74 | + OutputDebugString("SetForegroundWindow (ex) failed"); |
75 | + /* Yet another fallback which will not work on some |
76 | + * versions and is not recommended by msdn */ |
77 | + if (!ShowWindow (w->winId(), SW_SHOWNORMAL)) { |
78 | + OutputDebugString ("ShowWindow failed."); |
79 | + } |
80 | + } |
81 | +#endif |
82 | } |
83 | |
84 | QPixmap icon( QStyle::StandardPixmap which ) |
85 | @@ -198,6 +217,9 @@ |
86 | { |
87 | _desc->setVisible( !txt.isEmpty() ); |
88 | _desc->setText( txt ); |
89 | +#ifndef QT_NO_ACCESSIBILITY |
90 | + _desc->setAccessibleDescription ( txt ); |
91 | +#endif |
92 | _icon->setPixmap( icon() ); |
93 | setError( QString::null ); |
94 | } |
95 | @@ -211,6 +233,9 @@ |
96 | { |
97 | if( !txt.isNull() )_icon->setPixmap( icon( QStyle::SP_MessageBoxCritical ) ); |
98 | _error->setText( txt ); |
99 | +#ifndef QT_NO_ACCESSIBILITY |
100 | + _error->setAccessibleDescription ( txt ); |
101 | +#endif |
102 | _error->setVisible( !txt.isEmpty() ); |
103 | } |
104 | |
105 | @@ -243,19 +268,29 @@ |
106 | void PinEntryDialog::setOkText( const QString& txt ) |
107 | { |
108 | _ok->setText( txt ); |
109 | +#ifndef QT_NO_ACCESSIBILITY |
110 | + _ok->setAccessibleDescription ( txt ); |
111 | +#endif |
112 | _ok->setVisible( !txt.isEmpty() ); |
113 | } |
114 | |
115 | void PinEntryDialog::setCancelText( const QString& txt ) |
116 | { |
117 | _cancel->setText( txt ); |
118 | +#ifndef QT_NO_ACCESSIBILITY |
119 | + _cancel->setAccessibleDescription ( txt ); |
120 | +#endif |
121 | _cancel->setVisible( !txt.isEmpty() ); |
122 | } |
123 | |
124 | void PinEntryDialog::setQualityBar( const QString& txt ) |
125 | { |
126 | - if (_have_quality_bar) |
127 | + if (_have_quality_bar) { |
128 | _quality_bar_label->setText( txt ); |
129 | +#ifndef QT_NO_ACCESSIBILITY |
130 | + _quality_bar_label->setAccessibleDescription ( txt ); |
131 | +#endif |
132 | + } |
133 | } |
134 | |
135 | void PinEntryDialog::setQualityBarTT( const QString& txt ) |
136 | |
137 | === modified file 'AUTHORS' |
138 | --- AUTHORS 2007-07-25 00:42:52 +0000 |
139 | +++ AUTHORS 2015-05-26 02:58:11 +0000 |
140 | @@ -8,3 +8,4 @@ |
141 | Steffen Hansen, Klarälvdalens Datakonsult AB <steffen@klaralvdalens-datakonsult.se> |
142 | Marcus Brinkmann, g10 Code GmbH <marcus@g10code.com> |
143 | Timo Schulz, g10 Code GmbH |
144 | +Neal Walfied, g10 Code GmbH <neal@gnu.org> |
145 | |
146 | === modified file 'ChangeLog' |
147 | --- ChangeLog 2014-01-23 22:10:38 +0000 |
148 | +++ ChangeLog 2015-05-26 02:58:11 +0000 |
149 | @@ -1,3 +1,359 @@ |
150 | +2015-05-11 Werner Koch <wk@gnupg.org> |
151 | + |
152 | + Release 0.9.2. |
153 | + |
154 | + Return better error codes. |
155 | + * assuan/assuan.h (ASSUAN_Too_Short): New |
156 | + (ASSUAN_ENOENT, ASSUAN_ENOTTY): New. |
157 | + * pinentry/pinentry-curses.c: Include assuan.h. |
158 | + (dialog_create, dialog_run): Set specific error codes. |
159 | + * pinentry/pinentry.h (struct pinentry): Add field specific_err. |
160 | + * pinentry/pinentry.c (cmd_getpin): Return specific_err. |
161 | + (cmd_confirm, cmd_message): Ditto. |
162 | + |
163 | + curses: Reset tty state on failed dialog creation. |
164 | + * pinentry/pinentry-curses.c (dialog_run): Cleanup on dialog_create |
165 | + error. |
166 | + |
167 | + gtk: Use a description string from gpg-agent for libsecret. |
168 | + * pinentry/pinentry.h (struct pinentry): Add field default_pwmngr. |
169 | + * pinentry/pinentry.c (option_handler): Set it. |
170 | + * gtk+-2/pinentry-gtk-2.c (create_window) [HAVE_LIBSECRET]: Use new |
171 | + string. |
172 | + |
173 | + gtk: Silence compiler warning. |
174 | + |
175 | +2015-05-07 Neal H. Walfield <neal@gnu.org> |
176 | + |
177 | + Don't use asprintf. |
178 | + * pinentry/password-cache.c (keygrip_to_label): Don't use asprintf. |
179 | + |
180 | + Improve documentation. |
181 | + * doc/pinentry.texi: Improve description of SETKEYINFO's format. |
182 | + |
183 | + Minor documentation cleanups. |
184 | + |
185 | + Add support for saving the passphrase with libsecret. |
186 | + * configure.ac (COMMON_CFLAGS): New variable. AC_SUBST it. |
187 | + (COMMON_LIBS): Likewise. AC_SUBST it. |
188 | + (LIBSECRET_CFLAGS): Likewise. |
189 | + (LIBSECRET_LIBS): Likewise. |
190 | + (--enable-libsecret): Add option to enable support for libsecret. If |
191 | + enabled, check for its presense. |
192 | + * pinentry/password-cache.h: New field. |
193 | + * pinentry/password-cache.c: New field. |
194 | + * pinentry/pinentry.h (struct pinentry): Add fields pin_from_cache, |
195 | + allow_external_password_cache, tried_password_cache, keyinfo, and |
196 | + may_cache_password. |
197 | + * pinentry/pinentry.c: Include "password-cache.h". |
198 | + (pinentry): Initialize new fields. |
199 | + (option_handler): Handle the "allow-external-password-cache" option. |
200 | + (cmd_setkeyinfo): Implement it. |
201 | + (cmd_getpin): Read the password from the cache, if appropriate. Save |
202 | + it to the cache, if appropriate. |
203 | + * pinentry/Makefile.am (AM_CPPFLAGS): Add $(COMMON_CFLAGS). |
204 | + (LDADD): Add $(COMMON_LIBS). |
205 | + (libpinentry_a_SOURCES): Add password-cache.h |
206 | + password-cache.c. |
207 | + * gtk+-2/pinentry-gtk-2.c (may_save_passphrase_toggled): New function. |
208 | + (create_window): Take additional parameter, the pinentry's context. |
209 | + Update callers. |
210 | + [HAVE_LIBSECRET]: Show a checkbox asking whether the passphrase should |
211 | + be saved. |
212 | + * gtk+-2/Makefile.am (AM_CPPFLAGS): Add $(COMMON_CFLAGS). |
213 | + (LDADD): Add $(COMMON_LIBS). |
214 | + * curses/Makefile.am (AM_CPPFLAGS): Add $(COMMON_CFLAGS). |
215 | + (LDADD): Add $(COMMON_LIBS). |
216 | + * tty/Makefile.am (AM_CPPFLAGS): Add $(COMMON_CFLAGS). |
217 | + (LDADD): Add $(COMMON_LIBS). |
218 | + * doc/pinentry.texi (Protocol): Update documentation. Describe the |
219 | + protocol and provide some justification. |
220 | + |
221 | +2015-05-07 Werner Koch <wk@gnupg.org> |
222 | + |
223 | + w32: Do not build gtk pinentry by default. |
224 | + * autogen.rc: Remove obsolete options. |
225 | + |
226 | +2015-05-07 Neal H. Walfield <neal@gnu.org> |
227 | + |
228 | + Align secmem_realloc behavior with realloc's. |
229 | + * secmem/secmem.c (secmem_realloc): If passed a NULL pointer, then |
230 | + call secmem_malloc instead of crashing. |
231 | + |
232 | +2015-05-05 Werner Koch <wk@gnupg.org> |
233 | + |
234 | + w32: Minor changes to the dialog. |
235 | + * w32/main.c (set_bitmap): New. |
236 | + (dlg_proc): Show error prompt in red. |
237 | + * w32/pinentry-w32.rc: Add icons and chnage dialog. |
238 | + * w32/logo-128.bmp: New. |
239 | + * w32/logo-32.bmp: New. |
240 | + * w32/logo-48.bmp: New. |
241 | + * w32/logo-64.bmp: New. |
242 | + * w32/logo-96.bmp: New. |
243 | + |
244 | + pinentry-tty: Fix problem with zero length prompt. |
245 | + * tty/pinentry-tty.c (read_password): Use default prompt also for an |
246 | + empty prompt argument. |
247 | + |
248 | +2015-05-01 Neal H. Walfield <neal@gnu.org> |
249 | + |
250 | + Improve documentation. |
251 | + Improve documentation: clean up wording and add some minor |
252 | + improvements to the content. |
253 | + |
254 | + Improve comment. |
255 | + * tty/pinentry-tty.c (tty_cmd_handler): Add comment. |
256 | + |
257 | + When reading the pin, correctly handle backspace. |
258 | + * tty/pinentry-tty.c (read_password): Handle backspace. |
259 | + |
260 | + Improve prompt for pin. |
261 | + * tty/pinentry-tty.c (read_password): Improve prompt for pin. |
262 | + |
263 | +2015-05-01 Daniel Kahn Gillmor <dkg@fifthhorseman.net> |
264 | + |
265 | + fix small memory leak in pinentry-curses. |
266 | + * pinentry/pinentry-curses.c: free internally allocated local string. |
267 | + |
268 | + pinentry-tty: make confirm actions work. |
269 | + * tty/pinentry-tty.c: treat the situation where no PIN is requested |
270 | + and one_button is not set as a confirmation prompt. |
271 | + |
272 | + pinentry-tty: fix segfault on MESSAGE or CONFIRM. |
273 | + * tty/pinentry-tty.c: avoid prompting for a PIN when one was not asked |
274 | + for. |
275 | + |
276 | + pinentry-tty: handle designated tty outside of read_password. |
277 | + * tty/pinentry-tty.c: reorganize, wrapping read_password in tty |
278 | + open/close. |
279 | + |
280 | +2015-04-16 Yuri D'Elia <wavexx@users.sourceforge.net> |
281 | + |
282 | + gtk: Make Escape key work. |
283 | + * gtk+-2/pinentry-gtk-2.c: Include gdk/gdkkeysyms.h. |
284 | + (enter_callback): Pass confirm_value_t to button_clicked. |
285 | + (confirm_button_clicked): Use confirm_value_t cast. |
286 | + (cancel_callback): New. |
287 | + (create_window): Add accelerator for the Escape key. |
288 | + |
289 | +2015-04-14 Werner Koch <wk@gnupg.org> |
290 | + |
291 | + Add stub command SETKEYINFO. |
292 | + * pinentry/pinentry.c (cmd_setkeyinfo): New. |
293 | + (register_commands): Addd command. |
294 | + |
295 | +2015-03-18 Werner Koch <wk@gnupg.org> |
296 | + |
297 | + Release 0.9.1. |
298 | + |
299 | + Fix build problems on AIX. |
300 | + * pinentry/pinentry.c: Do not include getopt.h. |
301 | + * pinentry/pinentry-curses.c (dialog_run): Call use_default_colors |
302 | + only with ncurses. |
303 | + |
304 | + Update to automake 1.14. |
305 | + |
306 | +2015-03-17 Werner Koch <wk@gnupg.org> |
307 | + |
308 | + Get rid of getopt_long and improve --help output. |
309 | + * pinentry/argparse.c, pinentry/argparse.h: New. Taken from GnuPG |
310 | + master. |
311 | + * pinentry/Makefile.am (libpinentry_a_SOURCES): Add them. |
312 | + * pinentry/pinentry.c: Include argparse.h. |
313 | + (usage): Remove. |
314 | + (my_strusage): New. |
315 | + (pinentry_parse_opts): Rewrite. Do not return a value. Change call |
316 | + callers. |
317 | + |
318 | + Use CH type instead of wchar_t for curses. |
319 | + * pinentry/pinentry-curses.c (collect_line): Change second arg to CH. |
320 | + * pinentry/pinentry.c (pinentry_utf8_to_local): Make args const. |
321 | + |
322 | +2014-12-15 Andre Heinecke <aheinecke@intevation.de> |
323 | + |
324 | + qt4: Improve moc handling. |
325 | + * configure.ac: Disable pinentry-qt4 or exit if moc not found. |
326 | + * m4/qt.m4: Look for and prefer moc-qt4. |
327 | + * qt4/Makefile.am: Add moc files to nodist and clean them. |
328 | + |
329 | + doc: Update gpl.texi to match version from gcrypt. |
330 | + * doc/gpl.texi: Use version from gcrypt. |
331 | + |
332 | +2014-12-09 Vicente Olivert Riera <Vincent.Riera@imgtec.com> |
333 | + |
334 | + pinentry-qt4: make the accessibility part optional. |
335 | + Check if the Qt libraries have support for QT Accessibility before using |
336 | + it. Otherwise it will raise error like these one: |
337 | + |
338 | + main.cpp: In function 'int qt_cmd_handler(pinentry_t)': |
339 | + main.cpp:220:51: error: 'class QAbstractButton' has no member named |
340 | + 'setAccessibleDescription' |
341 | + |
342 | +2014-10-26 Werner Koch <wk@gnupg.org> |
343 | + |
344 | + Release 0.9.0. |
345 | + |
346 | + gtk: Aboid segv for opaste keys. |
347 | + * gtk+-2/gtksecentry.c (gtk_secure_entry_class_init): Disable paste |
348 | + key bindings. |
349 | + |
350 | + Remove support form QT3 and GTK+-1. |
351 | + * configure.ac: Remove old qt and gtk+-1 support. |
352 | + * Makefile.am: Ditto. |
353 | + |
354 | +2014-10-26 Stanislav Ochotnicky <sochotnicky@redhat.com> |
355 | + |
356 | + Check if we are on tty before initializing curses. |
357 | + * pinentry/pinentry-curses.c (dialog_run): Check stant stdin and stout |
358 | + are connected to ttys. |
359 | + |
360 | +2014-10-26 Werner Koch <wk@gnupg.org> |
361 | + |
362 | + gtk: Allow pasting using the mouse. |
363 | + * gtk+-2/gtksecentry.h (_GtkSecureEntry): Add fields insert_pos, |
364 | + real_changed, cand change_count. |
365 | + (_GtkSecureEntryClass): Add field paste_clipboard. |
366 | + * gtk+-2/gtksecentry.c (PASTE_CLIPBOARD): New. |
367 | + (gtk_secure_entry_class_init): Set paste_clipboard and create |
368 | + paste-clipboard signal. |
369 | + (gtk_secure_entry_button_press): Call gtk_secure_entry_pase. |
370 | + (begin_change, end_change, emit_changed): New. |
371 | + (gtk_secure_entry_real_insert_text): Use emit_changed. |
372 | + (gtk_secure_entry_real_delete_text): Ditto. |
373 | + (paste_received, gtk_secure_entry_paste) |
374 | + (gtk_secure_entry_paste_clipboard): New. |
375 | + |
376 | +2014-10-24 Werner Koch <wk@gnupg.org> |
377 | + |
378 | + gtk+-2: Make current focus visible again. |
379 | + * gtk+-2/pinentry-gtk-2.c (grab_keyboard): Return false |
380 | + (ungrab_keyboard): Ditto. |
381 | + |
382 | + gtk+-2: Implement the SETREPEAT command. |
383 | + * gtk+-2/pinentry-gtk-2.c (repeat_entry, error_label): New. |
384 | + (button_clicked): Implement repeat check. |
385 | + (changed_text_handler): Clear repeat field. |
386 | + (create_window): Add repeat entry. |
387 | + |
388 | + Add commands to allow implementing a "repeat passphrase" field. |
389 | + * pinentry/pinentry.c (cmd_setrepeat): New. |
390 | + (cmd_setrepeaterror): New. |
391 | + (register_commands): Add new commands. |
392 | + (cmd_getpin): Print "PIN_REPEATED" status. |
393 | + |
394 | +2014-09-18 Werner Koch <wk@gnupg.org> |
395 | + |
396 | + Release 0.8.4. |
397 | + |
398 | + Add missing build support files and move them to build-aux. |
399 | + |
400 | + Use generic autogen.sh script. |
401 | + * autogen.rc: New. |
402 | + * autogen.sh: New. Take from GnuPG. |
403 | + * Makefile.am (EXTRA_DIST): Add autogen.rc. |
404 | + (DISTCHECK_CONFIGURE_FLAGS): Disable qt4. |
405 | + |
406 | +2014-08-12 Werner Koch <wk@gnupg.org> |
407 | + |
408 | + common: Fix compiler warning. |
409 | + * pinentry/pinentry.c (pinentry_utf8_to_local): Use cast for iconv arg. |
410 | + (pinentry_local_to_utf8): Ditto. |
411 | + |
412 | + New pinentry-tty version for dumb terminals. |
413 | + * Makefile.am: Add pinentry-tty. |
414 | + * NEWS: Add news about pinentry-tty. |
415 | + * README: Update. |
416 | + * configure.ac: Add support for this pinentry. |
417 | + * tty/Makefile.am: New. |
418 | + * tty/pinentry-tty.c: New. |
419 | + |
420 | +2014-08-06 Andre Heinecke <aheinecke@intevation.de> |
421 | + |
422 | + Check for MOC also if pinentry-qt is disabled. |
423 | + * configure.ac: Call QT_PATH_MOC if pinentry_qt4 is not no. |
424 | + |
425 | + Add fallbacks for SetForegroundWindow. |
426 | + If that foreground window fails pinentry-qt now tries to |
427 | + attach to the current foreground process and then tries |
428 | + to set the foreground window again. If that fails it also |
429 | + calls ShowWindow as a last resort. |
430 | + |
431 | + * qt4/pinentrydialog.cpp (raiseWindow): Add fallbacks in |
432 | + case SetForegroundWindow fails. |
433 | + |
434 | + Use raiseWindow also for confirm dialogs. |
435 | + This should fix the case that the dialog opened |
436 | + in the foreground but a warning / confirm dialog |
437 | + opened in the background. |
438 | + |
439 | + * qt4/pinentryconfirm.cpp, qt4/pinentryconfirm.h (showEvent): |
440 | + New overwrite base class method to call raiseWindow. |
441 | + * NEWS: Mention this. |
442 | + |
443 | +2014-07-30 Andre Heinecke <aheinecke@intevation.de> |
444 | + |
445 | + Set some accessibility information. |
446 | + * qt4/main.cpp (qt_cmd_handler): Build buttons with accessibile |
447 | + Description. |
448 | + * qt4/pinentrydialog.cpp (setDescription, setError, setOkText) |
449 | + (setCancelText, setQualityBar): Set an accessible description. |
450 | + * qt4/pinentryconfirm.cpp (PinentryConfirm): Set message |
451 | + box contents also as accessible values. |
452 | + * NEWS: Mention it and the copy/paste change from last year. |
453 | + |
454 | +2013-07-15 Andre Heinecke <aheinecke@intevation.de> |
455 | + |
456 | + Lower paste length limit to 300. |
457 | + This should be more then enough and avoids possible problems |
458 | + with libassuan cmd line lenght or percent escaping etc. |
459 | + |
460 | + * qt4/qsecurelineedit.cpp (insert): Lower paste limit |
461 | + |
462 | + Limit paste length to 1023 characters. |
463 | + * qt4/qsecurelineedit.cpp (insert): Check for a maximum |
464 | + length before allocation the secmem string. |
465 | + |
466 | + Fix contextmenu support for pasting. |
467 | + MOC ignores preprocessor definitions so we can not conditionally |
468 | + declare SLOTS. So we now move the ifdefs in the definition and |
469 | + always declare the SLOTS. |
470 | + |
471 | + * qt4/qsecurelinedit.cpp (cut, copy, paste): Do nothing if |
472 | + QT_NO_CLIPBOARD is defined. |
473 | + * qt4/qsecurelinedit.h: Always declare cut, copy and paste slots |
474 | + |
475 | + Remove check for RTL extensions. |
476 | + Our code does nothing RTL specific there anyway. And the |
477 | + qt_use_rtl_extensions symbol has been removed. |
478 | + |
479 | + * qt4/qsecurelinedit.cpp: Remove check for RTL extensions. |
480 | + |
481 | +2013-07-12 Werner Koch <wk@gnupg.org> |
482 | + |
483 | + Fix for commit fb38be9 to allow for "make distcheck". |
484 | + * qt4/Makefile.am: Make correct use of BUILT_SOURCES. |
485 | + |
486 | +2013-05-29 Andre Heinecke <aheinecke@intevation.de> |
487 | + |
488 | + Add pinentry-qt4-clipboard option. |
489 | + Enabling this option will make it possible to paste a |
490 | + passphrase into pinentry-qt4. This defeats the secmem |
491 | + mechanism but drastically increases usability for some |
492 | + users. |
493 | + |
494 | + * configure.ac: New option pinentry-qt4-clipboard. |
495 | + * qt4/qsecurelineedit.cpp, qt4/qsecurelineedit.h: Activate |
496 | + clipboard and context menu if PINENTRY_QT4_CLIPBOARD is defined. |
497 | + |
498 | + Remove qt4 moc files and add moc to buildsystem. |
499 | + This is neccessary to conditionally enable signals/slots |
500 | + at build time. |
501 | + |
502 | + * qt4/Makefile.am: Moc files automatically. |
503 | + * qt4/pinentryconfirm.moc, qt4/pinentrydialog.moc, |
504 | + qsecurelineedit.moc: Removed. |
505 | + |
506 | 2013-04-26 Werner Koch <wk@gnupg.org> |
507 | |
508 | Release 0.8.3. |
509 | |
510 | === modified file 'Makefile.am' |
511 | --- Makefile.am 2014-01-23 22:10:38 +0000 |
512 | +++ Makefile.am 2015-05-26 02:58:11 +0000 |
513 | @@ -20,12 +20,11 @@ |
514 | ## Process this file with automake to produce Makefile.in |
515 | |
516 | ACLOCAL_AMFLAGS = -I m4 |
517 | -AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip |
518 | -#DISTCHECK_CONFIGURE_FLAGS = --disable-pinentry-qt4 |
519 | +DISTCHECK_CONFIGURE_FLAGS = --disable-pinentry-qt4 |
520 | |
521 | GITLOG_TO_CHANGELOG=gitlog-to-changelog |
522 | |
523 | -EXTRA_DIST = autogen.sh README.GIT ChangeLog-old \ |
524 | +EXTRA_DIST = autogen.sh autogen.rc README.GIT ChangeLog-old \ |
525 | build-aux/gitlog-to-changelog \ |
526 | build-aux/git-log-fix build-aux/git-log-footer |
527 | |
528 | @@ -35,10 +34,10 @@ |
529 | pinentry_curses = |
530 | endif |
531 | |
532 | -if BUILD_PINENTRY_GTK |
533 | -pinentry_gtk = gtk |
534 | +if BUILD_PINENTRY_TTY |
535 | +pinentry_tty = tty |
536 | else |
537 | -pinentry_gtk = |
538 | +pinentry_tty = |
539 | endif |
540 | |
541 | if BUILD_PINENTRY_GTK_2 |
542 | @@ -47,12 +46,6 @@ |
543 | pinentry_gtk_2 = |
544 | endif |
545 | |
546 | -if BUILD_PINENTRY_QT |
547 | -pinentry_qt = qt |
548 | -else |
549 | -pinentry_qt = |
550 | -endif |
551 | - |
552 | if BUILD_PINENTRY_QT4 |
553 | pinentry_qt4 = qt4 |
554 | else |
555 | @@ -65,9 +58,8 @@ |
556 | pinentry_w32 = |
557 | endif |
558 | |
559 | -SUBDIRS = assuan secmem pinentry ${pinentry_curses} \ |
560 | - ${pinentry_gtk} ${pinentry_gtk_2} ${pinentry_qt} ${pinentry_qt4} \ |
561 | - ${pinentry_w32} doc |
562 | +SUBDIRS = assuan secmem pinentry ${pinentry_curses} ${pinentry_tty} \ |
563 | + ${pinentry_gtk_2} ${pinentry_qt4} ${pinentry_w32} doc |
564 | |
565 | |
566 | install-exec-local: |
567 | |
568 | === modified file 'Makefile.in' |
569 | --- Makefile.in 2014-01-23 22:10:38 +0000 |
570 | +++ Makefile.in 2015-05-26 02:58:11 +0000 |
571 | @@ -1,9 +1,8 @@ |
572 | -# Makefile.in generated by automake 1.11.6 from Makefile.am. |
573 | +# Makefile.in generated by automake 1.14.1 from Makefile.am. |
574 | # @configure_input@ |
575 | |
576 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
577 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
578 | -# Foundation, Inc. |
579 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
580 | + |
581 | # This Makefile.in is free software; the Free Software Foundation |
582 | # gives unlimited permission to copy and/or distribute it, |
583 | # with or without modifications, as long as this notice is preserved. |
584 | @@ -34,23 +33,51 @@ |
585 | # along with this program; if not, write to the Free Software |
586 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA |
587 | VPATH = @srcdir@ |
588 | -am__make_dryrun = \ |
589 | - { \ |
590 | - am__dry=no; \ |
591 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
592 | +am__make_running_with_option = \ |
593 | + case $${target_option-} in \ |
594 | + ?) ;; \ |
595 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
596 | + "target option '$${target_option-}' specified" >&2; \ |
597 | + exit 1;; \ |
598 | + esac; \ |
599 | + has_opt=no; \ |
600 | + sane_makeflags=$$MAKEFLAGS; \ |
601 | + if $(am__is_gnu_make); then \ |
602 | + sane_makeflags=$$MFLAGS; \ |
603 | + else \ |
604 | case $$MAKEFLAGS in \ |
605 | *\\[\ \ ]*) \ |
606 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
607 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
608 | - *) \ |
609 | - for am__flg in $$MAKEFLAGS; do \ |
610 | - case $$am__flg in \ |
611 | - *=*|--*) ;; \ |
612 | - *n*) am__dry=yes; break;; \ |
613 | - esac; \ |
614 | - done;; \ |
615 | - esac; \ |
616 | - test $$am__dry = yes; \ |
617 | - } |
618 | + bs=\\; \ |
619 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
620 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
621 | + esac; \ |
622 | + fi; \ |
623 | + skip_next=no; \ |
624 | + strip_trailopt () \ |
625 | + { \ |
626 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
627 | + }; \ |
628 | + for flg in $$sane_makeflags; do \ |
629 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
630 | + case $$flg in \ |
631 | + *=*|--*) continue;; \ |
632 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
633 | + -*I?*) strip_trailopt 'I';; \ |
634 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
635 | + -*O?*) strip_trailopt 'O';; \ |
636 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
637 | + -*l?*) strip_trailopt 'l';; \ |
638 | + -[dEDm]) skip_next=yes;; \ |
639 | + -[JT]) skip_next=yes;; \ |
640 | + esac; \ |
641 | + case $$flg in \ |
642 | + *$$target_option*) has_opt=yes; break;; \ |
643 | + esac; \ |
644 | + done; \ |
645 | + test $$has_opt = yes |
646 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
647 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
648 | pkgdatadir = $(datadir)/@PACKAGE@ |
649 | pkgincludedir = $(includedir)/@PACKAGE@ |
650 | pkglibdir = $(libdir)/@PACKAGE@ |
651 | @@ -70,14 +97,22 @@ |
652 | build_triplet = @build@ |
653 | host_triplet = @host@ |
654 | subdir = . |
655 | -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
656 | - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
657 | - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ |
658 | - THANKS TODO config.guess config.rpath config.sub depcomp \ |
659 | - install-sh missing mkinstalldirs |
660 | +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ |
661 | + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
662 | + $(top_srcdir)/configure $(am__configure_deps) \ |
663 | + $(srcdir)/config.h.in COPYING THANKS TODO build-aux/compile \ |
664 | + build-aux/config.guess build-aux/config.rpath \ |
665 | + build-aux/config.sub depcomp build-aux/depcomp install-sh \ |
666 | + build-aux/install-sh build-aux/mdate-sh missing \ |
667 | + build-aux/missing mkinstalldirs build-aux/texinfo.tex \ |
668 | + $(top_srcdir)/build-aux/compile \ |
669 | + $(top_srcdir)/build-aux/config.guess \ |
670 | + $(top_srcdir)/build-aux/config.rpath \ |
671 | + $(top_srcdir)/build-aux/config.sub \ |
672 | + $(top_srcdir)/build-aux/install-sh \ |
673 | + $(top_srcdir)/build-aux/missing |
674 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
675 | am__aclocal_m4_deps = $(top_srcdir)/m4/curses.m4 \ |
676 | - $(top_srcdir)/m4/glib.m4 $(top_srcdir)/m4/gtk.m4 \ |
677 | $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/pkg.m4 \ |
678 | $(top_srcdir)/m4/qt.m4 $(top_srcdir)/acinclude.m4 \ |
679 | $(top_srcdir)/configure.ac |
680 | @@ -85,19 +120,32 @@ |
681 | $(ACLOCAL_M4) |
682 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
683 | configure.lineno config.status.lineno |
684 | -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
685 | +mkinstalldirs = $(install_sh) -d |
686 | CONFIG_HEADER = config.h |
687 | CONFIG_CLEAN_FILES = |
688 | CONFIG_CLEAN_VPATH_FILES = |
689 | +AM_V_P = $(am__v_P_@AM_V@) |
690 | +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
691 | +am__v_P_0 = false |
692 | +am__v_P_1 = : |
693 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
694 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
695 | +am__v_GEN_0 = @echo " GEN " $@; |
696 | +am__v_GEN_1 = |
697 | +AM_V_at = $(am__v_at_@AM_V@) |
698 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
699 | +am__v_at_0 = @ |
700 | +am__v_at_1 = |
701 | SOURCES = |
702 | DIST_SOURCES = |
703 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
704 | - html-recursive info-recursive install-data-recursive \ |
705 | - install-dvi-recursive install-exec-recursive \ |
706 | - install-html-recursive install-info-recursive \ |
707 | - install-pdf-recursive install-ps-recursive install-recursive \ |
708 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
709 | - ps-recursive uninstall-recursive |
710 | +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ |
711 | + ctags-recursive dvi-recursive html-recursive info-recursive \ |
712 | + install-data-recursive install-dvi-recursive \ |
713 | + install-exec-recursive install-html-recursive \ |
714 | + install-info-recursive install-pdf-recursive \ |
715 | + install-ps-recursive install-recursive installcheck-recursive \ |
716 | + installdirs-recursive pdf-recursive ps-recursive \ |
717 | + tags-recursive uninstall-recursive |
718 | am__can_run_installinfo = \ |
719 | case $$AM_UPDATE_INFO_DIR in \ |
720 | n|no|NO) false;; \ |
721 | @@ -105,12 +153,34 @@ |
722 | esac |
723 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
724 | distclean-recursive maintainer-clean-recursive |
725 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
726 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
727 | - distdir dist dist-all distcheck |
728 | +am__recursive_targets = \ |
729 | + $(RECURSIVE_TARGETS) \ |
730 | + $(RECURSIVE_CLEAN_TARGETS) \ |
731 | + $(am__extra_recursive_targets) |
732 | +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
733 | + cscope distdir dist dist-all distcheck |
734 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ |
735 | + $(LISP)config.h.in |
736 | +# Read a list of newline-separated strings from the standard input, |
737 | +# and print each of them once, without duplicates. Input order is |
738 | +# *not* preserved. |
739 | +am__uniquify_input = $(AWK) '\ |
740 | + BEGIN { nonempty = 0; } \ |
741 | + { items[$$0] = 1; nonempty = 1; } \ |
742 | + END { if (nonempty) { for (i in items) print i; }; } \ |
743 | +' |
744 | +# Make sure the list of sources is unique. This is necessary because, |
745 | +# e.g., the same source file might be shared among _SOURCES variables |
746 | +# for different programs/libraries. |
747 | +am__define_uniq_tagged_files = \ |
748 | + list='$(am__tagged_files)'; \ |
749 | + unique=`for i in $$list; do \ |
750 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
751 | + done | $(am__uniquify_input)` |
752 | ETAGS = etags |
753 | CTAGS = ctags |
754 | -DIST_SUBDIRS = assuan secmem pinentry curses gtk gtk+-2 qt qt4 w32 doc |
755 | +CSCOPE = cscope |
756 | +DIST_SUBDIRS = assuan secmem pinentry curses tty gtk+-2 qt4 w32 doc |
757 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
758 | distdir = $(PACKAGE)-$(VERSION) |
759 | top_distdir = $(distdir) |
760 | @@ -120,6 +190,7 @@ |
761 | && rm -rf "$(distdir)" \ |
762 | || { sleep 5 && rm -rf "$(distdir)"; }; \ |
763 | else :; fi |
764 | +am__post_remove_distdir = $(am__remove_distdir) |
765 | am__relativize = \ |
766 | dir0=`pwd`; \ |
767 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
768 | @@ -147,12 +218,14 @@ |
769 | reldir="$$dir2" |
770 | GZIP_ENV = --best |
771 | DIST_ARCHIVES = $(distdir).tar.bz2 |
772 | +DIST_TARGETS = dist-bzip2 |
773 | distuninstallcheck_listfiles = find . -type f -print |
774 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
775 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
776 | distcleancheck_listfiles = find . -type f -print |
777 | ACLOCAL = @ACLOCAL@ |
778 | AMTAR = @AMTAR@ |
779 | +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
780 | AUTOCONF = @AUTOCONF@ |
781 | AUTOHEADER = @AUTOHEADER@ |
782 | AUTOMAKE = @AUTOMAKE@ |
783 | @@ -160,10 +233,11 @@ |
784 | CC = @CC@ |
785 | CCDEPMODE = @CCDEPMODE@ |
786 | CFLAGS = @CFLAGS@ |
787 | +COMMON_CFLAGS = @COMMON_CFLAGS@ |
788 | +COMMON_LIBS = @COMMON_LIBS@ |
789 | CPP = @CPP@ |
790 | CPPFLAGS = @CPPFLAGS@ |
791 | CXX = @CXX@ |
792 | -CXXCPP = @CXXCPP@ |
793 | CXXDEPMODE = @CXXDEPMODE@ |
794 | CXXFLAGS = @CXXFLAGS@ |
795 | CYGPATH_W = @CYGPATH_W@ |
796 | @@ -174,17 +248,10 @@ |
797 | ECHO_T = @ECHO_T@ |
798 | EGREP = @EGREP@ |
799 | EXEEXT = @EXEEXT@ |
800 | -#DISTCHECK_CONFIGURE_FLAGS = --disable-pinentry-qt4 |
801 | GITLOG_TO_CHANGELOG = gitlog-to-changelog |
802 | -GLIB_CFLAGS = @GLIB_CFLAGS@ |
803 | -GLIB_CONFIG = @GLIB_CONFIG@ |
804 | -GLIB_LIBS = @GLIB_LIBS@ |
805 | GREP = @GREP@ |
806 | GTK2CFLAGS = @GTK2CFLAGS@ |
807 | GTK2LIBS = @GTK2LIBS@ |
808 | -GTK_CFLAGS = @GTK_CFLAGS@ |
809 | -GTK_CONFIG = @GTK_CONFIG@ |
810 | -GTK_LIBS = @GTK_LIBS@ |
811 | INSTALL = @INSTALL@ |
812 | INSTALL_DATA = @INSTALL_DATA@ |
813 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
814 | @@ -196,10 +263,8 @@ |
815 | LIBICONV = @LIBICONV@ |
816 | LIBNCURSES = @LIBNCURSES@ |
817 | LIBOBJS = @LIBOBJS@ |
818 | -LIBPTHREAD = @LIBPTHREAD@ |
819 | LIBS = @LIBS@ |
820 | LIBTERMCAP = @LIBTERMCAP@ |
821 | -LIB_QPE = @LIB_QPE@ |
822 | LN_S = @LN_S@ |
823 | LTLIBICONV = @LTLIBICONV@ |
824 | LTLIBOBJS = @LTLIBOBJS@ |
825 | @@ -223,27 +288,13 @@ |
826 | QT4_CORE_LIBS = @QT4_CORE_LIBS@ |
827 | QT4_GUI_CFLAGS = @QT4_GUI_CFLAGS@ |
828 | QT4_GUI_LIBS = @QT4_GUI_LIBS@ |
829 | -QTE_NORTTI = @QTE_NORTTI@ |
830 | -QT_CXXFLAGS = @QT_CXXFLAGS@ |
831 | -QT_INCLUDES = @QT_INCLUDES@ |
832 | -QT_LDFLAGS = @QT_LDFLAGS@ |
833 | -QT_LIBS = @QT_LIBS@ |
834 | -QT_MT_LDFLAGS = @QT_MT_LDFLAGS@ |
835 | -QT_MT_LIBS = @QT_MT_LIBS@ |
836 | -QT_RPATH = @QT_RPATH@ |
837 | RANLIB = @RANLIB@ |
838 | SETCAP = @SETCAP@ |
839 | SET_MAKE = @SET_MAKE@ |
840 | SHELL = @SHELL@ |
841 | STRIP = @STRIP@ |
842 | -USE_THREADS = @USE_THREADS@ |
843 | VERSION = @VERSION@ |
844 | WINDRES = @WINDRES@ |
845 | -XMKMF = @XMKMF@ |
846 | -X_CFLAGS = @X_CFLAGS@ |
847 | -X_EXTRA_LIBS = @X_EXTRA_LIBS@ |
848 | -X_LIBS = @X_LIBS@ |
849 | -X_PRE_LIBS = @X_PRE_LIBS@ |
850 | abs_builddir = @abs_builddir@ |
851 | abs_srcdir = @abs_srcdir@ |
852 | abs_top_builddir = @abs_top_builddir@ |
853 | @@ -287,8 +338,6 @@ |
854 | prefix = @prefix@ |
855 | program_transform_name = @program_transform_name@ |
856 | psdir = @psdir@ |
857 | -qt_includes = @qt_includes@ |
858 | -qt_libraries = @qt_libraries@ |
859 | sbindir = @sbindir@ |
860 | sharedstatedir = @sharedstatedir@ |
861 | srcdir = @srcdir@ |
862 | @@ -297,28 +346,24 @@ |
863 | top_build_prefix = @top_build_prefix@ |
864 | top_builddir = @top_builddir@ |
865 | top_srcdir = @top_srcdir@ |
866 | -x_libraries = @x_libraries@ |
867 | ACLOCAL_AMFLAGS = -I m4 |
868 | -AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip |
869 | -EXTRA_DIST = autogen.sh README.GIT ChangeLog-old \ |
870 | +DISTCHECK_CONFIGURE_FLAGS = --disable-pinentry-qt4 |
871 | +EXTRA_DIST = autogen.sh autogen.rc README.GIT ChangeLog-old \ |
872 | build-aux/gitlog-to-changelog \ |
873 | build-aux/git-log-fix build-aux/git-log-footer |
874 | |
875 | @BUILD_PINENTRY_CURSES_FALSE@pinentry_curses = |
876 | @BUILD_PINENTRY_CURSES_TRUE@pinentry_curses = curses |
877 | -@BUILD_PINENTRY_GTK_FALSE@pinentry_gtk = |
878 | -@BUILD_PINENTRY_GTK_TRUE@pinentry_gtk = gtk |
879 | +@BUILD_PINENTRY_TTY_FALSE@pinentry_tty = |
880 | +@BUILD_PINENTRY_TTY_TRUE@pinentry_tty = tty |
881 | @BUILD_PINENTRY_GTK_2_FALSE@pinentry_gtk_2 = |
882 | @BUILD_PINENTRY_GTK_2_TRUE@pinentry_gtk_2 = gtk+-2 |
883 | -@BUILD_PINENTRY_QT_FALSE@pinentry_qt = |
884 | -@BUILD_PINENTRY_QT_TRUE@pinentry_qt = qt |
885 | @BUILD_PINENTRY_QT4_FALSE@pinentry_qt4 = |
886 | @BUILD_PINENTRY_QT4_TRUE@pinentry_qt4 = qt4 |
887 | @BUILD_PINENTRY_W32_FALSE@pinentry_w32 = |
888 | @BUILD_PINENTRY_W32_TRUE@pinentry_w32 = w32 |
889 | -SUBDIRS = assuan secmem pinentry ${pinentry_curses} \ |
890 | - ${pinentry_gtk} ${pinentry_gtk_2} ${pinentry_qt} ${pinentry_qt4} \ |
891 | - ${pinentry_w32} doc |
892 | +SUBDIRS = assuan secmem pinentry ${pinentry_curses} ${pinentry_tty} \ |
893 | + ${pinentry_gtk_2} ${pinentry_qt4} ${pinentry_w32} doc |
894 | |
895 | gen_start_date = 2012-08-08T00:00:00 |
896 | all: config.h |
897 | @@ -361,8 +406,8 @@ |
898 | $(am__aclocal_m4_deps): |
899 | |
900 | config.h: stamp-h1 |
901 | - @if test ! -f $@; then rm -f stamp-h1; else :; fi |
902 | - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
903 | + @test -f $@ || rm -f stamp-h1 |
904 | + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 |
905 | |
906 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
907 | @rm -f stamp-h1 |
908 | @@ -376,22 +421,25 @@ |
909 | -rm -f config.h stamp-h1 |
910 | |
911 | # This directory's subdirectories are mostly independent; you can cd |
912 | -# into them and run `make' without going through this Makefile. |
913 | -# To change the values of `make' variables: instead of editing Makefiles, |
914 | -# (1) if the variable is set in `config.status', edit `config.status' |
915 | -# (which will cause the Makefiles to be regenerated when you run `make'); |
916 | -# (2) otherwise, pass the desired values on the `make' command line. |
917 | -$(RECURSIVE_TARGETS): |
918 | - @fail= failcom='exit 1'; \ |
919 | - for f in x $$MAKEFLAGS; do \ |
920 | - case $$f in \ |
921 | - *=* | --[!k]*);; \ |
922 | - *k*) failcom='fail=yes';; \ |
923 | - esac; \ |
924 | - done; \ |
925 | +# into them and run 'make' without going through this Makefile. |
926 | +# To change the values of 'make' variables: instead of editing Makefiles, |
927 | +# (1) if the variable is set in 'config.status', edit 'config.status' |
928 | +# (which will cause the Makefiles to be regenerated when you run 'make'); |
929 | +# (2) otherwise, pass the desired values on the 'make' command line. |
930 | +$(am__recursive_targets): |
931 | + @fail=; \ |
932 | + if $(am__make_keepgoing); then \ |
933 | + failcom='fail=yes'; \ |
934 | + else \ |
935 | + failcom='exit 1'; \ |
936 | + fi; \ |
937 | dot_seen=no; \ |
938 | target=`echo $@ | sed s/-recursive//`; \ |
939 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
940 | + case "$@" in \ |
941 | + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
942 | + *) list='$(SUBDIRS)' ;; \ |
943 | + esac; \ |
944 | + for subdir in $$list; do \ |
945 | echo "Making $$target in $$subdir"; \ |
946 | if test "$$subdir" = "."; then \ |
947 | dot_seen=yes; \ |
948 | @@ -406,57 +454,12 @@ |
949 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
950 | fi; test -z "$$fail" |
951 | |
952 | -$(RECURSIVE_CLEAN_TARGETS): |
953 | - @fail= failcom='exit 1'; \ |
954 | - for f in x $$MAKEFLAGS; do \ |
955 | - case $$f in \ |
956 | - *=* | --[!k]*);; \ |
957 | - *k*) failcom='fail=yes';; \ |
958 | - esac; \ |
959 | - done; \ |
960 | - dot_seen=no; \ |
961 | - case "$@" in \ |
962 | - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
963 | - *) list='$(SUBDIRS)' ;; \ |
964 | - esac; \ |
965 | - rev=''; for subdir in $$list; do \ |
966 | - if test "$$subdir" = "."; then :; else \ |
967 | - rev="$$subdir $$rev"; \ |
968 | - fi; \ |
969 | - done; \ |
970 | - rev="$$rev ."; \ |
971 | - target=`echo $@ | sed s/-recursive//`; \ |
972 | - for subdir in $$rev; do \ |
973 | - echo "Making $$target in $$subdir"; \ |
974 | - if test "$$subdir" = "."; then \ |
975 | - local_target="$$target-am"; \ |
976 | - else \ |
977 | - local_target="$$target"; \ |
978 | - fi; \ |
979 | - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
980 | - || eval $$failcom; \ |
981 | - done && test -z "$$fail" |
982 | -tags-recursive: |
983 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
984 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
985 | - done |
986 | -ctags-recursive: |
987 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
988 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
989 | - done |
990 | - |
991 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
992 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
993 | - unique=`for i in $$list; do \ |
994 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
995 | - done | \ |
996 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
997 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
998 | - mkid -fID $$unique |
999 | -tags: TAGS |
1000 | - |
1001 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
1002 | - $(TAGS_FILES) $(LISP) |
1003 | +ID: $(am__tagged_files) |
1004 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
1005 | +tags: tags-recursive |
1006 | +TAGS: tags |
1007 | + |
1008 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
1009 | set x; \ |
1010 | here=`pwd`; \ |
1011 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
1012 | @@ -472,12 +475,7 @@ |
1013 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
1014 | fi; \ |
1015 | done; \ |
1016 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
1017 | - unique=`for i in $$list; do \ |
1018 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1019 | - done | \ |
1020 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1021 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1022 | + $(am__define_uniq_tagged_files); \ |
1023 | shift; \ |
1024 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
1025 | test -n "$$unique" || unique=$$empty_fix; \ |
1026 | @@ -489,15 +487,11 @@ |
1027 | $$unique; \ |
1028 | fi; \ |
1029 | fi |
1030 | -ctags: CTAGS |
1031 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
1032 | - $(TAGS_FILES) $(LISP) |
1033 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
1034 | - unique=`for i in $$list; do \ |
1035 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1036 | - done | \ |
1037 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1038 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1039 | +ctags: ctags-recursive |
1040 | + |
1041 | +CTAGS: ctags |
1042 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
1043 | + $(am__define_uniq_tagged_files); \ |
1044 | test -z "$(CTAGS_ARGS)$$unique" \ |
1045 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
1046 | $$unique |
1047 | @@ -506,9 +500,31 @@ |
1048 | here=`$(am__cd) $(top_builddir) && pwd` \ |
1049 | && $(am__cd) $(top_srcdir) \ |
1050 | && gtags -i $(GTAGS_ARGS) "$$here" |
1051 | +cscope: cscope.files |
1052 | + test ! -s cscope.files \ |
1053 | + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) |
1054 | +clean-cscope: |
1055 | + -rm -f cscope.files |
1056 | +cscope.files: clean-cscope cscopelist |
1057 | +cscopelist: cscopelist-recursive |
1058 | + |
1059 | +cscopelist-am: $(am__tagged_files) |
1060 | + list='$(am__tagged_files)'; \ |
1061 | + case "$(srcdir)" in \ |
1062 | + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
1063 | + *) sdir=$(subdir)/$(srcdir) ;; \ |
1064 | + esac; \ |
1065 | + for i in $$list; do \ |
1066 | + if test -f "$$i"; then \ |
1067 | + echo "$(subdir)/$$i"; \ |
1068 | + else \ |
1069 | + echo "$$sdir/$$i"; \ |
1070 | + fi; \ |
1071 | + done >> $(top_builddir)/cscope.files |
1072 | |
1073 | distclean-tags: |
1074 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
1075 | + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files |
1076 | |
1077 | distdir: $(DISTFILES) |
1078 | $(am__remove_distdir) |
1079 | @@ -579,39 +595,41 @@ |
1080 | || chmod -R a+r "$(distdir)" |
1081 | dist-gzip: distdir |
1082 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
1083 | - $(am__remove_distdir) |
1084 | + $(am__post_remove_distdir) |
1085 | dist-bzip2: distdir |
1086 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
1087 | - $(am__remove_distdir) |
1088 | + $(am__post_remove_distdir) |
1089 | |
1090 | dist-lzip: distdir |
1091 | tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
1092 | - $(am__remove_distdir) |
1093 | - |
1094 | -dist-lzma: distdir |
1095 | - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
1096 | - $(am__remove_distdir) |
1097 | + $(am__post_remove_distdir) |
1098 | |
1099 | dist-xz: distdir |
1100 | tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
1101 | - $(am__remove_distdir) |
1102 | + $(am__post_remove_distdir) |
1103 | |
1104 | dist-tarZ: distdir |
1105 | + @echo WARNING: "Support for shar distribution archives is" \ |
1106 | + "deprecated." >&2 |
1107 | + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
1108 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
1109 | - $(am__remove_distdir) |
1110 | + $(am__post_remove_distdir) |
1111 | |
1112 | dist-shar: distdir |
1113 | + @echo WARNING: "Support for distribution archives compressed with" \ |
1114 | + "legacy program 'compress' is deprecated." >&2 |
1115 | + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
1116 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
1117 | - $(am__remove_distdir) |
1118 | + $(am__post_remove_distdir) |
1119 | |
1120 | dist-zip: distdir |
1121 | -rm -f $(distdir).zip |
1122 | zip -rq $(distdir).zip $(distdir) |
1123 | - $(am__remove_distdir) |
1124 | + $(am__post_remove_distdir) |
1125 | |
1126 | -dist dist-all: distdir |
1127 | - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
1128 | - $(am__remove_distdir) |
1129 | +dist dist-all: |
1130 | + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' |
1131 | + $(am__post_remove_distdir) |
1132 | |
1133 | # This target untars the dist file and tries a VPATH configuration. Then |
1134 | # it guarantees that the distribution is self-contained by making another |
1135 | @@ -622,8 +640,6 @@ |
1136 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
1137 | *.tar.bz2*) \ |
1138 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
1139 | - *.tar.lzma*) \ |
1140 | - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
1141 | *.tar.lz*) \ |
1142 | lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
1143 | *.tar.xz*) \ |
1144 | @@ -635,18 +651,19 @@ |
1145 | *.zip*) \ |
1146 | unzip $(distdir).zip ;;\ |
1147 | esac |
1148 | - chmod -R a-w $(distdir); chmod u+w $(distdir) |
1149 | - mkdir $(distdir)/_build |
1150 | - mkdir $(distdir)/_inst |
1151 | + chmod -R a-w $(distdir) |
1152 | + chmod u+w $(distdir) |
1153 | + mkdir $(distdir)/_build $(distdir)/_inst |
1154 | chmod a-w $(distdir) |
1155 | test -d $(distdir)/_build || exit 0; \ |
1156 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
1157 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
1158 | && am__cwd=`pwd` \ |
1159 | && $(am__cd) $(distdir)/_build \ |
1160 | - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
1161 | + && ../configure \ |
1162 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
1163 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
1164 | + --srcdir=.. --prefix="$$dc_install_base" \ |
1165 | && $(MAKE) $(AM_MAKEFLAGS) \ |
1166 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
1167 | && $(MAKE) $(AM_MAKEFLAGS) check \ |
1168 | @@ -669,7 +686,7 @@ |
1169 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
1170 | && cd "$$am__cwd" \ |
1171 | || exit 1 |
1172 | - $(am__remove_distdir) |
1173 | + $(am__post_remove_distdir) |
1174 | @(echo "$(distdir) archives ready for distribution: "; \ |
1175 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
1176 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
1177 | @@ -803,13 +820,12 @@ |
1178 | |
1179 | uninstall-am: |
1180 | |
1181 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
1182 | - ctags-recursive install-am install-strip tags-recursive |
1183 | +.MAKE: $(am__recursive_targets) all install-am install-strip |
1184 | |
1185 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
1186 | - all all-am am--refresh check check-am clean clean-generic \ |
1187 | - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ |
1188 | - dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ |
1189 | +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ |
1190 | + am--refresh check check-am clean clean-cscope clean-generic \ |
1191 | + cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ |
1192 | + dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ |
1193 | dist-zip distcheck distclean distclean-generic distclean-hdr \ |
1194 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
1195 | dvi-am html html-am info info-am install install-am \ |
1196 | @@ -820,7 +836,7 @@ |
1197 | install-strip installcheck installcheck-am installdirs \ |
1198 | installdirs-am maintainer-clean maintainer-clean-generic \ |
1199 | mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ |
1200 | - tags-recursive uninstall uninstall-am |
1201 | + tags-am uninstall uninstall-am |
1202 | |
1203 | |
1204 | install-exec-local: |
1205 | |
1206 | === modified file 'NEWS' |
1207 | --- NEWS 2014-01-23 22:10:38 +0000 |
1208 | +++ NEWS 2015-05-26 02:58:11 +0000 |
1209 | @@ -1,3 +1,55 @@ |
1210 | +Noteworthy changes in version 0.9.2 (2015-05-11) |
1211 | +------------------------------------------------ |
1212 | + |
1213 | + * Support for saving the passphrase with libsecret. |
1214 | + |
1215 | + * Escape key works in the Gtk+ pinentry. |
1216 | + |
1217 | + * Improvements for pinentry-tty. |
1218 | + |
1219 | + * Minor cleanups for the native Windows pinentry. |
1220 | + |
1221 | + |
1222 | +Noteworthy changes in version 0.9.1 (2015-03-18) |
1223 | +------------------------------------------------ |
1224 | + |
1225 | + * Fixed build problems for systems without ncurses. |
1226 | + |
1227 | + * Reworked the option parser to allow building on systems without |
1228 | + getopt_long. |
1229 | + |
1230 | + * Fixed Qt4 build problems. |
1231 | + |
1232 | + |
1233 | +Noteworthy changes in version 0.9.0 (2014-10-26) |
1234 | +------------------------------------------------ |
1235 | + |
1236 | + * New command SETREPEAT. Currently only supported for Gtk+-2. |
1237 | + |
1238 | + * Gtk+-2: Pasting using the mouse is now supported. |
1239 | + |
1240 | + * curses: Check that it is actually connected to a tty. |
1241 | + |
1242 | + * Removed the old qt-3 and gtk+-1 pinentries. |
1243 | + |
1244 | + |
1245 | +Noteworthy changes in version 0.8.4 (2014-09-18) |
1246 | +------------------------------------------------ |
1247 | + |
1248 | + * New pinentry-tty version for dumb terminals. |
1249 | + |
1250 | + * Qt4: New option to enable pasting the passphrase from clipboard |
1251 | + |
1252 | + * Qt4: Improved accessiblity |
1253 | + |
1254 | + * Qt4: Raise confirm message windows into foreground |
1255 | + |
1256 | + * Qt4 (Windows): Improve the way pinentry-qt raises itself in the |
1257 | + foreground. |
1258 | + |
1259 | + * Improved the build system. |
1260 | + |
1261 | + |
1262 | Noteworthy changes in version 0.8.3 (2013-04-26) |
1263 | ------------------------------------------------ |
1264 | |
1265 | |
1266 | === modified file 'README' |
1267 | --- README 2010-03-18 23:36:51 +0000 |
1268 | +++ README 2015-05-26 02:58:11 +0000 |
1269 | @@ -7,18 +7,16 @@ |
1270 | |
1271 | There are programs for different toolkits available. For all GUIs it |
1272 | is automatically detected which modules can be built, but it can also |
1273 | -be requested explicitely. |
1274 | +be requested explicitly. |
1275 | |
1276 | GUI OPTION DEPENDENCIES |
1277 | Curses --enable-pinentry-curses Curses library, for example ncurses |
1278 | -GTK+ V1.2 --enable-pinentry-gtk Gimp Toolkit Library Version 1.2 |
1279 | - eg. libgtk-1.2 and libglib-1.2 |
1280 | GTK+ V2.0 --enable-pinentry-gtk2 Gimp Toolkit Library, Version 2.0 |
1281 | eg. libgtk-x11-2.0 and libglib-2.0 |
1282 | -Qt --enable-pinentry-qt Qt, eg. libqt or libqt-mt |
1283 | Qt4 --enable-pinentry-qt4 Qt4 |
1284 | +TTY --enable-pinentry-tty Simple TTY version, no dependencies |
1285 | |
1286 | -The GTK+ and Qt pinentries can fall back to the curses mode. The |
1287 | +The GTK+ and Qt pinentries can fall back to curses mode. The |
1288 | option to enable this is --enable-fallback-curses, but this is also |
1289 | detected automatically in the same way --enable-pinentry-curses is. |
1290 | The fallback to curses also works if --disable-pinentry-curses is |
1291 | @@ -26,13 +24,13 @@ |
1292 | pass --disable-fallback-curses to the configure script as well. |
1293 | |
1294 | Examples: |
1295 | -* To only build the GTK+ 1.2 pinentry with curses support: |
1296 | -./configure --enable-pinentry-gtk --enable-fallback-curses \ |
1297 | - --disable-pinentry-curses --disable-pinentry-qt |
1298 | +* To only build the GTK+ pinentry with curses support: |
1299 | +./configure --enable-pinentry-gtk2 --enable-fallback-curses \ |
1300 | + --disable-pinentry-curses --disable-pinentry-qt4 |
1301 | |
1302 | * To build the Qt pinentry, and the other pinentries if they are |
1303 | supported: |
1304 | -./configure --enable-pinentry-qt |
1305 | +./configure --enable-pinentry-qt4 |
1306 | |
1307 | * To build everything that is supported (complete auto-detection): |
1308 | ./configure |
1309 | |
1310 | === modified file 'VERSION' |
1311 | --- VERSION 2013-12-15 22:01:20 +0000 |
1312 | +++ VERSION 2015-05-26 02:58:11 +0000 |
1313 | @@ -1,1 +1,1 @@ |
1314 | -0.8.3 |
1315 | +0.9.2 |
1316 | |
1317 | === modified file 'aclocal.m4' |
1318 | --- aclocal.m4 2014-01-23 22:10:38 +0000 |
1319 | +++ aclocal.m4 2015-05-26 02:58:11 +0000 |
1320 | @@ -1,8 +1,7 @@ |
1321 | -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- |
1322 | - |
1323 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
1324 | -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
1325 | -# Inc. |
1326 | +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- |
1327 | + |
1328 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
1329 | + |
1330 | # This file is free software; the Free Software Foundation |
1331 | # gives unlimited permission to copy and/or distribute it, |
1332 | # with or without modifications, as long as this notice is preserved. |
1333 | @@ -12,61 +11,68 @@ |
1334 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1335 | # PARTICULAR PURPOSE. |
1336 | |
1337 | +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) |
1338 | m4_ifndef([AC_AUTOCONF_VERSION], |
1339 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1340 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
1341 | [m4_warning([this file was generated for autoconf 2.69. |
1342 | You have another version of autoconf. It may work, but is not guaranteed to. |
1343 | If you have problems, you may need to regenerate the build system entirely. |
1344 | -To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
1345 | +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
1346 | |
1347 | -# lib-ld.m4 serial 4 (gettext-0.18) |
1348 | -dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. |
1349 | +# lib-ld.m4 serial 6 |
1350 | +dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc. |
1351 | dnl This file is free software; the Free Software Foundation |
1352 | dnl gives unlimited permission to copy and/or distribute it, |
1353 | dnl with or without modifications, as long as this notice is preserved. |
1354 | |
1355 | dnl Subroutines of libtool.m4, |
1356 | -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision |
1357 | -dnl with libtool.m4. |
1358 | +dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid |
1359 | +dnl collision with libtool.m4. |
1360 | |
1361 | -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. |
1362 | +dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. |
1363 | AC_DEFUN([AC_LIB_PROG_LD_GNU], |
1364 | [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], |
1365 | -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. |
1366 | +[# I'd rather use --version here, but apparently some GNU lds only accept -v. |
1367 | case `$LD -v 2>&1 </dev/null` in |
1368 | *GNU* | *'with BFD'*) |
1369 | - acl_cv_prog_gnu_ld=yes ;; |
1370 | + acl_cv_prog_gnu_ld=yes |
1371 | + ;; |
1372 | *) |
1373 | - acl_cv_prog_gnu_ld=no ;; |
1374 | + acl_cv_prog_gnu_ld=no |
1375 | + ;; |
1376 | esac]) |
1377 | with_gnu_ld=$acl_cv_prog_gnu_ld |
1378 | ]) |
1379 | |
1380 | -dnl From libtool-1.4. Sets the variable LD. |
1381 | +dnl From libtool-2.4. Sets the variable LD. |
1382 | AC_DEFUN([AC_LIB_PROG_LD], |
1383 | -[AC_ARG_WITH([gnu-ld], |
1384 | -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], |
1385 | -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) |
1386 | -AC_REQUIRE([AC_PROG_CC])dnl |
1387 | +[AC_REQUIRE([AC_PROG_CC])dnl |
1388 | AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1389 | + |
1390 | +AC_ARG_WITH([gnu-ld], |
1391 | + [AS_HELP_STRING([--with-gnu-ld], |
1392 | + [assume the C compiler uses GNU ld [default=no]])], |
1393 | + [test "$withval" = no || with_gnu_ld=yes], |
1394 | + [with_gnu_ld=no])dnl |
1395 | + |
1396 | # Prepare PATH_SEPARATOR. |
1397 | # The user is always right. |
1398 | if test "${PATH_SEPARATOR+set}" != set; then |
1399 | - echo "#! /bin/sh" >conf$$.sh |
1400 | - echo "exit 0" >>conf$$.sh |
1401 | - chmod +x conf$$.sh |
1402 | - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
1403 | - PATH_SEPARATOR=';' |
1404 | - else |
1405 | - PATH_SEPARATOR=: |
1406 | - fi |
1407 | - rm -f conf$$.sh |
1408 | + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which |
1409 | + # contains only /bin. Note that ksh looks also at the FPATH variable, |
1410 | + # so we have to set that as well for the test. |
1411 | + PATH_SEPARATOR=: |
1412 | + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
1413 | + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
1414 | + || PATH_SEPARATOR=';' |
1415 | + } |
1416 | fi |
1417 | + |
1418 | ac_prog=ld |
1419 | if test "$GCC" = yes; then |
1420 | # Check if gcc -print-prog-name=ld gives a path. |
1421 | - AC_MSG_CHECKING([for ld used by GCC]) |
1422 | + AC_MSG_CHECKING([for ld used by $CC]) |
1423 | case $host in |
1424 | *-*-mingw*) |
1425 | # gcc leaves a trailing carriage return which upsets mingw |
1426 | @@ -76,11 +82,11 @@ |
1427 | esac |
1428 | case $ac_prog in |
1429 | # Accept absolute paths. |
1430 | - [[\\/]* | [A-Za-z]:[\\/]*)] |
1431 | - [re_direlt='/[^/][^/]*/\.\./'] |
1432 | - # Canonicalize the path of ld |
1433 | - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` |
1434 | - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do |
1435 | + [[\\/]]* | ?:[[\\/]]*) |
1436 | + re_direlt='/[[^/]][[^/]]*/\.\./' |
1437 | + # Canonicalize the pathname of ld |
1438 | + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` |
1439 | + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do |
1440 | ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` |
1441 | done |
1442 | test -z "$LD" && LD="$ac_prog" |
1443 | @@ -101,23 +107,26 @@ |
1444 | fi |
1445 | AC_CACHE_VAL([acl_cv_path_LD], |
1446 | [if test -z "$LD"; then |
1447 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" |
1448 | + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
1449 | for ac_dir in $PATH; do |
1450 | + IFS="$acl_save_ifs" |
1451 | test -z "$ac_dir" && ac_dir=. |
1452 | if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
1453 | acl_cv_path_LD="$ac_dir/$ac_prog" |
1454 | # Check to see if the program is GNU ld. I'd rather use --version, |
1455 | - # but apparently some GNU ld's only accept -v. |
1456 | + # but apparently some variants of GNU ld only accept -v. |
1457 | # Break only if it was the GNU/non-GNU ld that we prefer. |
1458 | - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in |
1459 | + case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in |
1460 | *GNU* | *'with BFD'*) |
1461 | - test "$with_gnu_ld" != no && break ;; |
1462 | + test "$with_gnu_ld" != no && break |
1463 | + ;; |
1464 | *) |
1465 | - test "$with_gnu_ld" != yes && break ;; |
1466 | + test "$with_gnu_ld" != yes && break |
1467 | + ;; |
1468 | esac |
1469 | fi |
1470 | done |
1471 | - IFS="$ac_save_ifs" |
1472 | + IFS="$acl_save_ifs" |
1473 | else |
1474 | acl_cv_path_LD="$LD" # Let the user override the test with a path. |
1475 | fi]) |
1476 | @@ -131,8 +140,8 @@ |
1477 | AC_LIB_PROG_LD_GNU |
1478 | ]) |
1479 | |
1480 | -# lib-link.m4 serial 21 (gettext-0.18) |
1481 | -dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. |
1482 | +# lib-link.m4 serial 26 (gettext-0.18.2) |
1483 | +dnl Copyright (C) 2001-2014 Free Software Foundation, Inc. |
1484 | dnl This file is free software; the Free Software Foundation |
1485 | dnl gives unlimited permission to copy and/or distribute it, |
1486 | dnl with or without modifications, as long as this notice is preserved. |
1487 | @@ -151,9 +160,9 @@ |
1488 | [ |
1489 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
1490 | AC_REQUIRE([AC_LIB_RPATH]) |
1491 | - pushdef([Name],[translit([$1],[./-], [___])]) |
1492 | - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], |
1493 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
1494 | + pushdef([Name],[m4_translit([$1],[./+-], [____])]) |
1495 | + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], |
1496 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) |
1497 | AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ |
1498 | AC_LIB_LINKFLAGS_BODY([$1], [$2]) |
1499 | ac_cv_lib[]Name[]_libs="$LIB[]NAME" |
1500 | @@ -191,9 +200,9 @@ |
1501 | [ |
1502 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
1503 | AC_REQUIRE([AC_LIB_RPATH]) |
1504 | - pushdef([Name],[translit([$1],[./-], [___])]) |
1505 | - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], |
1506 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
1507 | + pushdef([Name],[m4_translit([$1],[./+-], [____])]) |
1508 | + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], |
1509 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) |
1510 | |
1511 | dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME |
1512 | dnl accordingly. |
1513 | @@ -218,7 +227,8 @@ |
1514 | *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; |
1515 | *) LIBS="$LIB[]NAME $LIBS" ;; |
1516 | esac |
1517 | - AC_TRY_LINK([$3], [$4], |
1518 | + AC_LINK_IFELSE( |
1519 | + [AC_LANG_PROGRAM([[$3]], [[$4]])], |
1520 | [ac_cv_lib[]Name=yes], |
1521 | [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) |
1522 | LIBS="$ac_save_LIBS" |
1523 | @@ -248,6 +258,8 @@ |
1524 | dnl Determine the platform dependent parameters needed to use rpath: |
1525 | dnl acl_libext, |
1526 | dnl acl_shlibext, |
1527 | +dnl acl_libname_spec, |
1528 | +dnl acl_library_names_spec, |
1529 | dnl acl_hardcode_libdir_flag_spec, |
1530 | dnl acl_hardcode_libdir_separator, |
1531 | dnl acl_hardcode_direct, |
1532 | @@ -290,15 +302,15 @@ |
1533 | dnl macro call that searches for libname. |
1534 | AC_DEFUN([AC_LIB_FROMPACKAGE], |
1535 | [ |
1536 | - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], |
1537 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
1538 | + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], |
1539 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) |
1540 | define([acl_frompackage_]NAME, [$2]) |
1541 | popdef([NAME]) |
1542 | pushdef([PACK],[$2]) |
1543 | - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], |
1544 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
1545 | + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], |
1546 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) |
1547 | define([acl_libsinpackage_]PACKUP, |
1548 | - m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) |
1549 | + m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) |
1550 | popdef([PACKUP]) |
1551 | popdef([PACK]) |
1552 | ]) |
1553 | @@ -311,14 +323,14 @@ |
1554 | AC_DEFUN([AC_LIB_LINKFLAGS_BODY], |
1555 | [ |
1556 | AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) |
1557 | - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], |
1558 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
1559 | + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], |
1560 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) |
1561 | pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) |
1562 | - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], |
1563 | - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
1564 | + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], |
1565 | + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) |
1566 | pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) |
1567 | dnl Autoconf >= 2.61 supports dots in --with options. |
1568 | - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) |
1569 | + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) |
1570 | dnl By default, look in $includedir and $libdir. |
1571 | use_additional=yes |
1572 | AC_LIB_WITH_FINAL_PREFIX([ |
1573 | @@ -375,7 +387,7 @@ |
1574 | names_already_handled="$names_already_handled $name" |
1575 | dnl See if it was already located by an earlier AC_LIB_LINKFLAGS |
1576 | dnl or AC_LIB_HAVE_LINKFLAGS call. |
1577 | - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` |
1578 | + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` |
1579 | eval value=\"\$HAVE_LIB$uppername\" |
1580 | if test -n "$value"; then |
1581 | if test "$value" = yes; then |
1582 | @@ -907,7 +919,7 @@ |
1583 | ]) |
1584 | |
1585 | # lib-prefix.m4 serial 7 (gettext-0.18) |
1586 | -dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. |
1587 | +dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc. |
1588 | dnl This file is free software; the Free Software Foundation |
1589 | dnl gives unlimited permission to copy and/or distribute it, |
1590 | dnl with or without modifications, as long as this notice is preserved. |
1591 | @@ -1131,25 +1143,22 @@ |
1592 | test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" |
1593 | ]) |
1594 | |
1595 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
1596 | -# Foundation, Inc. |
1597 | +# Copyright (C) 2002-2013 Free Software Foundation, Inc. |
1598 | # |
1599 | # This file is free software; the Free Software Foundation |
1600 | # gives unlimited permission to copy and/or distribute it, |
1601 | # with or without modifications, as long as this notice is preserved. |
1602 | |
1603 | -# serial 1 |
1604 | - |
1605 | # AM_AUTOMAKE_VERSION(VERSION) |
1606 | # ---------------------------- |
1607 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
1608 | # generated from the m4 files accompanying Automake X.Y. |
1609 | # (This private macro should not be called outside this file.) |
1610 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
1611 | -[am__api_version='1.11' |
1612 | +[am__api_version='1.14' |
1613 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
1614 | dnl require some minimum version. Point them to the right macro. |
1615 | -m4_if([$1], [1.11.6], [], |
1616 | +m4_if([$1], [1.14.1], [], |
1617 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
1618 | ]) |
1619 | |
1620 | @@ -1165,24 +1174,22 @@ |
1621 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
1622 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
1623 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
1624 | -[AM_AUTOMAKE_VERSION([1.11.6])dnl |
1625 | +[AM_AUTOMAKE_VERSION([1.14.1])dnl |
1626 | m4_ifndef([AC_AUTOCONF_VERSION], |
1627 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1628 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
1629 | |
1630 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
1631 | |
1632 | -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
1633 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1634 | # |
1635 | # This file is free software; the Free Software Foundation |
1636 | # gives unlimited permission to copy and/or distribute it, |
1637 | # with or without modifications, as long as this notice is preserved. |
1638 | |
1639 | -# serial 1 |
1640 | - |
1641 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
1642 | -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
1643 | -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
1644 | +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
1645 | +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
1646 | # |
1647 | # Of course, Automake must honor this variable whenever it calls a |
1648 | # tool from the auxiliary directory. The problem is that $srcdir (and |
1649 | @@ -1201,7 +1208,7 @@ |
1650 | # |
1651 | # The reason of the latter failure is that $top_srcdir and $ac_aux_dir |
1652 | # are both prefixed by $srcdir. In an in-source build this is usually |
1653 | -# harmless because $srcdir is `.', but things will broke when you |
1654 | +# harmless because $srcdir is '.', but things will broke when you |
1655 | # start a VPATH build or use an absolute $srcdir. |
1656 | # |
1657 | # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, |
1658 | @@ -1219,30 +1226,26 @@ |
1659 | # configured tree to be moved without reconfiguration. |
1660 | |
1661 | AC_DEFUN([AM_AUX_DIR_EXPAND], |
1662 | -[dnl Rely on autoconf to set up CDPATH properly. |
1663 | -AC_PREREQ([2.50])dnl |
1664 | -# expand $ac_aux_dir to an absolute path |
1665 | -am_aux_dir=`cd $ac_aux_dir && pwd` |
1666 | +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl |
1667 | +# Expand $ac_aux_dir to an absolute path. |
1668 | +am_aux_dir=`cd "$ac_aux_dir" && pwd` |
1669 | ]) |
1670 | |
1671 | # AM_CONDITIONAL -*- Autoconf -*- |
1672 | |
1673 | -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 |
1674 | -# Free Software Foundation, Inc. |
1675 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
1676 | # |
1677 | # This file is free software; the Free Software Foundation |
1678 | # gives unlimited permission to copy and/or distribute it, |
1679 | # with or without modifications, as long as this notice is preserved. |
1680 | |
1681 | -# serial 9 |
1682 | - |
1683 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
1684 | # ------------------------------------- |
1685 | # Define a conditional. |
1686 | AC_DEFUN([AM_CONDITIONAL], |
1687 | -[AC_PREREQ(2.52)dnl |
1688 | - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
1689 | - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
1690 | +[AC_PREREQ([2.52])dnl |
1691 | + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
1692 | + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
1693 | AC_SUBST([$1_TRUE])dnl |
1694 | AC_SUBST([$1_FALSE])dnl |
1695 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl |
1696 | @@ -1261,16 +1264,14 @@ |
1697 | Usually this means the macro was only invoked conditionally.]]) |
1698 | fi])]) |
1699 | |
1700 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
1701 | -# 2010, 2011 Free Software Foundation, Inc. |
1702 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
1703 | # |
1704 | # This file is free software; the Free Software Foundation |
1705 | # gives unlimited permission to copy and/or distribute it, |
1706 | # with or without modifications, as long as this notice is preserved. |
1707 | |
1708 | -# serial 12 |
1709 | |
1710 | -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
1711 | +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be |
1712 | # written in clear, in which case automake, when reading aclocal.m4, |
1713 | # will think it sees a *use*, and therefore will trigger all it's |
1714 | # C support machinery. Also note that it means that autoscan, seeing |
1715 | @@ -1280,7 +1281,7 @@ |
1716 | # _AM_DEPENDENCIES(NAME) |
1717 | # ---------------------- |
1718 | # See how the compiler implements dependency checking. |
1719 | -# NAME is "CC", "CXX", "GCJ", or "OBJC". |
1720 | +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". |
1721 | # We try a few techniques and use that to set a single cache variable. |
1722 | # |
1723 | # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was |
1724 | @@ -1293,12 +1294,13 @@ |
1725 | AC_REQUIRE([AM_MAKE_INCLUDE])dnl |
1726 | AC_REQUIRE([AM_DEP_TRACK])dnl |
1727 | |
1728 | -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], |
1729 | - [$1], CXX, [depcc="$CXX" am_compiler_list=], |
1730 | - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
1731 | - [$1], UPC, [depcc="$UPC" am_compiler_list=], |
1732 | - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
1733 | - [depcc="$$1" am_compiler_list=]) |
1734 | +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], |
1735 | + [$1], [CXX], [depcc="$CXX" am_compiler_list=], |
1736 | + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
1737 | + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], |
1738 | + [$1], [UPC], [depcc="$UPC" am_compiler_list=], |
1739 | + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
1740 | + [depcc="$$1" am_compiler_list=]) |
1741 | |
1742 | AC_CACHE_CHECK([dependency style of $depcc], |
1743 | [am_cv_$1_dependencies_compiler_type], |
1744 | @@ -1306,8 +1308,8 @@ |
1745 | # We make a subdir and do the tests there. Otherwise we can end up |
1746 | # making bogus files that we don't know about and never remove. For |
1747 | # instance it was reported that on HP-UX the gcc test will end up |
1748 | - # making a dummy file named `D' -- because `-MD' means `put the output |
1749 | - # in D'. |
1750 | + # making a dummy file named 'D' -- because '-MD' means "put the output |
1751 | + # in D". |
1752 | rm -rf conftest.dir |
1753 | mkdir conftest.dir |
1754 | # Copy depcomp to subdir because otherwise we won't find it if we're |
1755 | @@ -1347,16 +1349,16 @@ |
1756 | : > sub/conftest.c |
1757 | for i in 1 2 3 4 5 6; do |
1758 | echo '#include "conftst'$i'.h"' >> sub/conftest.c |
1759 | - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
1760 | - # Solaris 8's {/usr,}/bin/sh. |
1761 | - touch sub/conftst$i.h |
1762 | + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
1763 | + # Solaris 10 /bin/sh. |
1764 | + echo '/* dummy */' > sub/conftst$i.h |
1765 | done |
1766 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
1767 | |
1768 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
1769 | + # We check with '-c' and '-o' for the sake of the "dashmstdout" |
1770 | # mode. It turns out that the SunPro C++ compiler does not properly |
1771 | - # handle `-M -o', and we need to detect this. Also, some Intel |
1772 | - # versions had trouble with output in subdirs |
1773 | + # handle '-M -o', and we need to detect this. Also, some Intel |
1774 | + # versions had trouble with output in subdirs. |
1775 | am__obj=sub/conftest.${OBJEXT-o} |
1776 | am__minus_obj="-o $am__obj" |
1777 | case $depmode in |
1778 | @@ -1365,8 +1367,8 @@ |
1779 | test "$am__universal" = false || continue |
1780 | ;; |
1781 | nosideeffect) |
1782 | - # after this tag, mechanisms are not by side-effect, so they'll |
1783 | - # only be used when explicitly requested |
1784 | + # After this tag, mechanisms are not by side-effect, so they'll |
1785 | + # only be used when explicitly requested. |
1786 | if test "x$enable_dependency_tracking" = xyes; then |
1787 | continue |
1788 | else |
1789 | @@ -1374,7 +1376,7 @@ |
1790 | fi |
1791 | ;; |
1792 | msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
1793 | - # This compiler won't grok `-c -o', but also, the minuso test has |
1794 | + # This compiler won't grok '-c -o', but also, the minuso test has |
1795 | # not run yet. These depmodes are late enough in the game, and |
1796 | # so weak that their functioning should not be impacted. |
1797 | am__obj=conftest.${OBJEXT-o} |
1798 | @@ -1422,7 +1424,7 @@ |
1799 | # AM_SET_DEPDIR |
1800 | # ------------- |
1801 | # Choose a directory name for dependency files. |
1802 | -# This macro is AC_REQUIREd in _AM_DEPENDENCIES |
1803 | +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. |
1804 | AC_DEFUN([AM_SET_DEPDIR], |
1805 | [AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
1806 | AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl |
1807 | @@ -1432,9 +1434,13 @@ |
1808 | # AM_DEP_TRACK |
1809 | # ------------ |
1810 | AC_DEFUN([AM_DEP_TRACK], |
1811 | -[AC_ARG_ENABLE(dependency-tracking, |
1812 | -[ --disable-dependency-tracking speeds up one-time build |
1813 | - --enable-dependency-tracking do not reject slow dependency extractors]) |
1814 | +[AC_ARG_ENABLE([dependency-tracking], [dnl |
1815 | +AS_HELP_STRING( |
1816 | + [--enable-dependency-tracking], |
1817 | + [do not reject slow dependency extractors]) |
1818 | +AS_HELP_STRING( |
1819 | + [--disable-dependency-tracking], |
1820 | + [speeds up one-time build])]) |
1821 | if test "x$enable_dependency_tracking" != xno; then |
1822 | am_depcomp="$ac_aux_dir/depcomp" |
1823 | AMDEPBACKSLASH='\' |
1824 | @@ -1449,20 +1455,18 @@ |
1825 | |
1826 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
1827 | |
1828 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
1829 | -# Free Software Foundation, Inc. |
1830 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
1831 | # |
1832 | # This file is free software; the Free Software Foundation |
1833 | # gives unlimited permission to copy and/or distribute it, |
1834 | # with or without modifications, as long as this notice is preserved. |
1835 | |
1836 | -#serial 5 |
1837 | |
1838 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
1839 | # ------------------------------ |
1840 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
1841 | [{ |
1842 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files |
1843 | + # Older Autoconf quotes --file arguments for eval, but not when files |
1844 | # are listed without --file. Let's play safe and only enable the eval |
1845 | # if we detect the quoting. |
1846 | case $CONFIG_FILES in |
1847 | @@ -1475,7 +1479,7 @@ |
1848 | # Strip MF so we end up with the name of the file. |
1849 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
1850 | # Check whether this is an Automake generated Makefile or not. |
1851 | - # We used to match only the files named `Makefile.in', but |
1852 | + # We used to match only the files named 'Makefile.in', but |
1853 | # some people rename them; so instead we look at the file content. |
1854 | # Grep'ing the first line is not enough: some people post-process |
1855 | # each Makefile.in and add a new line on top of each file to say so. |
1856 | @@ -1487,21 +1491,19 @@ |
1857 | continue |
1858 | fi |
1859 | # Extract the definition of DEPDIR, am__include, and am__quote |
1860 | - # from the Makefile without running `make'. |
1861 | + # from the Makefile without running 'make'. |
1862 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
1863 | test -z "$DEPDIR" && continue |
1864 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
1865 | - test -z "am__include" && continue |
1866 | + test -z "$am__include" && continue |
1867 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
1868 | - # When using ansi2knr, U may be empty or an underscore; expand it |
1869 | - U=`sed -n 's/^U = //p' < "$mf"` |
1870 | # Find all dependency output files, they are included files with |
1871 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
1872 | # simplest approach to changing $(DEPDIR) to its actual value in the |
1873 | # expansion. |
1874 | for file in `sed -n " |
1875 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
1876 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
1877 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
1878 | # Make sure the directory exists. |
1879 | test -f "$dirpart/$file" && continue |
1880 | fdir=`AS_DIRNAME(["$file"])` |
1881 | @@ -1519,7 +1521,7 @@ |
1882 | # This macro should only be invoked once -- use via AC_REQUIRE. |
1883 | # |
1884 | # This code is only required when automatic dependency tracking |
1885 | -# is enabled. FIXME. This creates each `.P' file that we will |
1886 | +# is enabled. FIXME. This creates each '.P' file that we will |
1887 | # need in order to bootstrap the dependency handling code. |
1888 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
1889 | [AC_CONFIG_COMMANDS([depfiles], |
1890 | @@ -1527,32 +1529,23 @@ |
1891 | [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
1892 | ]) |
1893 | |
1894 | -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 |
1895 | -# Free Software Foundation, Inc. |
1896 | -# |
1897 | -# This file is free software; the Free Software Foundation |
1898 | -# gives unlimited permission to copy and/or distribute it, |
1899 | -# with or without modifications, as long as this notice is preserved. |
1900 | - |
1901 | -# serial 8 |
1902 | - |
1903 | -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. |
1904 | -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) |
1905 | - |
1906 | # Do all the work for Automake. -*- Autoconf -*- |
1907 | |
1908 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
1909 | -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. |
1910 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
1911 | # |
1912 | # This file is free software; the Free Software Foundation |
1913 | # gives unlimited permission to copy and/or distribute it, |
1914 | # with or without modifications, as long as this notice is preserved. |
1915 | |
1916 | -# serial 16 |
1917 | - |
1918 | # This macro actually does too much. Some checks are only needed if |
1919 | # your package does certain things. But this isn't really a big deal. |
1920 | |
1921 | +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. |
1922 | +m4_define([AC_PROG_CC], |
1923 | +m4_defn([AC_PROG_CC]) |
1924 | +[_AM_PROG_CC_C_O |
1925 | +]) |
1926 | + |
1927 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
1928 | # AM_INIT_AUTOMAKE([OPTIONS]) |
1929 | # ----------------------------------------------- |
1930 | @@ -1565,7 +1558,7 @@ |
1931 | # arguments mandatory, and then we can depend on a new Autoconf |
1932 | # release and drop the old call support. |
1933 | AC_DEFUN([AM_INIT_AUTOMAKE], |
1934 | -[AC_PREREQ([2.62])dnl |
1935 | +[AC_PREREQ([2.65])dnl |
1936 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
1937 | dnl the ones we care about. |
1938 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
1939 | @@ -1594,31 +1587,40 @@ |
1940 | # Define the identity of the package. |
1941 | dnl Distinguish between old-style and new-style calls. |
1942 | m4_ifval([$2], |
1943 | -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
1944 | +[AC_DIAGNOSE([obsolete], |
1945 | + [$0: two- and three-arguments forms are deprecated.]) |
1946 | +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
1947 | AC_SUBST([PACKAGE], [$1])dnl |
1948 | AC_SUBST([VERSION], [$2])], |
1949 | [_AM_SET_OPTIONS([$1])dnl |
1950 | dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
1951 | -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, |
1952 | +m4_if( |
1953 | + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), |
1954 | + [ok:ok],, |
1955 | [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
1956 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
1957 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
1958 | |
1959 | _AM_IF_OPTION([no-define],, |
1960 | -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) |
1961 | - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl |
1962 | +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) |
1963 | + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl |
1964 | |
1965 | # Some tools Automake needs. |
1966 | AC_REQUIRE([AM_SANITY_CHECK])dnl |
1967 | AC_REQUIRE([AC_ARG_PROGRAM])dnl |
1968 | -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) |
1969 | -AM_MISSING_PROG(AUTOCONF, autoconf) |
1970 | -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) |
1971 | -AM_MISSING_PROG(AUTOHEADER, autoheader) |
1972 | -AM_MISSING_PROG(MAKEINFO, makeinfo) |
1973 | +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) |
1974 | +AM_MISSING_PROG([AUTOCONF], [autoconf]) |
1975 | +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) |
1976 | +AM_MISSING_PROG([AUTOHEADER], [autoheader]) |
1977 | +AM_MISSING_PROG([MAKEINFO], [makeinfo]) |
1978 | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
1979 | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
1980 | -AC_REQUIRE([AM_PROG_MKDIR_P])dnl |
1981 | +AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
1982 | +# For better backward compatibility. To be removed once Automake 1.9.x |
1983 | +# dies out for good. For more background, see: |
1984 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
1985 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
1986 | +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
1987 | # We need awk for the "check" target. The system "awk" is bad on |
1988 | # some platforms. |
1989 | AC_REQUIRE([AC_PROG_AWK])dnl |
1990 | @@ -1629,34 +1631,79 @@ |
1991 | [_AM_PROG_TAR([v7])])]) |
1992 | _AM_IF_OPTION([no-dependencies],, |
1993 | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
1994 | - [_AM_DEPENDENCIES(CC)], |
1995 | - [define([AC_PROG_CC], |
1996 | - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl |
1997 | + [_AM_DEPENDENCIES([CC])], |
1998 | + [m4_define([AC_PROG_CC], |
1999 | + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl |
2000 | AC_PROVIDE_IFELSE([AC_PROG_CXX], |
2001 | - [_AM_DEPENDENCIES(CXX)], |
2002 | - [define([AC_PROG_CXX], |
2003 | - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
2004 | + [_AM_DEPENDENCIES([CXX])], |
2005 | + [m4_define([AC_PROG_CXX], |
2006 | + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl |
2007 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
2008 | - [_AM_DEPENDENCIES(OBJC)], |
2009 | - [define([AC_PROG_OBJC], |
2010 | - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl |
2011 | + [_AM_DEPENDENCIES([OBJC])], |
2012 | + [m4_define([AC_PROG_OBJC], |
2013 | + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
2014 | +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
2015 | + [_AM_DEPENDENCIES([OBJCXX])], |
2016 | + [m4_define([AC_PROG_OBJCXX], |
2017 | + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl |
2018 | ]) |
2019 | -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
2020 | -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the |
2021 | -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
2022 | -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
2023 | +AC_REQUIRE([AM_SILENT_RULES])dnl |
2024 | +dnl The testsuite driver may need to know about EXEEXT, so add the |
2025 | +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This |
2026 | +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. |
2027 | AC_CONFIG_COMMANDS_PRE(dnl |
2028 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
2029 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
2030 | + |
2031 | +# POSIX will say in a future version that running "rm -f" with no argument |
2032 | +# is OK; and we want to be able to make that assumption in our Makefile |
2033 | +# recipes. So use an aggressive probe to check that the usage we want is |
2034 | +# actually supported "in the wild" to an acceptable degree. |
2035 | +# See automake bug#10828. |
2036 | +# To make any issue more visible, cause the running configure to be aborted |
2037 | +# by default if the 'rm' program in use doesn't match our expectations; the |
2038 | +# user can still override this though. |
2039 | +if rm -f && rm -fr && rm -rf; then : OK; else |
2040 | + cat >&2 <<'END' |
2041 | +Oops! |
2042 | + |
2043 | +Your 'rm' program seems unable to run without file operands specified |
2044 | +on the command line, even when the '-f' option is present. This is contrary |
2045 | +to the behaviour of most rm programs out there, and not conforming with |
2046 | +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
2047 | + |
2048 | +Please tell bug-automake@gnu.org about your system, including the value |
2049 | +of your $PATH and any error possibly output before this message. This |
2050 | +can help us improve future automake versions. |
2051 | + |
2052 | +END |
2053 | + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
2054 | + echo 'Configuration will proceed anyway, since you have set the' >&2 |
2055 | + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
2056 | + echo >&2 |
2057 | + else |
2058 | + cat >&2 <<'END' |
2059 | +Aborting the configuration process, to ensure you take notice of the issue. |
2060 | + |
2061 | +You can download and install GNU coreutils to get an 'rm' implementation |
2062 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. |
2063 | + |
2064 | +If you want to complete the configuration process using your problematic |
2065 | +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
2066 | +to "yes", and re-run configure. |
2067 | + |
2068 | +END |
2069 | + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
2070 | + fi |
2071 | +fi |
2072 | ]) |
2073 | |
2074 | -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
2075 | +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
2076 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
2077 | dnl mangled by Autoconf and run in a shell conditional statement. |
2078 | m4_define([_AC_COMPILER_EXEEXT], |
2079 | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
2080 | |
2081 | - |
2082 | # When config.status generates a header, we must update the stamp-h file. |
2083 | # This file resides in the same directory as the config header |
2084 | # that is generated. The stamp files are numbered to have different names. |
2085 | @@ -1678,15 +1725,12 @@ |
2086 | done |
2087 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
2088 | |
2089 | -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
2090 | -# Inc. |
2091 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
2092 | # |
2093 | # This file is free software; the Free Software Foundation |
2094 | # gives unlimited permission to copy and/or distribute it, |
2095 | # with or without modifications, as long as this notice is preserved. |
2096 | |
2097 | -# serial 1 |
2098 | - |
2099 | # AM_PROG_INSTALL_SH |
2100 | # ------------------ |
2101 | # Define $install_sh. |
2102 | @@ -1700,16 +1744,14 @@ |
2103 | install_sh="\${SHELL} $am_aux_dir/install-sh" |
2104 | esac |
2105 | fi |
2106 | -AC_SUBST(install_sh)]) |
2107 | +AC_SUBST([install_sh])]) |
2108 | |
2109 | -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
2110 | +# Copyright (C) 2003-2013 Free Software Foundation, Inc. |
2111 | # |
2112 | # This file is free software; the Free Software Foundation |
2113 | # gives unlimited permission to copy and/or distribute it, |
2114 | # with or without modifications, as long as this notice is preserved. |
2115 | |
2116 | -# serial 2 |
2117 | - |
2118 | # Check whether the underlying file-system supports filenames |
2119 | # with a leading dot. For instance MS-DOS doesn't. |
2120 | AC_DEFUN([AM_SET_LEADING_DOT], |
2121 | @@ -1726,20 +1768,17 @@ |
2122 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
2123 | # From Jim Meyering |
2124 | |
2125 | -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, |
2126 | -# 2011 Free Software Foundation, Inc. |
2127 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
2128 | # |
2129 | # This file is free software; the Free Software Foundation |
2130 | # gives unlimited permission to copy and/or distribute it, |
2131 | # with or without modifications, as long as this notice is preserved. |
2132 | |
2133 | -# serial 5 |
2134 | - |
2135 | # AM_MAINTAINER_MODE([DEFAULT-MODE]) |
2136 | # ---------------------------------- |
2137 | # Control maintainer-specific portions of Makefiles. |
2138 | -# Default is to disable them, unless `enable' is passed literally. |
2139 | -# For symmetry, `disable' may be passed as well. Anyway, the user |
2140 | +# Default is to disable them, unless 'enable' is passed literally. |
2141 | +# For symmetry, 'disable' may be passed as well. Anyway, the user |
2142 | # can override the default with the --enable/--disable switch. |
2143 | AC_DEFUN([AM_MAINTAINER_MODE], |
2144 | [m4_case(m4_default([$1], [disable]), |
2145 | @@ -1750,10 +1789,11 @@ |
2146 | AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
2147 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
2148 | AC_ARG_ENABLE([maintainer-mode], |
2149 | -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful |
2150 | - (and sometimes confusing) to the casual installer], |
2151 | - [USE_MAINTAINER_MODE=$enableval], |
2152 | - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
2153 | + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], |
2154 | + am_maintainer_other[ make rules and dependencies not useful |
2155 | + (and sometimes confusing) to the casual installer])], |
2156 | + [USE_MAINTAINER_MODE=$enableval], |
2157 | + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
2158 | AC_MSG_RESULT([$USE_MAINTAINER_MODE]) |
2159 | AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) |
2160 | MAINT=$MAINTAINER_MODE_TRUE |
2161 | @@ -1761,18 +1801,14 @@ |
2162 | ] |
2163 | ) |
2164 | |
2165 | -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) |
2166 | - |
2167 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
2168 | |
2169 | -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. |
2170 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
2171 | # |
2172 | # This file is free software; the Free Software Foundation |
2173 | # gives unlimited permission to copy and/or distribute it, |
2174 | # with or without modifications, as long as this notice is preserved. |
2175 | |
2176 | -# serial 4 |
2177 | - |
2178 | # AM_MAKE_INCLUDE() |
2179 | # ----------------- |
2180 | # Check to see how make treats includes. |
2181 | @@ -1790,7 +1826,7 @@ |
2182 | _am_result=none |
2183 | # First try GNU make style include. |
2184 | echo "include confinc" > confmf |
2185 | -# Ignore all kinds of additional output from `make'. |
2186 | +# Ignore all kinds of additional output from 'make'. |
2187 | case `$am_make -s -f confmf 2> /dev/null` in #( |
2188 | *the\ am__doit\ target*) |
2189 | am__include=include |
2190 | @@ -1817,15 +1853,12 @@ |
2191 | |
2192 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
2193 | |
2194 | -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 |
2195 | -# Free Software Foundation, Inc. |
2196 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
2197 | # |
2198 | # This file is free software; the Free Software Foundation |
2199 | # gives unlimited permission to copy and/or distribute it, |
2200 | # with or without modifications, as long as this notice is preserved. |
2201 | |
2202 | -# serial 6 |
2203 | - |
2204 | # AM_MISSING_PROG(NAME, PROGRAM) |
2205 | # ------------------------------ |
2206 | AC_DEFUN([AM_MISSING_PROG], |
2207 | @@ -1833,11 +1866,10 @@ |
2208 | $1=${$1-"${am_missing_run}$2"} |
2209 | AC_SUBST($1)]) |
2210 | |
2211 | - |
2212 | # AM_MISSING_HAS_RUN |
2213 | # ------------------ |
2214 | -# Define MISSING if not defined so far and test if it supports --run. |
2215 | -# If it does, set am_missing_run to use it, otherwise, to nothing. |
2216 | +# Define MISSING if not defined so far and test if it is modern enough. |
2217 | +# If it is, set am_missing_run to use it, otherwise, to nothing. |
2218 | AC_DEFUN([AM_MISSING_HAS_RUN], |
2219 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
2220 | AC_REQUIRE_AUX_FILE([missing])dnl |
2221 | @@ -1850,54 +1882,51 @@ |
2222 | esac |
2223 | fi |
2224 | # Use eval to expand $SHELL |
2225 | -if eval "$MISSING --run true"; then |
2226 | - am_missing_run="$MISSING --run " |
2227 | +if eval "$MISSING --is-lightweight"; then |
2228 | + am_missing_run="$MISSING " |
2229 | else |
2230 | am_missing_run= |
2231 | - AC_MSG_WARN([`missing' script is too old or missing]) |
2232 | + AC_MSG_WARN(['missing' script is too old or missing]) |
2233 | fi |
2234 | ]) |
2235 | |
2236 | -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
2237 | -# Inc. |
2238 | +# -*- Autoconf -*- |
2239 | +# Obsolete and "removed" macros, that must however still report explicit |
2240 | +# error messages when used, to smooth transition. |
2241 | +# |
2242 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
2243 | # |
2244 | # This file is free software; the Free Software Foundation |
2245 | # gives unlimited permission to copy and/or distribute it, |
2246 | # with or without modifications, as long as this notice is preserved. |
2247 | |
2248 | -# serial 1 |
2249 | - |
2250 | -# AM_PROG_MKDIR_P |
2251 | -# --------------- |
2252 | -# Check for `mkdir -p'. |
2253 | -AC_DEFUN([AM_PROG_MKDIR_P], |
2254 | -[AC_PREREQ([2.60])dnl |
2255 | -AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
2256 | -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, |
2257 | -dnl while keeping a definition of mkdir_p for backward compatibility. |
2258 | -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. |
2259 | -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of |
2260 | -dnl Makefile.ins that do not define MKDIR_P, so we do our own |
2261 | -dnl adjustment using top_builddir (which is defined more often than |
2262 | -dnl MKDIR_P). |
2263 | -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl |
2264 | -case $mkdir_p in |
2265 | - [[\\/$]]* | ?:[[\\/]]*) ;; |
2266 | - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
2267 | -esac |
2268 | -]) |
2269 | +AC_DEFUN([AM_CONFIG_HEADER], |
2270 | +[AC_DIAGNOSE([obsolete], |
2271 | +['$0': this macro is obsolete. |
2272 | +You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl |
2273 | +AC_CONFIG_HEADERS($@)]) |
2274 | + |
2275 | +AC_DEFUN([AM_PROG_CC_STDC], |
2276 | +[AC_PROG_CC |
2277 | +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc |
2278 | +AC_DIAGNOSE([obsolete], |
2279 | +['$0': this macro is obsolete. |
2280 | +You should simply use the 'AC][_PROG_CC' macro instead. |
2281 | +Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', |
2282 | +but upon 'ac_cv_prog_cc_stdc'.])]) |
2283 | + |
2284 | +AC_DEFUN([AM_C_PROTOTYPES], |
2285 | + [AC_FATAL([automatic de-ANSI-fication support has been removed])]) |
2286 | +AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) |
2287 | |
2288 | # Helper functions for option handling. -*- Autoconf -*- |
2289 | |
2290 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
2291 | -# Foundation, Inc. |
2292 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
2293 | # |
2294 | # This file is free software; the Free Software Foundation |
2295 | # gives unlimited permission to copy and/or distribute it, |
2296 | # with or without modifications, as long as this notice is preserved. |
2297 | |
2298 | -# serial 5 |
2299 | - |
2300 | # _AM_MANGLE_OPTION(NAME) |
2301 | # ----------------------- |
2302 | AC_DEFUN([_AM_MANGLE_OPTION], |
2303 | @@ -1907,7 +1936,7 @@ |
2304 | # -------------------- |
2305 | # Set option NAME. Presently that only means defining a flag for this option. |
2306 | AC_DEFUN([_AM_SET_OPTION], |
2307 | -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
2308 | +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) |
2309 | |
2310 | # _AM_SET_OPTIONS(OPTIONS) |
2311 | # ------------------------ |
2312 | @@ -1921,24 +1950,82 @@ |
2313 | AC_DEFUN([_AM_IF_OPTION], |
2314 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
2315 | |
2316 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
2317 | +# |
2318 | +# This file is free software; the Free Software Foundation |
2319 | +# gives unlimited permission to copy and/or distribute it, |
2320 | +# with or without modifications, as long as this notice is preserved. |
2321 | + |
2322 | +# _AM_PROG_CC_C_O |
2323 | +# --------------- |
2324 | +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC |
2325 | +# to automatically call this. |
2326 | +AC_DEFUN([_AM_PROG_CC_C_O], |
2327 | +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
2328 | +AC_REQUIRE_AUX_FILE([compile])dnl |
2329 | +AC_LANG_PUSH([C])dnl |
2330 | +AC_CACHE_CHECK( |
2331 | + [whether $CC understands -c and -o together], |
2332 | + [am_cv_prog_cc_c_o], |
2333 | + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) |
2334 | + # Make sure it works both with $CC and with simple cc. |
2335 | + # Following AC_PROG_CC_C_O, we do the test twice because some |
2336 | + # compilers refuse to overwrite an existing .o file with -o, |
2337 | + # though they will create one. |
2338 | + am_cv_prog_cc_c_o=yes |
2339 | + for am_i in 1 2; do |
2340 | + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ |
2341 | + && test -f conftest2.$ac_objext; then |
2342 | + : OK |
2343 | + else |
2344 | + am_cv_prog_cc_c_o=no |
2345 | + break |
2346 | + fi |
2347 | + done |
2348 | + rm -f core conftest* |
2349 | + unset am_i]) |
2350 | +if test "$am_cv_prog_cc_c_o" != yes; then |
2351 | + # Losing compiler, so override with the script. |
2352 | + # FIXME: It is wrong to rewrite CC. |
2353 | + # But if we don't then we get into trouble of one sort or another. |
2354 | + # A longer-term fix would be to have automake use am__CC in this case, |
2355 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
2356 | + CC="$am_aux_dir/compile $CC" |
2357 | +fi |
2358 | +AC_LANG_POP([C])]) |
2359 | + |
2360 | +# For backward compatibility. |
2361 | +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
2362 | + |
2363 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
2364 | +# |
2365 | +# This file is free software; the Free Software Foundation |
2366 | +# gives unlimited permission to copy and/or distribute it, |
2367 | +# with or without modifications, as long as this notice is preserved. |
2368 | + |
2369 | +# AM_RUN_LOG(COMMAND) |
2370 | +# ------------------- |
2371 | +# Run COMMAND, save the exit status in ac_status, and log it. |
2372 | +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) |
2373 | +AC_DEFUN([AM_RUN_LOG], |
2374 | +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD |
2375 | + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD |
2376 | + ac_status=$? |
2377 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2378 | + (exit $ac_status); }]) |
2379 | + |
2380 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
2381 | |
2382 | -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 |
2383 | -# Free Software Foundation, Inc. |
2384 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
2385 | # |
2386 | # This file is free software; the Free Software Foundation |
2387 | # gives unlimited permission to copy and/or distribute it, |
2388 | # with or without modifications, as long as this notice is preserved. |
2389 | |
2390 | -# serial 5 |
2391 | - |
2392 | # AM_SANITY_CHECK |
2393 | # --------------- |
2394 | AC_DEFUN([AM_SANITY_CHECK], |
2395 | [AC_MSG_CHECKING([whether build environment is sane]) |
2396 | -# Just in case |
2397 | -sleep 1 |
2398 | -echo timestamp > conftest.file |
2399 | # Reject unsafe characters in $srcdir or the absolute working directory |
2400 | # name. Accept space and tab only in the latter. |
2401 | am_lf=' |
2402 | @@ -1949,32 +2036,40 @@ |
2403 | esac |
2404 | case $srcdir in |
2405 | *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) |
2406 | - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; |
2407 | + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; |
2408 | esac |
2409 | |
2410 | -# Do `set' in a subshell so we don't clobber the current shell's |
2411 | +# Do 'set' in a subshell so we don't clobber the current shell's |
2412 | # arguments. Must try -L first in case configure is actually a |
2413 | # symlink; some systems play weird games with the mod time of symlinks |
2414 | # (eg FreeBSD returns the mod time of the symlink's containing |
2415 | # directory). |
2416 | if ( |
2417 | - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
2418 | - if test "$[*]" = "X"; then |
2419 | - # -L didn't work. |
2420 | - set X `ls -t "$srcdir/configure" conftest.file` |
2421 | - fi |
2422 | - rm -f conftest.file |
2423 | - if test "$[*]" != "X $srcdir/configure conftest.file" \ |
2424 | - && test "$[*]" != "X conftest.file $srcdir/configure"; then |
2425 | - |
2426 | - # If neither matched, then we have a broken ls. This can happen |
2427 | - # if, for instance, CONFIG_SHELL is bash and it inherits a |
2428 | - # broken ls alias from the environment. This has actually |
2429 | - # happened. Such a system could not be considered "sane". |
2430 | - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
2431 | -alias in your environment]) |
2432 | - fi |
2433 | - |
2434 | + am_has_slept=no |
2435 | + for am_try in 1 2; do |
2436 | + echo "timestamp, slept: $am_has_slept" > conftest.file |
2437 | + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
2438 | + if test "$[*]" = "X"; then |
2439 | + # -L didn't work. |
2440 | + set X `ls -t "$srcdir/configure" conftest.file` |
2441 | + fi |
2442 | + if test "$[*]" != "X $srcdir/configure conftest.file" \ |
2443 | + && test "$[*]" != "X conftest.file $srcdir/configure"; then |
2444 | + |
2445 | + # If neither matched, then we have a broken ls. This can happen |
2446 | + # if, for instance, CONFIG_SHELL is bash and it inherits a |
2447 | + # broken ls alias from the environment. This has actually |
2448 | + # happened. Such a system could not be considered "sane". |
2449 | + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
2450 | + alias in your environment]) |
2451 | + fi |
2452 | + if test "$[2]" = conftest.file || test $am_try -eq 2; then |
2453 | + break |
2454 | + fi |
2455 | + # Just in case. |
2456 | + sleep 1 |
2457 | + am_has_slept=yes |
2458 | + done |
2459 | test "$[2]" = conftest.file |
2460 | ) |
2461 | then |
2462 | @@ -1984,46 +2079,118 @@ |
2463 | AC_MSG_ERROR([newly created file is older than distributed files! |
2464 | Check your system clock]) |
2465 | fi |
2466 | -AC_MSG_RESULT(yes)]) |
2467 | - |
2468 | -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
2469 | -# |
2470 | -# This file is free software; the Free Software Foundation |
2471 | -# gives unlimited permission to copy and/or distribute it, |
2472 | -# with or without modifications, as long as this notice is preserved. |
2473 | - |
2474 | -# serial 1 |
2475 | +AC_MSG_RESULT([yes]) |
2476 | +# If we didn't sleep, we still need to ensure time stamps of config.status and |
2477 | +# generated files are strictly newer. |
2478 | +am_sleep_pid= |
2479 | +if grep 'slept: no' conftest.file >/dev/null 2>&1; then |
2480 | + ( sleep 1 ) & |
2481 | + am_sleep_pid=$! |
2482 | +fi |
2483 | +AC_CONFIG_COMMANDS_PRE( |
2484 | + [AC_MSG_CHECKING([that generated files are newer than configure]) |
2485 | + if test -n "$am_sleep_pid"; then |
2486 | + # Hide warnings about reused PIDs. |
2487 | + wait $am_sleep_pid 2>/dev/null |
2488 | + fi |
2489 | + AC_MSG_RESULT([done])]) |
2490 | +rm -f conftest.file |
2491 | +]) |
2492 | + |
2493 | +# Copyright (C) 2009-2013 Free Software Foundation, Inc. |
2494 | +# |
2495 | +# This file is free software; the Free Software Foundation |
2496 | +# gives unlimited permission to copy and/or distribute it, |
2497 | +# with or without modifications, as long as this notice is preserved. |
2498 | + |
2499 | +# AM_SILENT_RULES([DEFAULT]) |
2500 | +# -------------------------- |
2501 | +# Enable less verbose build rules; with the default set to DEFAULT |
2502 | +# ("yes" being less verbose, "no" or empty being verbose). |
2503 | +AC_DEFUN([AM_SILENT_RULES], |
2504 | +[AC_ARG_ENABLE([silent-rules], [dnl |
2505 | +AS_HELP_STRING( |
2506 | + [--enable-silent-rules], |
2507 | + [less verbose build output (undo: "make V=1")]) |
2508 | +AS_HELP_STRING( |
2509 | + [--disable-silent-rules], |
2510 | + [verbose build output (undo: "make V=0")])dnl |
2511 | +]) |
2512 | +case $enable_silent_rules in @%:@ ((( |
2513 | + yes) AM_DEFAULT_VERBOSITY=0;; |
2514 | + no) AM_DEFAULT_VERBOSITY=1;; |
2515 | + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
2516 | +esac |
2517 | +dnl |
2518 | +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) |
2519 | +dnl do not support nested variable expansions. |
2520 | +dnl See automake bug#9928 and bug#10237. |
2521 | +am_make=${MAKE-make} |
2522 | +AC_CACHE_CHECK([whether $am_make supports nested variables], |
2523 | + [am_cv_make_support_nested_variables], |
2524 | + [if AS_ECHO([['TRUE=$(BAR$(V)) |
2525 | +BAR0=false |
2526 | +BAR1=true |
2527 | +V=1 |
2528 | +am__doit: |
2529 | + @$(TRUE) |
2530 | +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then |
2531 | + am_cv_make_support_nested_variables=yes |
2532 | +else |
2533 | + am_cv_make_support_nested_variables=no |
2534 | +fi]) |
2535 | +if test $am_cv_make_support_nested_variables = yes; then |
2536 | + dnl Using '$V' instead of '$(V)' breaks IRIX make. |
2537 | + AM_V='$(V)' |
2538 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
2539 | +else |
2540 | + AM_V=$AM_DEFAULT_VERBOSITY |
2541 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
2542 | +fi |
2543 | +AC_SUBST([AM_V])dnl |
2544 | +AM_SUBST_NOTMAKE([AM_V])dnl |
2545 | +AC_SUBST([AM_DEFAULT_V])dnl |
2546 | +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl |
2547 | +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl |
2548 | +AM_BACKSLASH='\' |
2549 | +AC_SUBST([AM_BACKSLASH])dnl |
2550 | +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
2551 | +]) |
2552 | + |
2553 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
2554 | +# |
2555 | +# This file is free software; the Free Software Foundation |
2556 | +# gives unlimited permission to copy and/or distribute it, |
2557 | +# with or without modifications, as long as this notice is preserved. |
2558 | |
2559 | # AM_PROG_INSTALL_STRIP |
2560 | # --------------------- |
2561 | -# One issue with vendor `install' (even GNU) is that you can't |
2562 | +# One issue with vendor 'install' (even GNU) is that you can't |
2563 | # specify the program used to strip binaries. This is especially |
2564 | # annoying in cross-compiling environments, where the build's strip |
2565 | # is unlikely to handle the host's binaries. |
2566 | # Fortunately install-sh will honor a STRIPPROG variable, so we |
2567 | -# always use install-sh in `make install-strip', and initialize |
2568 | +# always use install-sh in "make install-strip", and initialize |
2569 | # STRIPPROG with the value of the STRIP variable (set by the user). |
2570 | AC_DEFUN([AM_PROG_INSTALL_STRIP], |
2571 | [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
2572 | -# Installed binaries are usually stripped using `strip' when the user |
2573 | -# run `make install-strip'. However `strip' might not be the right |
2574 | +# Installed binaries are usually stripped using 'strip' when the user |
2575 | +# run "make install-strip". However 'strip' might not be the right |
2576 | # tool to use in cross-compilation environments, therefore Automake |
2577 | -# will honor the `STRIP' environment variable to overrule this program. |
2578 | -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. |
2579 | +# will honor the 'STRIP' environment variable to overrule this program. |
2580 | +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. |
2581 | if test "$cross_compiling" != no; then |
2582 | AC_CHECK_TOOL([STRIP], [strip], :) |
2583 | fi |
2584 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
2585 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
2586 | |
2587 | -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
2588 | +# Copyright (C) 2006-2013 Free Software Foundation, Inc. |
2589 | # |
2590 | # This file is free software; the Free Software Foundation |
2591 | # gives unlimited permission to copy and/or distribute it, |
2592 | # with or without modifications, as long as this notice is preserved. |
2593 | |
2594 | -# serial 3 |
2595 | - |
2596 | # _AM_SUBST_NOTMAKE(VARIABLE) |
2597 | # --------------------------- |
2598 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
2599 | @@ -2037,18 +2204,16 @@ |
2600 | |
2601 | # Check how to create a tarball. -*- Autoconf -*- |
2602 | |
2603 | -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
2604 | +# Copyright (C) 2004-2013 Free Software Foundation, Inc. |
2605 | # |
2606 | # This file is free software; the Free Software Foundation |
2607 | # gives unlimited permission to copy and/or distribute it, |
2608 | # with or without modifications, as long as this notice is preserved. |
2609 | |
2610 | -# serial 2 |
2611 | - |
2612 | # _AM_PROG_TAR(FORMAT) |
2613 | # -------------------- |
2614 | # Check how to create a tarball in format FORMAT. |
2615 | -# FORMAT should be one of `v7', `ustar', or `pax'. |
2616 | +# FORMAT should be one of 'v7', 'ustar', or 'pax'. |
2617 | # |
2618 | # Substitute a variable $(am__tar) that is a command |
2619 | # writing to stdout a FORMAT-tarball containing the directory |
2620 | @@ -2058,83 +2223,119 @@ |
2621 | # Substitute a variable $(am__untar) that extract such |
2622 | # a tarball read from stdin. |
2623 | # $(am__untar) < result.tar |
2624 | +# |
2625 | AC_DEFUN([_AM_PROG_TAR], |
2626 | [# Always define AMTAR for backward compatibility. Yes, it's still used |
2627 | # in the wild :-( We should find a proper way to deprecate it ... |
2628 | AC_SUBST([AMTAR], ['$${TAR-tar}']) |
2629 | + |
2630 | +# We'll loop over all known methods to create a tar archive until one works. |
2631 | +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
2632 | + |
2633 | m4_if([$1], [v7], |
2634 | - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
2635 | - [m4_case([$1], [ustar],, [pax],, |
2636 | - [m4_fatal([Unknown tar format])]) |
2637 | -AC_MSG_CHECKING([how to create a $1 tar archive]) |
2638 | -# Loop over all known methods to create a tar archive until one works. |
2639 | -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
2640 | -_am_tools=${am_cv_prog_tar_$1-$_am_tools} |
2641 | -# Do not fold the above two line into one, because Tru64 sh and |
2642 | -# Solaris sh will not grok spaces in the rhs of `-'. |
2643 | -for _am_tool in $_am_tools |
2644 | -do |
2645 | - case $_am_tool in |
2646 | - gnutar) |
2647 | - for _am_tar in tar gnutar gtar; |
2648 | - do |
2649 | - AM_RUN_LOG([$_am_tar --version]) && break |
2650 | - done |
2651 | - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
2652 | - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
2653 | - am__untar="$_am_tar -xf -" |
2654 | - ;; |
2655 | - plaintar) |
2656 | - # Must skip GNU tar: if it does not support --format= it doesn't create |
2657 | - # ustar tarball either. |
2658 | - (tar --version) >/dev/null 2>&1 && continue |
2659 | - am__tar='tar chf - "$$tardir"' |
2660 | - am__tar_='tar chf - "$tardir"' |
2661 | - am__untar='tar xf -' |
2662 | - ;; |
2663 | - pax) |
2664 | - am__tar='pax -L -x $1 -w "$$tardir"' |
2665 | - am__tar_='pax -L -x $1 -w "$tardir"' |
2666 | - am__untar='pax -r' |
2667 | - ;; |
2668 | - cpio) |
2669 | - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
2670 | - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
2671 | - am__untar='cpio -i -H $1 -d' |
2672 | - ;; |
2673 | - none) |
2674 | - am__tar=false |
2675 | - am__tar_=false |
2676 | - am__untar=false |
2677 | - ;; |
2678 | - esac |
2679 | - |
2680 | - # If the value was cached, stop now. We just wanted to have am__tar |
2681 | - # and am__untar set. |
2682 | - test -n "${am_cv_prog_tar_$1}" && break |
2683 | - |
2684 | - # tar/untar a dummy directory, and stop if the command works |
2685 | - rm -rf conftest.dir |
2686 | - mkdir conftest.dir |
2687 | - echo GrepMe > conftest.dir/file |
2688 | - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
2689 | - rm -rf conftest.dir |
2690 | - if test -s conftest.tar; then |
2691 | - AM_RUN_LOG([$am__untar <conftest.tar]) |
2692 | - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
2693 | - fi |
2694 | -done |
2695 | -rm -rf conftest.dir |
2696 | - |
2697 | -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
2698 | -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
2699 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
2700 | + |
2701 | + [m4_case([$1], |
2702 | + [ustar], |
2703 | + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. |
2704 | + # There is notably a 21 bits limit for the UID and the GID. In fact, |
2705 | + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 |
2706 | + # and bug#13588). |
2707 | + am_max_uid=2097151 # 2^21 - 1 |
2708 | + am_max_gid=$am_max_uid |
2709 | + # The $UID and $GID variables are not portable, so we need to resort |
2710 | + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls |
2711 | + # below are definitely unexpected, so allow the users to see them |
2712 | + # (that is, avoid stderr redirection). |
2713 | + am_uid=`id -u || echo unknown` |
2714 | + am_gid=`id -g || echo unknown` |
2715 | + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) |
2716 | + if test $am_uid -le $am_max_uid; then |
2717 | + AC_MSG_RESULT([yes]) |
2718 | + else |
2719 | + AC_MSG_RESULT([no]) |
2720 | + _am_tools=none |
2721 | + fi |
2722 | + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) |
2723 | + if test $am_gid -le $am_max_gid; then |
2724 | + AC_MSG_RESULT([yes]) |
2725 | + else |
2726 | + AC_MSG_RESULT([no]) |
2727 | + _am_tools=none |
2728 | + fi], |
2729 | + |
2730 | + [pax], |
2731 | + [], |
2732 | + |
2733 | + [m4_fatal([Unknown tar format])]) |
2734 | + |
2735 | + AC_MSG_CHECKING([how to create a $1 tar archive]) |
2736 | + |
2737 | + # Go ahead even if we have the value already cached. We do so because we |
2738 | + # need to set the values for the 'am__tar' and 'am__untar' variables. |
2739 | + _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
2740 | + |
2741 | + for _am_tool in $_am_tools; do |
2742 | + case $_am_tool in |
2743 | + gnutar) |
2744 | + for _am_tar in tar gnutar gtar; do |
2745 | + AM_RUN_LOG([$_am_tar --version]) && break |
2746 | + done |
2747 | + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
2748 | + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
2749 | + am__untar="$_am_tar -xf -" |
2750 | + ;; |
2751 | + plaintar) |
2752 | + # Must skip GNU tar: if it does not support --format= it doesn't create |
2753 | + # ustar tarball either. |
2754 | + (tar --version) >/dev/null 2>&1 && continue |
2755 | + am__tar='tar chf - "$$tardir"' |
2756 | + am__tar_='tar chf - "$tardir"' |
2757 | + am__untar='tar xf -' |
2758 | + ;; |
2759 | + pax) |
2760 | + am__tar='pax -L -x $1 -w "$$tardir"' |
2761 | + am__tar_='pax -L -x $1 -w "$tardir"' |
2762 | + am__untar='pax -r' |
2763 | + ;; |
2764 | + cpio) |
2765 | + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
2766 | + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
2767 | + am__untar='cpio -i -H $1 -d' |
2768 | + ;; |
2769 | + none) |
2770 | + am__tar=false |
2771 | + am__tar_=false |
2772 | + am__untar=false |
2773 | + ;; |
2774 | + esac |
2775 | + |
2776 | + # If the value was cached, stop now. We just wanted to have am__tar |
2777 | + # and am__untar set. |
2778 | + test -n "${am_cv_prog_tar_$1}" && break |
2779 | + |
2780 | + # tar/untar a dummy directory, and stop if the command works. |
2781 | + rm -rf conftest.dir |
2782 | + mkdir conftest.dir |
2783 | + echo GrepMe > conftest.dir/file |
2784 | + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
2785 | + rm -rf conftest.dir |
2786 | + if test -s conftest.tar; then |
2787 | + AM_RUN_LOG([$am__untar <conftest.tar]) |
2788 | + AM_RUN_LOG([cat conftest.dir/file]) |
2789 | + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
2790 | + fi |
2791 | + done |
2792 | + rm -rf conftest.dir |
2793 | + |
2794 | + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
2795 | + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
2796 | + |
2797 | AC_SUBST([am__tar]) |
2798 | AC_SUBST([am__untar]) |
2799 | ]) # _AM_PROG_TAR |
2800 | |
2801 | m4_include([m4/curses.m4]) |
2802 | -m4_include([m4/glib.m4]) |
2803 | -m4_include([m4/gtk.m4]) |
2804 | m4_include([m4/iconv.m4]) |
2805 | m4_include([m4/pkg.m4]) |
2806 | m4_include([m4/qt.m4]) |
2807 | |
2808 | === modified file 'assuan/Makefile.am' |
2809 | --- assuan/Makefile.am 2013-12-15 22:01:20 +0000 |
2810 | +++ assuan/Makefile.am 2015-05-26 02:58:11 +0000 |
2811 | @@ -20,7 +20,7 @@ |
2812 | ## Process this file with automake to produce Makefile.in |
2813 | |
2814 | EXTRA_DIST = mkerrors ChangeLog-old |
2815 | -INCLUDES = -I.. -I$(top_srcdir)/include |
2816 | +AM_CPPFLAGS = -I.. -I$(top_srcdir)/include |
2817 | BUILT_SOURCES = assuan-errors.c |
2818 | MOSTLYCLEANFILES = assuan-errors.c |
2819 | |
2820 | |
2821 | === modified file 'assuan/Makefile.in' |
2822 | --- assuan/Makefile.in 2014-01-23 22:10:38 +0000 |
2823 | +++ assuan/Makefile.in 2015-05-26 02:58:11 +0000 |
2824 | @@ -1,9 +1,8 @@ |
2825 | -# Makefile.in generated by automake 1.11.6 from Makefile.am. |
2826 | +# Makefile.in generated by automake 1.14.1 from Makefile.am. |
2827 | # @configure_input@ |
2828 | |
2829 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
2830 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
2831 | -# Foundation, Inc. |
2832 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
2833 | + |
2834 | # This Makefile.in is free software; the Free Software Foundation |
2835 | # gives unlimited permission to copy and/or distribute it, |
2836 | # with or without modifications, as long as this notice is preserved. |
2837 | @@ -35,23 +34,51 @@ |
2838 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA |
2839 | |
2840 | VPATH = @srcdir@ |
2841 | -am__make_dryrun = \ |
2842 | - { \ |
2843 | - am__dry=no; \ |
2844 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
2845 | +am__make_running_with_option = \ |
2846 | + case $${target_option-} in \ |
2847 | + ?) ;; \ |
2848 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
2849 | + "target option '$${target_option-}' specified" >&2; \ |
2850 | + exit 1;; \ |
2851 | + esac; \ |
2852 | + has_opt=no; \ |
2853 | + sane_makeflags=$$MAKEFLAGS; \ |
2854 | + if $(am__is_gnu_make); then \ |
2855 | + sane_makeflags=$$MFLAGS; \ |
2856 | + else \ |
2857 | case $$MAKEFLAGS in \ |
2858 | *\\[\ \ ]*) \ |
2859 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
2860 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
2861 | - *) \ |
2862 | - for am__flg in $$MAKEFLAGS; do \ |
2863 | - case $$am__flg in \ |
2864 | - *=*|--*) ;; \ |
2865 | - *n*) am__dry=yes; break;; \ |
2866 | - esac; \ |
2867 | - done;; \ |
2868 | - esac; \ |
2869 | - test $$am__dry = yes; \ |
2870 | - } |
2871 | + bs=\\; \ |
2872 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
2873 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
2874 | + esac; \ |
2875 | + fi; \ |
2876 | + skip_next=no; \ |
2877 | + strip_trailopt () \ |
2878 | + { \ |
2879 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
2880 | + }; \ |
2881 | + for flg in $$sane_makeflags; do \ |
2882 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
2883 | + case $$flg in \ |
2884 | + *=*|--*) continue;; \ |
2885 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
2886 | + -*I?*) strip_trailopt 'I';; \ |
2887 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
2888 | + -*O?*) strip_trailopt 'O';; \ |
2889 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
2890 | + -*l?*) strip_trailopt 'l';; \ |
2891 | + -[dEDm]) skip_next=yes;; \ |
2892 | + -[JT]) skip_next=yes;; \ |
2893 | + esac; \ |
2894 | + case $$flg in \ |
2895 | + *$$target_option*) has_opt=yes; break;; \ |
2896 | + esac; \ |
2897 | + done; \ |
2898 | + test $$has_opt = yes |
2899 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
2900 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
2901 | pkgdatadir = $(datadir)/@PACKAGE@ |
2902 | pkgincludedir = $(includedir)/@PACKAGE@ |
2903 | pkglibdir = $(libdir)/@PACKAGE@ |
2904 | @@ -71,36 +98,60 @@ |
2905 | build_triplet = @build@ |
2906 | host_triplet = @host@ |
2907 | subdir = assuan |
2908 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
2909 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
2910 | + $(top_srcdir)/build-aux/depcomp |
2911 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2912 | am__aclocal_m4_deps = $(top_srcdir)/m4/curses.m4 \ |
2913 | - $(top_srcdir)/m4/glib.m4 $(top_srcdir)/m4/gtk.m4 \ |
2914 | $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/pkg.m4 \ |
2915 | $(top_srcdir)/m4/qt.m4 $(top_srcdir)/acinclude.m4 \ |
2916 | $(top_srcdir)/configure.ac |
2917 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
2918 | $(ACLOCAL_M4) |
2919 | -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
2920 | +mkinstalldirs = $(install_sh) -d |
2921 | CONFIG_HEADER = $(top_builddir)/config.h |
2922 | CONFIG_CLEAN_FILES = |
2923 | CONFIG_CLEAN_VPATH_FILES = |
2924 | LIBRARIES = $(noinst_LIBRARIES) |
2925 | AR = ar |
2926 | ARFLAGS = cru |
2927 | +AM_V_AR = $(am__v_AR_@AM_V@) |
2928 | +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) |
2929 | +am__v_AR_0 = @echo " AR " $@; |
2930 | +am__v_AR_1 = |
2931 | libassuan_a_AR = $(AR) $(ARFLAGS) |
2932 | libassuan_a_LIBADD = |
2933 | am_libassuan_a_OBJECTS = assuan-util.$(OBJEXT) assuan-errors.$(OBJEXT) \ |
2934 | assuan-buffer.$(OBJEXT) assuan-handler.$(OBJEXT) \ |
2935 | assuan-listen.$(OBJEXT) assuan-pipe-server.$(OBJEXT) |
2936 | libassuan_a_OBJECTS = $(am_libassuan_a_OBJECTS) |
2937 | +AM_V_P = $(am__v_P_@AM_V@) |
2938 | +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
2939 | +am__v_P_0 = false |
2940 | +am__v_P_1 = : |
2941 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
2942 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
2943 | +am__v_GEN_0 = @echo " GEN " $@; |
2944 | +am__v_GEN_1 = |
2945 | +AM_V_at = $(am__v_at_@AM_V@) |
2946 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
2947 | +am__v_at_0 = @ |
2948 | +am__v_at_1 = |
2949 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
2950 | -depcomp = $(SHELL) $(top_srcdir)/depcomp |
2951 | +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp |
2952 | am__depfiles_maybe = depfiles |
2953 | am__mv = mv -f |
2954 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
2955 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
2956 | +AM_V_CC = $(am__v_CC_@AM_V@) |
2957 | +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) |
2958 | +am__v_CC_0 = @echo " CC " $@; |
2959 | +am__v_CC_1 = |
2960 | CCLD = $(CC) |
2961 | LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
2962 | +AM_V_CCLD = $(am__v_CCLD_@AM_V@) |
2963 | +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) |
2964 | +am__v_CCLD_0 = @echo " CCLD " $@; |
2965 | +am__v_CCLD_1 = |
2966 | SOURCES = $(libassuan_a_SOURCES) |
2967 | DIST_SOURCES = $(libassuan_a_SOURCES) |
2968 | am__can_run_installinfo = \ |
2969 | @@ -108,11 +159,29 @@ |
2970 | n|no|NO) false;; \ |
2971 | *) (install-info --version) >/dev/null 2>&1;; \ |
2972 | esac |
2973 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
2974 | +# Read a list of newline-separated strings from the standard input, |
2975 | +# and print each of them once, without duplicates. Input order is |
2976 | +# *not* preserved. |
2977 | +am__uniquify_input = $(AWK) '\ |
2978 | + BEGIN { nonempty = 0; } \ |
2979 | + { items[$$0] = 1; nonempty = 1; } \ |
2980 | + END { if (nonempty) { for (i in items) print i; }; } \ |
2981 | +' |
2982 | +# Make sure the list of sources is unique. This is necessary because, |
2983 | +# e.g., the same source file might be shared among _SOURCES variables |
2984 | +# for different programs/libraries. |
2985 | +am__define_uniq_tagged_files = \ |
2986 | + list='$(am__tagged_files)'; \ |
2987 | + unique=`for i in $$list; do \ |
2988 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2989 | + done | $(am__uniquify_input)` |
2990 | ETAGS = etags |
2991 | CTAGS = ctags |
2992 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
2993 | ACLOCAL = @ACLOCAL@ |
2994 | AMTAR = @AMTAR@ |
2995 | +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
2996 | AUTOCONF = @AUTOCONF@ |
2997 | AUTOHEADER = @AUTOHEADER@ |
2998 | AUTOMAKE = @AUTOMAKE@ |
2999 | @@ -120,10 +189,11 @@ |
3000 | CC = @CC@ |
3001 | CCDEPMODE = @CCDEPMODE@ |
3002 | CFLAGS = @CFLAGS@ |
3003 | +COMMON_CFLAGS = @COMMON_CFLAGS@ |
3004 | +COMMON_LIBS = @COMMON_LIBS@ |
3005 | CPP = @CPP@ |
3006 | CPPFLAGS = @CPPFLAGS@ |
3007 | CXX = @CXX@ |
3008 | -CXXCPP = @CXXCPP@ |
3009 | CXXDEPMODE = @CXXDEPMODE@ |
3010 | CXXFLAGS = @CXXFLAGS@ |
3011 | CYGPATH_W = @CYGPATH_W@ |
3012 | @@ -135,15 +205,9 @@ |
3013 | EGREP = @EGREP@ |
3014 | EXEEXT = @EXEEXT@ |
3015 | GITLOG_TO_CHANGELOG = @GITLOG_TO_CHANGELOG@ |
3016 | -GLIB_CFLAGS = @GLIB_CFLAGS@ |
3017 | -GLIB_CONFIG = @GLIB_CONFIG@ |
3018 | -GLIB_LIBS = @GLIB_LIBS@ |
3019 | GREP = @GREP@ |
3020 | GTK2CFLAGS = @GTK2CFLAGS@ |
3021 | GTK2LIBS = @GTK2LIBS@ |
3022 | -GTK_CFLAGS = @GTK_CFLAGS@ |
3023 | -GTK_CONFIG = @GTK_CONFIG@ |
3024 | -GTK_LIBS = @GTK_LIBS@ |
3025 | INSTALL = @INSTALL@ |
3026 | INSTALL_DATA = @INSTALL_DATA@ |
3027 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
3028 | @@ -155,10 +219,8 @@ |
3029 | LIBICONV = @LIBICONV@ |
3030 | LIBNCURSES = @LIBNCURSES@ |
3031 | LIBOBJS = @LIBOBJS@ |
3032 | -LIBPTHREAD = @LIBPTHREAD@ |
3033 | LIBS = @LIBS@ |
3034 | LIBTERMCAP = @LIBTERMCAP@ |
3035 | -LIB_QPE = @LIB_QPE@ |
3036 | LN_S = @LN_S@ |
3037 | LTLIBICONV = @LTLIBICONV@ |
3038 | LTLIBOBJS = @LTLIBOBJS@ |
3039 | @@ -182,27 +244,13 @@ |
3040 | QT4_CORE_LIBS = @QT4_CORE_LIBS@ |
3041 | QT4_GUI_CFLAGS = @QT4_GUI_CFLAGS@ |
3042 | QT4_GUI_LIBS = @QT4_GUI_LIBS@ |
3043 | -QTE_NORTTI = @QTE_NORTTI@ |
3044 | -QT_CXXFLAGS = @QT_CXXFLAGS@ |
3045 | -QT_INCLUDES = @QT_INCLUDES@ |
3046 | -QT_LDFLAGS = @QT_LDFLAGS@ |
3047 | -QT_LIBS = @QT_LIBS@ |
3048 | -QT_MT_LDFLAGS = @QT_MT_LDFLAGS@ |
3049 | -QT_MT_LIBS = @QT_MT_LIBS@ |
3050 | -QT_RPATH = @QT_RPATH@ |
3051 | RANLIB = @RANLIB@ |
3052 | SETCAP = @SETCAP@ |
3053 | SET_MAKE = @SET_MAKE@ |
3054 | SHELL = @SHELL@ |
3055 | STRIP = @STRIP@ |
3056 | -USE_THREADS = @USE_THREADS@ |
3057 | VERSION = @VERSION@ |
3058 | WINDRES = @WINDRES@ |
3059 | -XMKMF = @XMKMF@ |
3060 | -X_CFLAGS = @X_CFLAGS@ |
3061 | -X_EXTRA_LIBS = @X_EXTRA_LIBS@ |
3062 | -X_LIBS = @X_LIBS@ |
3063 | -X_PRE_LIBS = @X_PRE_LIBS@ |
3064 | abs_builddir = @abs_builddir@ |
3065 | abs_srcdir = @abs_srcdir@ |
3066 | abs_top_builddir = @abs_top_builddir@ |
3067 | @@ -246,8 +294,6 @@ |
3068 | prefix = @prefix@ |
3069 | program_transform_name = @program_transform_name@ |
3070 | psdir = @psdir@ |
3071 | -qt_includes = @qt_includes@ |
3072 | -qt_libraries = @qt_libraries@ |
3073 | sbindir = @sbindir@ |
3074 | sharedstatedir = @sharedstatedir@ |
3075 | srcdir = @srcdir@ |
3076 | @@ -256,9 +302,8 @@ |
3077 | top_build_prefix = @top_build_prefix@ |
3078 | top_builddir = @top_builddir@ |
3079 | top_srcdir = @top_srcdir@ |
3080 | -x_libraries = @x_libraries@ |
3081 | EXTRA_DIST = mkerrors ChangeLog-old |
3082 | -INCLUDES = -I.. -I$(top_srcdir)/include |
3083 | +AM_CPPFLAGS = -I.. -I$(top_srcdir)/include |
3084 | BUILT_SOURCES = assuan-errors.c |
3085 | MOSTLYCLEANFILES = assuan-errors.c |
3086 | noinst_LIBRARIES = libassuan.a |
3087 | @@ -312,10 +357,11 @@ |
3088 | |
3089 | clean-noinstLIBRARIES: |
3090 | -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) |
3091 | + |
3092 | libassuan.a: $(libassuan_a_OBJECTS) $(libassuan_a_DEPENDENCIES) $(EXTRA_libassuan_a_DEPENDENCIES) |
3093 | - -rm -f libassuan.a |
3094 | - $(libassuan_a_AR) libassuan.a $(libassuan_a_OBJECTS) $(libassuan_a_LIBADD) |
3095 | - $(RANLIB) libassuan.a |
3096 | + $(AM_V_at)-rm -f libassuan.a |
3097 | + $(AM_V_AR)$(libassuan_a_AR) libassuan.a $(libassuan_a_OBJECTS) $(libassuan_a_LIBADD) |
3098 | + $(AM_V_at)$(RANLIB) libassuan.a |
3099 | |
3100 | mostlyclean-compile: |
3101 | -rm -f *.$(OBJEXT) |
3102 | @@ -331,39 +377,28 @@ |
3103 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-util.Po@am__quote@ |
3104 | |
3105 | .c.o: |
3106 | -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
3107 | -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
3108 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
3109 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
3110 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
3111 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
3112 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3113 | -@am__fastdepCC_FALSE@ $(COMPILE) -c $< |
3114 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< |
3115 | |
3116 | .c.obj: |
3117 | -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
3118 | -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
3119 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
3120 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
3121 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
3122 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
3123 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3124 | -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` |
3125 | - |
3126 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
3127 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
3128 | - unique=`for i in $$list; do \ |
3129 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
3130 | - done | \ |
3131 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
3132 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
3133 | - mkid -fID $$unique |
3134 | -tags: TAGS |
3135 | - |
3136 | -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
3137 | - $(TAGS_FILES) $(LISP) |
3138 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` |
3139 | + |
3140 | +ID: $(am__tagged_files) |
3141 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
3142 | +tags: tags-am |
3143 | +TAGS: tags |
3144 | + |
3145 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
3146 | set x; \ |
3147 | here=`pwd`; \ |
3148 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
3149 | - unique=`for i in $$list; do \ |
3150 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
3151 | - done | \ |
3152 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
3153 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
3154 | + $(am__define_uniq_tagged_files); \ |
3155 | shift; \ |
3156 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
3157 | test -n "$$unique" || unique=$$empty_fix; \ |
3158 | @@ -375,15 +410,11 @@ |
3159 | $$unique; \ |
3160 | fi; \ |
3161 | fi |
3162 | -ctags: CTAGS |
3163 | -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
3164 | - $(TAGS_FILES) $(LISP) |
3165 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
3166 | - unique=`for i in $$list; do \ |
3167 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
3168 | - done | \ |
3169 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
3170 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
3171 | +ctags: ctags-am |
3172 | + |
3173 | +CTAGS: ctags |
3174 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
3175 | + $(am__define_uniq_tagged_files); \ |
3176 | test -z "$(CTAGS_ARGS)$$unique" \ |
3177 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
3178 | $$unique |
3179 | @@ -392,6 +423,21 @@ |
3180 | here=`$(am__cd) $(top_builddir) && pwd` \ |
3181 | && $(am__cd) $(top_srcdir) \ |
3182 | && gtags -i $(GTAGS_ARGS) "$$here" |
3183 | +cscopelist: cscopelist-am |
3184 | + |
3185 | +cscopelist-am: $(am__tagged_files) |
3186 | + list='$(am__tagged_files)'; \ |
3187 | + case "$(srcdir)" in \ |
3188 | + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
3189 | + *) sdir=$(subdir)/$(srcdir) ;; \ |
3190 | + esac; \ |
3191 | + for i in $$list; do \ |
3192 | + if test -f "$$i"; then \ |
3193 | + echo "$(subdir)/$$i"; \ |
3194 | + else \ |
3195 | + echo "$$sdir/$$i"; \ |
3196 | + fi; \ |
3197 | + done >> $(top_builddir)/cscope.files |
3198 | |
3199 | distclean-tags: |
3200 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
3201 | @@ -535,17 +581,17 @@ |
3202 | |
3203 | .MAKE: all check install install-am install-strip |
3204 | |
3205 | -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ |
3206 | - clean-noinstLIBRARIES ctags distclean distclean-compile \ |
3207 | - distclean-generic distclean-tags distdir dvi dvi-am html \ |
3208 | - html-am info info-am install install-am install-data \ |
3209 | - install-data-am install-dvi install-dvi-am install-exec \ |
3210 | - install-exec-am install-html install-html-am install-info \ |
3211 | - install-info-am install-man install-pdf install-pdf-am \ |
3212 | - install-ps install-ps-am install-strip installcheck \ |
3213 | - installcheck-am installdirs maintainer-clean \ |
3214 | +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ |
3215 | + clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \ |
3216 | + distclean-compile distclean-generic distclean-tags distdir dvi \ |
3217 | + dvi-am html html-am info info-am install install-am \ |
3218 | + install-data install-data-am install-dvi install-dvi-am \ |
3219 | + install-exec install-exec-am install-html install-html-am \ |
3220 | + install-info install-info-am install-man install-pdf \ |
3221 | + install-pdf-am install-ps install-ps-am install-strip \ |
3222 | + installcheck installcheck-am installdirs maintainer-clean \ |
3223 | maintainer-clean-generic mostlyclean mostlyclean-compile \ |
3224 | - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ |
3225 | + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ |
3226 | uninstall-am |
3227 | |
3228 | |
3229 | |
3230 | === modified file 'assuan/assuan-errors.c' |
3231 | --- assuan/assuan-errors.c 2008-05-06 13:05:08 +0000 |
3232 | +++ assuan/assuan-errors.c 2015-05-26 02:58:11 +0000 |
3233 | @@ -49,6 +49,9 @@ |
3234 | case ASSUAN_Invalid_Option: s="invalid option"; break; |
3235 | case ASSUAN_Locale_Problem: s="locale problem"; break; |
3236 | case ASSUAN_Not_Confirmed: s="not confirmed"; break; |
3237 | + case ASSUAN_Too_Short: s="too short"; break; |
3238 | + case ASSUAN_ENOENT: s="enoent"; break; |
3239 | + case ASSUAN_ENOTTY: s="enotty"; break; |
3240 | default: sprintf (buf, "ec=%d", err ); s=buf; break; |
3241 | } |
3242 | |
3243 | |
3244 | === modified file 'assuan/assuan.h' |
3245 | --- assuan/assuan.h 2008-05-06 13:05:08 +0000 |
3246 | +++ assuan/assuan.h 2015-05-26 02:58:11 +0000 |
3247 | @@ -25,7 +25,7 @@ |
3248 | #include <sys/types.h> |
3249 | |
3250 | #ifdef __cplusplus |
3251 | -extern "C" { |
3252 | +extern "C" { |
3253 | #if 0 |
3254 | } |
3255 | #endif |
3256 | @@ -64,6 +64,9 @@ |
3257 | ASSUAN_Invalid_Option = ASSUAN_ERROR (174), /* GPG_ERR_UNKNOWN_OPTION */ |
3258 | ASSUAN_Locale_Problem = ASSUAN_ERROR (166), |
3259 | ASSUAN_Not_Confirmed = ASSUAN_ERROR (114), |
3260 | + ASSUAN_Too_Short = ASSUAN_ERROR (66), |
3261 | + ASSUAN_ENOENT = ASSUAN_ERROR (81 | (1 << 15)), |
3262 | + ASSUAN_ENOTTY = ASSUAN_ERROR (102 | (1 << 15)), |
3263 | |
3264 | } assuan_error_t; |
3265 | |
3266 | @@ -91,7 +94,7 @@ |
3267 | #define ASSUAN_LINELENGTH 1002 /* 1000 + [CR,]LF */ |
3268 | |
3269 | struct assuan_context_s; |
3270 | -typedef struct assuan_context_s *assuan_context_t; |
3271 | +typedef struct assuan_context_s *assuan_context_t; |
3272 | typedef struct assuan_context_s *ASSUAN_CONTEXT; /* Deprecated. */ |
3273 | |
3274 | /*-- assuan-handler.c --*/ |
3275 | @@ -153,7 +156,7 @@ |
3276 | pid_t assuan_get_pid (ASSUAN_CONTEXT ctx); |
3277 | |
3278 | /*-- assuan-client.c --*/ |
3279 | -AssuanError |
3280 | +AssuanError |
3281 | assuan_transact (ASSUAN_CONTEXT ctx, |
3282 | const char *command, |
3283 | AssuanError (*data_cb)(void *, const void *, size_t), |
3284 | |
3285 | === added file 'autogen.rc' |
3286 | --- autogen.rc 1970-01-01 00:00:00 +0000 |
3287 | +++ autogen.rc 2015-05-26 02:58:11 +0000 |
3288 | @@ -0,0 +1,25 @@ |
3289 | +# autogen.sh configuration for Pinentry -*- sh -*- |
3290 | + |
3291 | +#version_parts=3 |
3292 | + |
3293 | +case "$myhost:$myhostsub" in |
3294 | + w32:ce) |
3295 | + extraoptions="--disable-pinentry-gtk2 --disable-pinentry-qt4" |
3296 | + ;; |
3297 | + w32:) |
3298 | + extraoptions="" |
3299 | + ;; |
3300 | +esac |
3301 | + |
3302 | +case "$myhost" in |
3303 | + w32) |
3304 | + configure_opts=" |
3305 | + --with-libiconv-prefix=@SYSROOT@ |
3306 | + PKG_CONFIG_LIBDIR=@SYSROOT@/lib/pkgconfig |
3307 | + " |
3308 | + ;; |
3309 | +esac |
3310 | + |
3311 | +extra_aclocal_flags= |
3312 | + |
3313 | +final_info="./configure --enable-maintainer-mode && make" |
3314 | |
3315 | === modified file 'autogen.sh' |
3316 | --- autogen.sh 2013-12-15 22:01:20 +0000 |
3317 | +++ autogen.sh 2015-05-26 02:58:11 +0000 |
3318 | @@ -1,7 +1,6 @@ |
3319 | #! /bin/sh |
3320 | -# Run this to generate all the initial makefiles, etc. |
3321 | -# |
3322 | -# Copyright (C) 2003 g10 Code GmbH |
3323 | +# autogen.sh |
3324 | +# Copyright (C) 2003, 2014 g10 Code GmbH |
3325 | # |
3326 | # This file is free software; as a special exception the author gives |
3327 | # unlimited permission to copy and/or distribute it, with or without |
3328 | @@ -10,6 +9,13 @@ |
3329 | # This program is distributed in the hope that it will be useful, but |
3330 | # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the |
3331 | # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
3332 | +# |
3333 | +# This is a generic script to create the configure script and handle cross |
3334 | +# build environments. It requires the presence of a autogen.rc file to |
3335 | +# configure it for the respective package. It is maintained as part of |
3336 | +# GnuPG and source copied by other packages. |
3337 | +# |
3338 | +# Version: 2014-06-06 |
3339 | |
3340 | configure_ac="configure.ac" |
3341 | |
3342 | @@ -28,6 +34,29 @@ |
3343 | return 1 |
3344 | } |
3345 | |
3346 | +fatal () { |
3347 | + echo "autogen.sh:" "$*" >&2 |
3348 | + DIE=yes |
3349 | +} |
3350 | + |
3351 | +info () { |
3352 | + if [ -z "${SILENT}" ]; then |
3353 | + echo "autogen.sh:" "$*" >&2 |
3354 | + fi |
3355 | +} |
3356 | + |
3357 | +die_p () { |
3358 | + if [ "$DIE" = "yes" ]; then |
3359 | + echo "autogen.sh: Stop." >&2 |
3360 | + exit 1 |
3361 | + fi |
3362 | +} |
3363 | + |
3364 | +replace_sysroot () { |
3365 | + configure_opts=$(echo $configure_opts | sed "s#@SYSROOT@#${w32root}#g") |
3366 | + extraoptions=$(echo $extraoptions | sed "s#@SYSROOT@#${w32root}#g") |
3367 | +} |
3368 | + |
3369 | # Allow to override the default tool names |
3370 | AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX} |
3371 | AUTOHEADER=${AUTOCONF_PREFIX}${AUTOHEADER:-autoheader}${AUTOCONF_SUFFIX} |
3372 | @@ -40,79 +69,215 @@ |
3373 | |
3374 | DIE=no |
3375 | FORCE= |
3376 | +SILENT= |
3377 | +PRINT_HOST=no |
3378 | +PRINT_BUILD=no |
3379 | +tmp=$(dirname "$0") |
3380 | +tsdir=$(cd "${tmp}"; pwd) |
3381 | +version_parts=3 |
3382 | + |
3383 | +if [ -n "${AUTOGEN_SH_SILENT}" ]; then |
3384 | + SILENT=" --silent" |
3385 | +fi |
3386 | +if test x"$1" = x"--help"; then |
3387 | + echo "usage: ./autogen.sh [--silent] [--force] [--build-TYPE] [ARGS]" |
3388 | + exit 0 |
3389 | +fi |
3390 | +if test x"$1" = x"--silent"; then |
3391 | + SILENT=" --silent" |
3392 | + shift |
3393 | +fi |
3394 | if test x"$1" = x"--force"; then |
3395 | FORCE=" --force" |
3396 | shift |
3397 | fi |
3398 | - |
3399 | -# Begin list of optional variables sourced from ~/.gnupg-autogen.rc |
3400 | +if test x"$1" = x"--print-host"; then |
3401 | + PRINT_HOST=yes |
3402 | + shift |
3403 | +fi |
3404 | +if test x"$1" = x"--print-build"; then |
3405 | + PRINT_BUILD=yes |
3406 | + shift |
3407 | +fi |
3408 | + |
3409 | + |
3410 | +# Reject unsafe characters in $HOME, $tsdir and cwd. We consider spaces |
3411 | +# as unsafe because it is too easy to get scripts wrong in this regard. |
3412 | +am_lf=' |
3413 | +' |
3414 | +case `pwd` in |
3415 | + *[\;\\\"\#\$\&\'\`$am_lf\ \ ]*) |
3416 | + fatal "unsafe working directory name" ;; |
3417 | +esac |
3418 | +case $tsdir in |
3419 | + *[\;\\\"\#\$\&\'\`$am_lf\ \ ]*) |
3420 | + fatal "unsafe source directory: \`$tsdir'" ;; |
3421 | +esac |
3422 | +case $HOME in |
3423 | + *[\;\\\"\#\$\&\'\`$am_lf\ \ ]*) |
3424 | + fatal "unsafe home directory: \`$HOME'" ;; |
3425 | +esac |
3426 | +die_p |
3427 | + |
3428 | + |
3429 | +# List of variables sourced from autogen.rc. The strings '@SYSROOT@' in |
3430 | +# these variables are replaced by the actual system root. |
3431 | +configure_opts= |
3432 | +extraoptions= |
3433 | +# List of optional variables sourced from autogen.rc and ~/.gnupg-autogen.rc |
3434 | w32_toolprefixes= |
3435 | w32_extraoptions= |
3436 | w32ce_toolprefixes= |
3437 | w32ce_extraoptions= |
3438 | +w64_toolprefixes= |
3439 | +w64_extraoptions= |
3440 | amd64_toolprefixes= |
3441 | # End list of optional variables sourced from ~/.gnupg-autogen.rc |
3442 | # What follows are variables which are sourced but default to |
3443 | # environment variables or lacking them hardcoded values. |
3444 | #w32root= |
3445 | #w32ce_root= |
3446 | +#w64root= |
3447 | #amd64root= |
3448 | |
3449 | -if [ -f "$HOME/.gnupg-autogen.rc" ]; then |
3450 | - echo "sourcing extra definitions from $HOME/.gnupg-autogen.rc" |
3451 | - . "$HOME/.gnupg-autogen.rc" |
3452 | -fi |
3453 | - |
3454 | # Convenience option to use certain configure options for some hosts. |
3455 | myhost="" |
3456 | myhostsub="" |
3457 | case "$1" in |
3458 | + --find-version) |
3459 | + myhost="find-version" |
3460 | + SILENT=" --silent" |
3461 | + shift |
3462 | + ;; |
3463 | --build-w32) |
3464 | myhost="w32" |
3465 | + shift |
3466 | ;; |
3467 | --build-w32ce) |
3468 | myhost="w32" |
3469 | myhostsub="ce" |
3470 | + shift |
3471 | + ;; |
3472 | + --build-w64) |
3473 | + myhost="w32" |
3474 | + myhostsub="64" |
3475 | + shift |
3476 | + ;; |
3477 | + --build-amd64) |
3478 | + myhost="amd64" |
3479 | + shift |
3480 | ;; |
3481 | --build*) |
3482 | - echo "**Error**: invalid build option $1" >&2 |
3483 | - exit 1 |
3484 | + fatal "**Error**: invalid build option $1" |
3485 | + shift |
3486 | ;; |
3487 | *) |
3488 | - ;; |
3489 | + ;; |
3490 | esac |
3491 | - |
3492 | - |
3493 | - |
3494 | -# ***** W32 build script ******* |
3495 | -# Used to cross-compile for Windows. |
3496 | +die_p |
3497 | + |
3498 | + |
3499 | +# Source our configuration |
3500 | +if [ -f "${tsdir}/autogen.rc" ]; then |
3501 | + . "${tsdir}/autogen.rc" |
3502 | +fi |
3503 | + |
3504 | +# Source optional site specific configuration |
3505 | +if [ -f "$HOME/.gnupg-autogen.rc" ]; then |
3506 | + info "sourcing extra definitions from $HOME/.gnupg-autogen.rc" |
3507 | + . "$HOME/.gnupg-autogen.rc" |
3508 | +fi |
3509 | + |
3510 | + |
3511 | +# **** FIND VERSION **** |
3512 | +# This is a helper for the configure.ac M4 magic |
3513 | +# Called |
3514 | +# ./autogen.sh --find-version PACKAGE MAJOR MINOR [MICRO] |
3515 | +# returns a complete version string with automatic beta numbering. |
3516 | +if [ "$myhost" = "find-version" ]; then |
3517 | + package="$1" |
3518 | + major="$2" |
3519 | + minor="$3" |
3520 | + micro="$4" |
3521 | + |
3522 | + case "$version_parts" in |
3523 | + 2) |
3524 | + matchstr1="$package-$major.[0-9]*" |
3525 | + matchstr2="$package-$major-base" |
3526 | + vers="$major.$minor" |
3527 | + ;; |
3528 | + *) |
3529 | + matchstr1="$package-$major.$minor.[0-9]*" |
3530 | + matchstr2="$package-$major.$minor-base" |
3531 | + vers="$major.$minor.$micro" |
3532 | + ;; |
3533 | + esac |
3534 | + |
3535 | + beta=no |
3536 | + if [ -d .git ]; then |
3537 | + ingit=yes |
3538 | + tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null) |
3539 | + if [ -n "$tmp" ]; then |
3540 | + tmp=$(echo "$tmp"|awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}') |
3541 | + else |
3542 | + tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \ |
3543 | + | awk -F- '$4!=0{print"-beta"$4}') |
3544 | + fi |
3545 | + [ -n "$tmp" ] && beta=yes |
3546 | + rev=$(git rev-parse --short HEAD | tr -d '\n\r') |
3547 | + rvd=$((0x$(echo ${rev} | head -c 4))) |
3548 | + else |
3549 | + ingit=no |
3550 | + beta=no |
3551 | + tmp="" |
3552 | + rev="0000000" |
3553 | + rvd="0" |
3554 | + fi |
3555 | + |
3556 | + echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:" |
3557 | + exit 0 |
3558 | +fi |
3559 | +# **** end FIND VERSION **** |
3560 | + |
3561 | + |
3562 | +if [ ! -f "$tsdir/build-aux/config.guess" ]; then |
3563 | + fatal "$tsdir/build-aux/config.guess not found" |
3564 | + exit 1 |
3565 | +fi |
3566 | +build=`$tsdir/build-aux/config.guess` |
3567 | +if [ $PRINT_BUILD = yes ]; then |
3568 | + echo "$build" |
3569 | + exit 0 |
3570 | +fi |
3571 | + |
3572 | + |
3573 | + |
3574 | +# ****************** |
3575 | +# W32 build script |
3576 | +# ****************** |
3577 | if [ "$myhost" = "w32" ]; then |
3578 | - tmp=`dirname $0` |
3579 | - tsdir=`cd "$tmp"; pwd` |
3580 | - shift |
3581 | - if [ ! -f $tsdir/config.guess ]; then |
3582 | - echo "$tsdir/config.guess not found" >&2 |
3583 | - exit 1 |
3584 | - fi |
3585 | - build=`$tsdir/config.guess` |
3586 | - |
3587 | case $myhostsub in |
3588 | ce) |
3589 | w32root="$w32ce_root" |
3590 | - [ -z "$w32ce_root" ] && w32root="$HOME/w32ce_root" |
3591 | + [ -z "$w32root" ] && w32root="$HOME/w32ce_root" |
3592 | toolprefixes="$w32ce_toolprefixes arm-mingw32ce" |
3593 | - extraoptions="$w32ce_extraoptions --disable-pinentry-gtk2" |
3594 | - extraoptions="$extraoptions --disable-pinentry-qt4" |
3595 | + extraoptions="$extraoptions $w32ce_extraoptions" |
3596 | + ;; |
3597 | + 64) |
3598 | + w32root="$w64root" |
3599 | + [ -z "$w32root" ] && w32root="$HOME/w64root" |
3600 | + toolprefixes="$w64_toolprefixes x86_64-w64-mingw32" |
3601 | + extraoptions="$extraoptions $w64_extraoptions" |
3602 | ;; |
3603 | *) |
3604 | [ -z "$w32root" ] && w32root="$HOME/w32root" |
3605 | toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc" |
3606 | toolprefixes="$toolprefixes i386-mingw32msvc mingw32" |
3607 | - extraoptions="$w32_extraoptions --enable-pinentry-gtk2" |
3608 | + extraoptions="$extraoptions $w32_extraoptions" |
3609 | ;; |
3610 | esac |
3611 | - echo "Using $w32root as standard install directory" >&2 |
3612 | - |
3613 | + info "Using $w32root as standard install directory" |
3614 | + replace_sysroot |
3615 | |
3616 | # Locate the cross compiler |
3617 | crossbindir= |
3618 | @@ -124,36 +289,77 @@ |
3619 | fi |
3620 | done |
3621 | if [ -z "$crossbindir" ]; then |
3622 | + fatal "cross compiler kit not installed" |
3623 | + if [ -z "$myhostsub" ]; then |
3624 | + info "Under Debian GNU/Linux, you may install it using" |
3625 | + info " apt-get install mingw32 mingw32-runtime mingw32-binutils" |
3626 | + fi |
3627 | + die_p |
3628 | + fi |
3629 | + if [ $PRINT_HOST = yes ]; then |
3630 | + echo "$host" |
3631 | + exit 0 |
3632 | + fi |
3633 | + |
3634 | + if [ -f "$tsdir/config.log" ]; then |
3635 | + if ! head $tsdir/config.log | grep "$host" >/dev/null; then |
3636 | + fatal "Please run a 'make distclean' first" |
3637 | + die_p |
3638 | + fi |
3639 | + fi |
3640 | + |
3641 | + $tsdir/configure --enable-maintainer-mode ${SILENT} \ |
3642 | + --prefix=${w32root} \ |
3643 | + --host=${host} --build=${build} SYSROOT=${w32root} \ |
3644 | + ${configure_opts} ${extraoptions} "$@" |
3645 | + rc=$? |
3646 | + exit $rc |
3647 | +fi |
3648 | +# ***** end W32 build script ******* |
3649 | + |
3650 | +# ***** AMD64 cross build script ******* |
3651 | +# Used to cross-compile for AMD64 (for testing) |
3652 | +if [ "$myhost" = "amd64" ]; then |
3653 | + [ -z "$amd64root" ] && amd64root="$HOME/amd64root" |
3654 | + info "Using $amd64root as standard install directory" |
3655 | + replace_sysroot |
3656 | + |
3657 | + toolprefixes="$amd64_toolprefixes x86_64-linux-gnu amd64-linux-gnu" |
3658 | + |
3659 | + # Locate the cross compiler |
3660 | + crossbindir= |
3661 | + for host in $toolprefixes ; do |
3662 | + if ${host}-gcc --version >/dev/null 2>&1 ; then |
3663 | + crossbindir=/usr/${host}/bin |
3664 | + conf_CC="CC=${host}-gcc" |
3665 | + break; |
3666 | + fi |
3667 | + done |
3668 | + if [ -z "$crossbindir" ]; then |
3669 | echo "Cross compiler kit not installed" >&2 |
3670 | - if [ -z "$sub" ]; then |
3671 | - echo "Under Debian GNU/Linux, you may install it using" >&2 |
3672 | - echo " apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2 |
3673 | - fi |
3674 | echo "Stop." >&2 |
3675 | exit 1 |
3676 | fi |
3677 | + if [ $PRINT_HOST = yes ]; then |
3678 | + echo "$host" |
3679 | + exit 0 |
3680 | + fi |
3681 | |
3682 | if [ -f "$tsdir/config.log" ]; then |
3683 | if ! head $tsdir/config.log | grep "$host" >/dev/null; then |
3684 | - echo "Pease run a 'make distclean' first" >&2 |
3685 | + echo "Please run a 'make distclean' first" >&2 |
3686 | exit 1 |
3687 | fi |
3688 | fi |
3689 | |
3690 | - $tsdir/configure --enable-maintainer-mode --prefix=${w32root} \ |
3691 | - --host=${host} --build=${build} \ |
3692 | - --disable-pinentry-gtk \ |
3693 | - --disable-pinentry-qt \ |
3694 | - --with-libiconv-prefix=${w32root} \ |
3695 | - PKG_CONFIG_LIBDIR="$w32root/lib/pkgconfig" \ |
3696 | - ${extraoptions} "$@" |
3697 | - |
3698 | + $tsdir/configure --enable-maintainer-mode ${SILENT} \ |
3699 | + --prefix=${amd64root} \ |
3700 | + --host=${host} --build=${build} \ |
3701 | + ${configure_opts} ${extraoptions} "$@" |
3702 | rc=$? |
3703 | exit $rc |
3704 | fi |
3705 | -# ***** end W32 build script ******* |
3706 | - |
3707 | - |
3708 | +# ***** end AMD64 cross build script ******* |
3709 | |
3710 | |
3711 | # Grep the required versions from configure.ac |
3712 | @@ -169,48 +375,94 @@ |
3713 | }' ${configure_ac}` |
3714 | automake_vers_num=`echo "$automake_vers" | cvtver` |
3715 | |
3716 | -#gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ { |
3717 | -#s/^.*(\(.*\))/\1/p |
3718 | -#q |
3719 | -#}' ${configure_ac}` |
3720 | -#gettext_vers_num=`echo "$gettext_vers" | cvtver` |
3721 | - |
3722 | - |
3723 | -if [ -z "$autoconf_vers" -o -z "$automake_vers" ] |
3724 | +if [ -d "${tsdir}/po" ]; then |
3725 | + gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ { |
3726 | +s/^.*\[\(.*\)])/\1/p |
3727 | +q |
3728 | +}' ${configure_ac}` |
3729 | + gettext_vers_num=`echo "$gettext_vers" | cvtver` |
3730 | +else |
3731 | + gettext_vers="n/a" |
3732 | +fi |
3733 | + |
3734 | +if [ -z "$autoconf_vers" -o -z "$automake_vers" -o -z "$gettext_vers" ] |
3735 | then |
3736 | echo "**Error**: version information not found in "\`${configure_ac}\'"." >&2 |
3737 | exit 1 |
3738 | fi |
3739 | |
3740 | + |
3741 | if check_version $AUTOCONF $autoconf_vers_num $autoconf_vers ; then |
3742 | check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf |
3743 | fi |
3744 | if check_version $AUTOMAKE $automake_vers_num $automake_vers; then |
3745 | check_version $ACLOCAL $automake_vers_num $autoconf_vers automake |
3746 | fi |
3747 | -#if check_version $GETTEXT $gettext_vers_num $gettext_vers; then |
3748 | -# check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext |
3749 | -#fi |
3750 | +if [ "$gettext_vers" != "n/a" ]; then |
3751 | + if check_version $GETTEXT $gettext_vers_num $gettext_vers; then |
3752 | + check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext |
3753 | + fi |
3754 | +fi |
3755 | |
3756 | -if test "$DIE" = "yes"; then |
3757 | +if [ "$DIE" = "yes" ]; then |
3758 | cat <<EOF |
3759 | |
3760 | Note that you may use alternative versions of the tools by setting |
3761 | -the corresponding environment variables; see README.SVN for details. |
3762 | - |
3763 | -EOF |
3764 | - exit 1 |
3765 | -fi |
3766 | - |
3767 | -echo "Running aclocal -I m4 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..." |
3768 | -$ACLOCAL -I m4 $ACLOCAL_FLAGS |
3769 | -echo "Running autoheader..." |
3770 | +the corresponding environment variables; see README.GIT for details. |
3771 | + |
3772 | +EOF |
3773 | + die_p |
3774 | +fi |
3775 | + |
3776 | +# Check the git setup. |
3777 | +if [ -d .git ]; then |
3778 | + CP="cp -a" |
3779 | + [ -z "${SILENT}" ] && CP="$CP -v" |
3780 | + if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then |
3781 | + [ -z "${SILENT}" ] && cat <<EOF |
3782 | +*** Activating trailing whitespace git pre-commit hook. *** |
3783 | + For more information see this thread: |
3784 | + http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084html |
3785 | + To deactivate this pre-commit hook again move .git/hooks/pre-commit |
3786 | + and .git/hooks/pre-commit.sample out of the way. |
3787 | +EOF |
3788 | + $CP .git/hooks/pre-commit.sample .git/hooks/pre-commit |
3789 | + chmod +x .git/hooks/pre-commit |
3790 | + fi |
3791 | + |
3792 | + if [ "$gettext_vers" != "n/a" ]; then |
3793 | + tmp=$(git config --get filter.cleanpo.clean) |
3794 | + if [ "$tmp" != \ |
3795 | + "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ] |
3796 | + then |
3797 | + info "*** Adding GIT filter.cleanpo.clean configuration." |
3798 | + git config --add filter.cleanpo.clean \ |
3799 | + "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" |
3800 | + fi |
3801 | + fi |
3802 | + if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then |
3803 | + [ -z "${SILENT}" ] && cat <<EOF |
3804 | +*** Activating commit log message check hook. *** |
3805 | +EOF |
3806 | + $CP build-aux/git-hooks/commit-msg .git/hooks/commit-msg |
3807 | + chmod +x .git/hooks/commit-msg |
3808 | + fi |
3809 | +fi |
3810 | + |
3811 | +aclocal_flags="-I m4" |
3812 | +if [ -n "${extra_aclocal_flags}" ]; then |
3813 | + aclocal_flags="${aclocal_flags} ${extra_aclocal_flags}" |
3814 | +fi |
3815 | +if [ -n "${ACLOCAL_FLAGS}" ]; then |
3816 | + aclocal_flags="${aclocal_flags} ${ACLOCAL_FLAGS}" |
3817 | +fi |
3818 | +info "Running $ACLOCAL ${aclocal_flags} ..." |
3819 | +$ACLOCAL ${aclocal_flags} |
3820 | +info "Running autoheader..." |
3821 | $AUTOHEADER |
3822 | -echo "Running automake --gnu ..." |
3823 | -$AUTOMAKE --gnu |
3824 | -echo "Running autoconf${FORCE}..." |
3825 | +info "Running automake --gnu ..." |
3826 | +$AUTOMAKE --gnu; |
3827 | +info "Running autoconf${FORCE} ..." |
3828 | $AUTOCONF${FORCE} |
3829 | |
3830 | -echo "You may now run: |
3831 | - ./configure --enable-maintainer-mode && make |
3832 | -" |
3833 | +info "You may now run:${am_lf} ${final_info}" |
3834 | |
3835 | === added file 'build-aux/compile' |
3836 | --- build-aux/compile 1970-01-01 00:00:00 +0000 |
3837 | +++ build-aux/compile 2015-05-26 02:58:11 +0000 |
3838 | @@ -0,0 +1,347 @@ |
3839 | +#! /bin/sh |
3840 | +# Wrapper for compilers which do not understand '-c -o'. |
3841 | + |
3842 | +scriptversion=2012-10-14.11; # UTC |
3843 | + |
3844 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
3845 | +# Written by Tom Tromey <tromey@cygnus.com>. |
3846 | +# |
3847 | +# This program is free software; you can redistribute it and/or modify |
3848 | +# it under the terms of the GNU General Public License as published by |
3849 | +# the Free Software Foundation; either version 2, or (at your option) |
3850 | +# any later version. |
3851 | +# |
3852 | +# This program is distributed in the hope that it will be useful, |
3853 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
3854 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3855 | +# GNU General Public License for more details. |
3856 | +# |
3857 | +# You should have received a copy of the GNU General Public License |
3858 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
3859 | + |
3860 | +# As a special exception to the GNU General Public License, if you |
3861 | +# distribute this file as part of a program that contains a |
3862 | +# configuration script generated by Autoconf, you may include it under |
3863 | +# the same distribution terms that you use for the rest of that program. |
3864 | + |
3865 | +# This file is maintained in Automake, please report |
3866 | +# bugs to <bug-automake@gnu.org> or send patches to |
3867 | +# <automake-patches@gnu.org>. |
3868 | + |
3869 | +nl=' |
3870 | +' |
3871 | + |
3872 | +# We need space, tab and new line, in precisely that order. Quoting is |
3873 | +# there to prevent tools from complaining about whitespace usage. |
3874 | +IFS=" "" $nl" |
3875 | + |
3876 | +file_conv= |
3877 | + |
3878 | +# func_file_conv build_file lazy |
3879 | +# Convert a $build file to $host form and store it in $file |
3880 | +# Currently only supports Windows hosts. If the determined conversion |
3881 | +# type is listed in (the comma separated) LAZY, no conversion will |
3882 | +# take place. |
3883 | +func_file_conv () |
3884 | +{ |
3885 | + file=$1 |
3886 | + case $file in |
3887 | + / | /[!/]*) # absolute file, and not a UNC file |
3888 | + if test -z "$file_conv"; then |
3889 | + # lazily determine how to convert abs files |
3890 | + case `uname -s` in |
3891 | + MINGW*) |
3892 | + file_conv=mingw |
3893 | + ;; |
3894 | + CYGWIN*) |
3895 | + file_conv=cygwin |
3896 | + ;; |
3897 | + *) |
3898 | + file_conv=wine |
3899 | + ;; |
3900 | + esac |
3901 | + fi |
3902 | + case $file_conv/,$2, in |
3903 | + *,$file_conv,*) |
3904 | + ;; |
3905 | + mingw/*) |
3906 | + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` |
3907 | + ;; |
3908 | + cygwin/*) |
3909 | + file=`cygpath -m "$file" || echo "$file"` |
3910 | + ;; |
3911 | + wine/*) |
3912 | + file=`winepath -w "$file" || echo "$file"` |
3913 | + ;; |
3914 | + esac |
3915 | + ;; |
3916 | + esac |
3917 | +} |
3918 | + |
3919 | +# func_cl_dashL linkdir |
3920 | +# Make cl look for libraries in LINKDIR |
3921 | +func_cl_dashL () |
3922 | +{ |
3923 | + func_file_conv "$1" |
3924 | + if test -z "$lib_path"; then |
3925 | + lib_path=$file |
3926 | + else |
3927 | + lib_path="$lib_path;$file" |
3928 | + fi |
3929 | + linker_opts="$linker_opts -LIBPATH:$file" |
3930 | +} |
3931 | + |
3932 | +# func_cl_dashl library |
3933 | +# Do a library search-path lookup for cl |
3934 | +func_cl_dashl () |
3935 | +{ |
3936 | + lib=$1 |
3937 | + found=no |
3938 | + save_IFS=$IFS |
3939 | + IFS=';' |
3940 | + for dir in $lib_path $LIB |
3941 | + do |
3942 | + IFS=$save_IFS |
3943 | + if $shared && test -f "$dir/$lib.dll.lib"; then |
3944 | + found=yes |
3945 | + lib=$dir/$lib.dll.lib |
3946 | + break |
3947 | + fi |
3948 | + if test -f "$dir/$lib.lib"; then |
3949 | + found=yes |
3950 | + lib=$dir/$lib.lib |
3951 | + break |
3952 | + fi |
3953 | + if test -f "$dir/lib$lib.a"; then |
3954 | + found=yes |
3955 | + lib=$dir/lib$lib.a |
3956 | + break |
3957 | + fi |
3958 | + done |
3959 | + IFS=$save_IFS |
3960 | + |
3961 | + if test "$found" != yes; then |
3962 | + lib=$lib.lib |
3963 | + fi |
3964 | +} |
3965 | + |
3966 | +# func_cl_wrapper cl arg... |
3967 | +# Adjust compile command to suit cl |
3968 | +func_cl_wrapper () |
3969 | +{ |
3970 | + # Assume a capable shell |
3971 | + lib_path= |
3972 | + shared=: |
3973 | + linker_opts= |
3974 | + for arg |
3975 | + do |
3976 | + if test -n "$eat"; then |
3977 | + eat= |
3978 | + else |
3979 | + case $1 in |
3980 | + -o) |
3981 | + # configure might choose to run compile as 'compile cc -o foo foo.c'. |
3982 | + eat=1 |
3983 | + case $2 in |
3984 | + *.o | *.[oO][bB][jJ]) |
3985 | + func_file_conv "$2" |
3986 | + set x "$@" -Fo"$file" |
3987 | + shift |
3988 | + ;; |
3989 | + *) |
3990 | + func_file_conv "$2" |
3991 | + set x "$@" -Fe"$file" |
3992 | + shift |
3993 | + ;; |
3994 | + esac |
3995 | + ;; |
3996 | + -I) |
3997 | + eat=1 |
3998 | + func_file_conv "$2" mingw |
3999 | + set x "$@" -I"$file" |
4000 | + shift |
4001 | + ;; |
4002 | + -I*) |
4003 | + func_file_conv "${1#-I}" mingw |
4004 | + set x "$@" -I"$file" |
4005 | + shift |
4006 | + ;; |
4007 | + -l) |
4008 | + eat=1 |
4009 | + func_cl_dashl "$2" |
4010 | + set x "$@" "$lib" |
4011 | + shift |
4012 | + ;; |
4013 | + -l*) |
4014 | + func_cl_dashl "${1#-l}" |
4015 | + set x "$@" "$lib" |
4016 | + shift |
4017 | + ;; |
4018 | + -L) |
4019 | + eat=1 |
4020 | + func_cl_dashL "$2" |
4021 | + ;; |
4022 | + -L*) |
4023 | + func_cl_dashL "${1#-L}" |
4024 | + ;; |
4025 | + -static) |
4026 | + shared=false |
4027 | + ;; |
4028 | + -Wl,*) |
4029 | + arg=${1#-Wl,} |
4030 | + save_ifs="$IFS"; IFS=',' |
4031 | + for flag in $arg; do |
4032 | + IFS="$save_ifs" |
4033 | + linker_opts="$linker_opts $flag" |
4034 | + done |
4035 | + IFS="$save_ifs" |
4036 | + ;; |
4037 | + -Xlinker) |
4038 | + eat=1 |
4039 | + linker_opts="$linker_opts $2" |
4040 | + ;; |
4041 | + -*) |
4042 | + set x "$@" "$1" |
4043 | + shift |
4044 | + ;; |
4045 | + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) |
4046 | + func_file_conv "$1" |
4047 | + set x "$@" -Tp"$file" |
4048 | + shift |
4049 | + ;; |
4050 | + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) |
4051 | + func_file_conv "$1" mingw |
4052 | + set x "$@" "$file" |
4053 | + shift |
4054 | + ;; |
4055 | + *) |
4056 | + set x "$@" "$1" |
4057 | + shift |
4058 | + ;; |
4059 | + esac |
4060 | + fi |
4061 | + shift |
4062 | + done |
4063 | + if test -n "$linker_opts"; then |
4064 | + linker_opts="-link$linker_opts" |
4065 | + fi |
4066 | + exec "$@" $linker_opts |
4067 | + exit 1 |
4068 | +} |
4069 | + |
4070 | +eat= |
4071 | + |
4072 | +case $1 in |
4073 | + '') |
4074 | + echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
4075 | + exit 1; |
4076 | + ;; |
4077 | + -h | --h*) |
4078 | + cat <<\EOF |
4079 | +Usage: compile [--help] [--version] PROGRAM [ARGS] |
4080 | + |
4081 | +Wrapper for compilers which do not understand '-c -o'. |
4082 | +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining |
4083 | +arguments, and rename the output as expected. |
4084 | + |
4085 | +If you are trying to build a whole package this is not the |
4086 | +right script to run: please start by reading the file 'INSTALL'. |
4087 | + |
4088 | +Report bugs to <bug-automake@gnu.org>. |
4089 | +EOF |
4090 | + exit $? |
4091 | + ;; |
4092 | + -v | --v*) |
4093 | + echo "compile $scriptversion" |
4094 | + exit $? |
4095 | + ;; |
4096 | + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) |
4097 | + func_cl_wrapper "$@" # Doesn't return... |
4098 | + ;; |
4099 | +esac |
4100 | + |
4101 | +ofile= |
4102 | +cfile= |
4103 | + |
4104 | +for arg |
4105 | +do |
4106 | + if test -n "$eat"; then |
4107 | + eat= |
4108 | + else |
4109 | + case $1 in |
4110 | + -o) |
4111 | + # configure might choose to run compile as 'compile cc -o foo foo.c'. |
4112 | + # So we strip '-o arg' only if arg is an object. |
4113 | + eat=1 |
4114 | + case $2 in |
4115 | + *.o | *.obj) |
4116 | + ofile=$2 |
4117 | + ;; |
4118 | + *) |
4119 | + set x "$@" -o "$2" |
4120 | + shift |
4121 | + ;; |
4122 | + esac |
4123 | + ;; |
4124 | + *.c) |
4125 | + cfile=$1 |
4126 | + set x "$@" "$1" |
4127 | + shift |
4128 | + ;; |
4129 | + *) |
4130 | + set x "$@" "$1" |
4131 | + shift |
4132 | + ;; |
4133 | + esac |
4134 | + fi |
4135 | + shift |
4136 | +done |
4137 | + |
4138 | +if test -z "$ofile" || test -z "$cfile"; then |
4139 | + # If no '-o' option was seen then we might have been invoked from a |
4140 | + # pattern rule where we don't need one. That is ok -- this is a |
4141 | + # normal compilation that the losing compiler can handle. If no |
4142 | + # '.c' file was seen then we are probably linking. That is also |
4143 | + # ok. |
4144 | + exec "$@" |
4145 | +fi |
4146 | + |
4147 | +# Name of file we expect compiler to create. |
4148 | +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` |
4149 | + |
4150 | +# Create the lock directory. |
4151 | +# Note: use '[/\\:.-]' here to ensure that we don't use the same name |
4152 | +# that we are using for the .o file. Also, base the name on the expected |
4153 | +# object file name, since that is what matters with a parallel build. |
4154 | +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d |
4155 | +while true; do |
4156 | + if mkdir "$lockdir" >/dev/null 2>&1; then |
4157 | + break |
4158 | + fi |
4159 | + sleep 1 |
4160 | +done |
4161 | +# FIXME: race condition here if user kills between mkdir and trap. |
4162 | +trap "rmdir '$lockdir'; exit 1" 1 2 15 |
4163 | + |
4164 | +# Run the compile. |
4165 | +"$@" |
4166 | +ret=$? |
4167 | + |
4168 | +if test -f "$cofile"; then |
4169 | + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" |
4170 | +elif test -f "${cofile}bj"; then |
4171 | + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" |
4172 | +fi |
4173 | + |
4174 | +rmdir "$lockdir" |
4175 | +exit $ret |
4176 | + |
4177 | +# Local Variables: |
4178 | +# mode: shell-script |
4179 | +# sh-indentation: 2 |
4180 | +# eval: (add-hook 'write-file-hooks 'time-stamp) |
4181 | +# time-stamp-start: "scriptversion=" |
4182 | +# time-stamp-format: "%:y-%02m-%02d.%02H" |
4183 | +# time-stamp-time-zone: "UTC" |
4184 | +# time-stamp-end: "; # UTC" |
4185 | +# End: |
4186 | |
4187 | === added file 'build-aux/config.guess' |
4188 | --- build-aux/config.guess 1970-01-01 00:00:00 +0000 |
4189 | +++ build-aux/config.guess 2015-05-26 02:58:11 +0000 |
4190 | @@ -0,0 +1,1421 @@ |
4191 | +#! /bin/sh |
4192 | +# Attempt to guess a canonical system name. |
4193 | +# Copyright 1992-2015 Free Software Foundation, Inc. |
4194 | + |
4195 | +timestamp='2015-01-01' |
4196 | + |
4197 | +# This file is free software; you can redistribute it and/or modify it |
4198 | +# under the terms of the GNU General Public License as published by |
4199 | +# the Free Software Foundation; either version 3 of the License, or |
4200 | +# (at your option) any later version. |
4201 | +# |
4202 | +# This program is distributed in the hope that it will be useful, but |
4203 | +# WITHOUT ANY WARRANTY; without even the implied warranty of |
4204 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
4205 | +# General Public License for more details. |
4206 | +# |
4207 | +# You should have received a copy of the GNU General Public License |
4208 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
4209 | +# |
4210 | +# As a special exception to the GNU General Public License, if you |
4211 | +# distribute this file as part of a program that contains a |
4212 | +# configuration script generated by Autoconf, you may include it under |
4213 | +# the same distribution terms that you use for the rest of that |
4214 | +# program. This Exception is an additional permission under section 7 |
4215 | +# of the GNU General Public License, version 3 ("GPLv3"). |
4216 | +# |
4217 | +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. |
4218 | +# |
4219 | +# You can get the latest version of this script from: |
4220 | +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
4221 | +# |
4222 | +# Please send patches to <config-patches@gnu.org>. |
4223 | + |
4224 | + |
4225 | +me=`echo "$0" | sed -e 's,.*/,,'` |
4226 | + |
4227 | +usage="\ |
4228 | +Usage: $0 [OPTION] |
4229 | + |
4230 | +Output the configuration name of the system \`$me' is run on. |
4231 | + |
4232 | +Operation modes: |
4233 | + -h, --help print this help, then exit |
4234 | + -t, --time-stamp print date of last modification, then exit |
4235 | + -v, --version print version number, then exit |
4236 | + |
4237 | +Report bugs and patches to <config-patches@gnu.org>." |
4238 | + |
4239 | +version="\ |
4240 | +GNU config.guess ($timestamp) |
4241 | + |
4242 | +Originally written by Per Bothner. |
4243 | +Copyright 1992-2015 Free Software Foundation, Inc. |
4244 | + |
4245 | +This is free software; see the source for copying conditions. There is NO |
4246 | +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4247 | + |
4248 | +help=" |
4249 | +Try \`$me --help' for more information." |
4250 | + |
4251 | +# Parse command line |
4252 | +while test $# -gt 0 ; do |
4253 | + case $1 in |
4254 | + --time-stamp | --time* | -t ) |
4255 | + echo "$timestamp" ; exit ;; |
4256 | + --version | -v ) |
4257 | + echo "$version" ; exit ;; |
4258 | + --help | --h* | -h ) |
4259 | + echo "$usage"; exit ;; |
4260 | + -- ) # Stop option processing |
4261 | + shift; break ;; |
4262 | + - ) # Use stdin as input. |
4263 | + break ;; |
4264 | + -* ) |
4265 | + echo "$me: invalid option $1$help" >&2 |
4266 | + exit 1 ;; |
4267 | + * ) |
4268 | + break ;; |
4269 | + esac |
4270 | +done |
4271 | + |
4272 | +if test $# != 0; then |
4273 | + echo "$me: too many arguments$help" >&2 |
4274 | + exit 1 |
4275 | +fi |
4276 | + |
4277 | +trap 'exit 1' 1 2 15 |
4278 | + |
4279 | +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a |
4280 | +# compiler to aid in system detection is discouraged as it requires |
4281 | +# temporary files to be created and, as you can see below, it is a |
4282 | +# headache to deal with in a portable fashion. |
4283 | + |
4284 | +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still |
4285 | +# use `HOST_CC' if defined, but it is deprecated. |
4286 | + |
4287 | +# Portable tmp directory creation inspired by the Autoconf team. |
4288 | + |
4289 | +set_cc_for_build=' |
4290 | +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; |
4291 | +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; |
4292 | +: ${TMPDIR=/tmp} ; |
4293 | + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || |
4294 | + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || |
4295 | + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || |
4296 | + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; |
4297 | +dummy=$tmp/dummy ; |
4298 | +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; |
4299 | +case $CC_FOR_BUILD,$HOST_CC,$CC in |
4300 | + ,,) echo "int x;" > $dummy.c ; |
4301 | + for c in cc gcc c89 c99 ; do |
4302 | + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then |
4303 | + CC_FOR_BUILD="$c"; break ; |
4304 | + fi ; |
4305 | + done ; |
4306 | + if test x"$CC_FOR_BUILD" = x ; then |
4307 | + CC_FOR_BUILD=no_compiler_found ; |
4308 | + fi |
4309 | + ;; |
4310 | + ,,*) CC_FOR_BUILD=$CC ;; |
4311 | + ,*,*) CC_FOR_BUILD=$HOST_CC ;; |
4312 | +esac ; set_cc_for_build= ;' |
4313 | + |
4314 | +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. |
4315 | +# (ghazi@noc.rutgers.edu 1994-08-24) |
4316 | +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then |
4317 | + PATH=$PATH:/.attbin ; export PATH |
4318 | +fi |
4319 | + |
4320 | +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown |
4321 | +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown |
4322 | +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
4323 | +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
4324 | + |
4325 | +case "${UNAME_SYSTEM}" in |
4326 | +Linux|GNU|GNU/*) |
4327 | + # If the system lacks a compiler, then just pick glibc. |
4328 | + # We could probably try harder. |
4329 | + LIBC=gnu |
4330 | + |
4331 | + eval $set_cc_for_build |
4332 | + cat <<-EOF > $dummy.c |
4333 | + #include <features.h> |
4334 | + #if defined(__UCLIBC__) |
4335 | + LIBC=uclibc |
4336 | + #elif defined(__dietlibc__) |
4337 | + LIBC=dietlibc |
4338 | + #else |
4339 | + LIBC=gnu |
4340 | + #endif |
4341 | + EOF |
4342 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` |
4343 | + ;; |
4344 | +esac |
4345 | + |
4346 | +# Note: order is significant - the case branches are not exclusive. |
4347 | + |
4348 | +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
4349 | + *:NetBSD:*:*) |
4350 | + # NetBSD (nbsd) targets should (where applicable) match one or |
4351 | + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
4352 | + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
4353 | + # switched to ELF, *-*-netbsd* would select the old |
4354 | + # object file format. This provides both forward |
4355 | + # compatibility and a consistent mechanism for selecting the |
4356 | + # object file format. |
4357 | + # |
4358 | + # Note: NetBSD doesn't particularly care about the vendor |
4359 | + # portion of the name. We always set it to "unknown". |
4360 | + sysctl="sysctl -n hw.machine_arch" |
4361 | + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ |
4362 | + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` |
4363 | + case "${UNAME_MACHINE_ARCH}" in |
4364 | + armeb) machine=armeb-unknown ;; |
4365 | + arm*) machine=arm-unknown ;; |
4366 | + sh3el) machine=shl-unknown ;; |
4367 | + sh3eb) machine=sh-unknown ;; |
4368 | + sh5el) machine=sh5le-unknown ;; |
4369 | + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; |
4370 | + esac |
4371 | + # The Operating System including object format, if it has switched |
4372 | + # to ELF recently, or will in the future. |
4373 | + case "${UNAME_MACHINE_ARCH}" in |
4374 | + arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
4375 | + eval $set_cc_for_build |
4376 | + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
4377 | + | grep -q __ELF__ |
4378 | + then |
4379 | + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). |
4380 | + # Return netbsd for either. FIX? |
4381 | + os=netbsd |
4382 | + else |
4383 | + os=netbsdelf |
4384 | + fi |
4385 | + ;; |
4386 | + *) |
4387 | + os=netbsd |
4388 | + ;; |
4389 | + esac |
4390 | + # The OS release |
4391 | + # Debian GNU/NetBSD machines have a different userland, and |
4392 | + # thus, need a distinct triplet. However, they do not need |
4393 | + # kernel version information, so it can be replaced with a |
4394 | + # suitable tag, in the style of linux-gnu. |
4395 | + case "${UNAME_VERSION}" in |
4396 | + Debian*) |
4397 | + release='-gnu' |
4398 | + ;; |
4399 | + *) |
4400 | + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` |
4401 | + ;; |
4402 | + esac |
4403 | + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
4404 | + # contains redundant information, the shorter form: |
4405 | + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
4406 | + echo "${machine}-${os}${release}" |
4407 | + exit ;; |
4408 | + *:Bitrig:*:*) |
4409 | + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
4410 | + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} |
4411 | + exit ;; |
4412 | + *:OpenBSD:*:*) |
4413 | + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
4414 | + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} |
4415 | + exit ;; |
4416 | + *:ekkoBSD:*:*) |
4417 | + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} |
4418 | + exit ;; |
4419 | + *:SolidBSD:*:*) |
4420 | + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} |
4421 | + exit ;; |
4422 | + macppc:MirBSD:*:*) |
4423 | + echo powerpc-unknown-mirbsd${UNAME_RELEASE} |
4424 | + exit ;; |
4425 | + *:MirBSD:*:*) |
4426 | + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} |
4427 | + exit ;; |
4428 | + alpha:OSF1:*:*) |
4429 | + case $UNAME_RELEASE in |
4430 | + *4.0) |
4431 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
4432 | + ;; |
4433 | + *5.*) |
4434 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
4435 | + ;; |
4436 | + esac |
4437 | + # According to Compaq, /usr/sbin/psrinfo has been available on |
4438 | + # OSF/1 and Tru64 systems produced since 1995. I hope that |
4439 | + # covers most systems running today. This code pipes the CPU |
4440 | + # types through head -n 1, so we only detect the type of CPU 0. |
4441 | + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` |
4442 | + case "$ALPHA_CPU_TYPE" in |
4443 | + "EV4 (21064)") |
4444 | + UNAME_MACHINE="alpha" ;; |
4445 | + "EV4.5 (21064)") |
4446 | + UNAME_MACHINE="alpha" ;; |
4447 | + "LCA4 (21066/21068)") |
4448 | + UNAME_MACHINE="alpha" ;; |
4449 | + "EV5 (21164)") |
4450 | + UNAME_MACHINE="alphaev5" ;; |
4451 | + "EV5.6 (21164A)") |
4452 | + UNAME_MACHINE="alphaev56" ;; |
4453 | + "EV5.6 (21164PC)") |
4454 | + UNAME_MACHINE="alphapca56" ;; |
4455 | + "EV5.7 (21164PC)") |
4456 | + UNAME_MACHINE="alphapca57" ;; |
4457 | + "EV6 (21264)") |
4458 | + UNAME_MACHINE="alphaev6" ;; |
4459 | + "EV6.7 (21264A)") |
4460 | + UNAME_MACHINE="alphaev67" ;; |
4461 | + "EV6.8CB (21264C)") |
4462 | + UNAME_MACHINE="alphaev68" ;; |
4463 | + "EV6.8AL (21264B)") |
4464 | + UNAME_MACHINE="alphaev68" ;; |
4465 | + "EV6.8CX (21264D)") |
4466 | + UNAME_MACHINE="alphaev68" ;; |
4467 | + "EV6.9A (21264/EV69A)") |
4468 | + UNAME_MACHINE="alphaev69" ;; |
4469 | + "EV7 (21364)") |
4470 | + UNAME_MACHINE="alphaev7" ;; |
4471 | + "EV7.9 (21364A)") |
4472 | + UNAME_MACHINE="alphaev79" ;; |
4473 | + esac |
4474 | + # A Pn.n version is a patched version. |
4475 | + # A Vn.n version is a released version. |
4476 | + # A Tn.n version is a released field test version. |
4477 | + # A Xn.n version is an unreleased experimental baselevel. |
4478 | + # 1.2 uses "1.2" for uname -r. |
4479 | + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
4480 | + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
4481 | + exitcode=$? |
4482 | + trap '' 0 |
4483 | + exit $exitcode ;; |
4484 | + Alpha\ *:Windows_NT*:*) |
4485 | + # How do we know it's Interix rather than the generic POSIX subsystem? |
4486 | + # Should we change UNAME_MACHINE based on the output of uname instead |
4487 | + # of the specific Alpha model? |
4488 | + echo alpha-pc-interix |
4489 | + exit ;; |
4490 | + 21064:Windows_NT:50:3) |
4491 | + echo alpha-dec-winnt3.5 |
4492 | + exit ;; |
4493 | + Amiga*:UNIX_System_V:4.0:*) |
4494 | + echo m68k-unknown-sysv4 |
4495 | + exit ;; |
4496 | + *:[Aa]miga[Oo][Ss]:*:*) |
4497 | + echo ${UNAME_MACHINE}-unknown-amigaos |
4498 | + exit ;; |
4499 | + *:[Mm]orph[Oo][Ss]:*:*) |
4500 | + echo ${UNAME_MACHINE}-unknown-morphos |
4501 | + exit ;; |
4502 | + *:OS/390:*:*) |
4503 | + echo i370-ibm-openedition |
4504 | + exit ;; |
4505 | + *:z/VM:*:*) |
4506 | + echo s390-ibm-zvmoe |
4507 | + exit ;; |
4508 | + *:OS400:*:*) |
4509 | + echo powerpc-ibm-os400 |
4510 | + exit ;; |
4511 | + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
4512 | + echo arm-acorn-riscix${UNAME_RELEASE} |
4513 | + exit ;; |
4514 | + arm*:riscos:*:*|arm*:RISCOS:*:*) |
4515 | + echo arm-unknown-riscos |
4516 | + exit ;; |
4517 | + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) |
4518 | + echo hppa1.1-hitachi-hiuxmpp |
4519 | + exit ;; |
4520 | + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) |
4521 | + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. |
4522 | + if test "`(/bin/universe) 2>/dev/null`" = att ; then |
4523 | + echo pyramid-pyramid-sysv3 |
4524 | + else |
4525 | + echo pyramid-pyramid-bsd |
4526 | + fi |
4527 | + exit ;; |
4528 | + NILE*:*:*:dcosx) |
4529 | + echo pyramid-pyramid-svr4 |
4530 | + exit ;; |
4531 | + DRS?6000:unix:4.0:6*) |
4532 | + echo sparc-icl-nx6 |
4533 | + exit ;; |
4534 | + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) |
4535 | + case `/usr/bin/uname -p` in |
4536 | + sparc) echo sparc-icl-nx7; exit ;; |
4537 | + esac ;; |
4538 | + s390x:SunOS:*:*) |
4539 | + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
4540 | + exit ;; |
4541 | + sun4H:SunOS:5.*:*) |
4542 | + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
4543 | + exit ;; |
4544 | + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
4545 | + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
4546 | + exit ;; |
4547 | + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
4548 | + echo i386-pc-auroraux${UNAME_RELEASE} |
4549 | + exit ;; |
4550 | + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
4551 | + eval $set_cc_for_build |
4552 | + SUN_ARCH="i386" |
4553 | + # If there is a compiler, see if it is configured for 64-bit objects. |
4554 | + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. |
4555 | + # This test works for both compilers. |
4556 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
4557 | + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ |
4558 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
4559 | + grep IS_64BIT_ARCH >/dev/null |
4560 | + then |
4561 | + SUN_ARCH="x86_64" |
4562 | + fi |
4563 | + fi |
4564 | + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
4565 | + exit ;; |
4566 | + sun4*:SunOS:6*:*) |
4567 | + # According to config.sub, this is the proper way to canonicalize |
4568 | + # SunOS6. Hard to guess exactly what SunOS6 will be like, but |
4569 | + # it's likely to be more like Solaris than SunOS4. |
4570 | + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
4571 | + exit ;; |
4572 | + sun4*:SunOS:*:*) |
4573 | + case "`/usr/bin/arch -k`" in |
4574 | + Series*|S4*) |
4575 | + UNAME_RELEASE=`uname -v` |
4576 | + ;; |
4577 | + esac |
4578 | + # Japanese Language versions have a version number like `4.1.3-JL'. |
4579 | + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` |
4580 | + exit ;; |
4581 | + sun3*:SunOS:*:*) |
4582 | + echo m68k-sun-sunos${UNAME_RELEASE} |
4583 | + exit ;; |
4584 | + sun*:*:4.2BSD:*) |
4585 | + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` |
4586 | + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 |
4587 | + case "`/bin/arch`" in |
4588 | + sun3) |
4589 | + echo m68k-sun-sunos${UNAME_RELEASE} |
4590 | + ;; |
4591 | + sun4) |
4592 | + echo sparc-sun-sunos${UNAME_RELEASE} |
4593 | + ;; |
4594 | + esac |
4595 | + exit ;; |
4596 | + aushp:SunOS:*:*) |
4597 | + echo sparc-auspex-sunos${UNAME_RELEASE} |
4598 | + exit ;; |
4599 | + # The situation for MiNT is a little confusing. The machine name |
4600 | + # can be virtually everything (everything which is not |
4601 | + # "atarist" or "atariste" at least should have a processor |
4602 | + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" |
4603 | + # to the lowercase version "mint" (or "freemint"). Finally |
4604 | + # the system name "TOS" denotes a system which is actually not |
4605 | + # MiNT. But MiNT is downward compatible to TOS, so this should |
4606 | + # be no problem. |
4607 | + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
4608 | + echo m68k-atari-mint${UNAME_RELEASE} |
4609 | + exit ;; |
4610 | + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
4611 | + echo m68k-atari-mint${UNAME_RELEASE} |
4612 | + exit ;; |
4613 | + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
4614 | + echo m68k-atari-mint${UNAME_RELEASE} |
4615 | + exit ;; |
4616 | + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
4617 | + echo m68k-milan-mint${UNAME_RELEASE} |
4618 | + exit ;; |
4619 | + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
4620 | + echo m68k-hades-mint${UNAME_RELEASE} |
4621 | + exit ;; |
4622 | + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
4623 | + echo m68k-unknown-mint${UNAME_RELEASE} |
4624 | + exit ;; |
4625 | + m68k:machten:*:*) |
4626 | + echo m68k-apple-machten${UNAME_RELEASE} |
4627 | + exit ;; |
4628 | + powerpc:machten:*:*) |
4629 | + echo powerpc-apple-machten${UNAME_RELEASE} |
4630 | + exit ;; |
4631 | + RISC*:Mach:*:*) |
4632 | + echo mips-dec-mach_bsd4.3 |
4633 | + exit ;; |
4634 | + RISC*:ULTRIX:*:*) |
4635 | + echo mips-dec-ultrix${UNAME_RELEASE} |
4636 | + exit ;; |
4637 | + VAX*:ULTRIX*:*:*) |
4638 | + echo vax-dec-ultrix${UNAME_RELEASE} |
4639 | + exit ;; |
4640 | + 2020:CLIX:*:* | 2430:CLIX:*:*) |
4641 | + echo clipper-intergraph-clix${UNAME_RELEASE} |
4642 | + exit ;; |
4643 | + mips:*:*:UMIPS | mips:*:*:RISCos) |
4644 | + eval $set_cc_for_build |
4645 | + sed 's/^ //' << EOF >$dummy.c |
4646 | +#ifdef __cplusplus |
4647 | +#include <stdio.h> /* for printf() prototype */ |
4648 | + int main (int argc, char *argv[]) { |
4649 | +#else |
4650 | + int main (argc, argv) int argc; char *argv[]; { |
4651 | +#endif |
4652 | + #if defined (host_mips) && defined (MIPSEB) |
4653 | + #if defined (SYSTYPE_SYSV) |
4654 | + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); |
4655 | + #endif |
4656 | + #if defined (SYSTYPE_SVR4) |
4657 | + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); |
4658 | + #endif |
4659 | + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) |
4660 | + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); |
4661 | + #endif |
4662 | + #endif |
4663 | + exit (-1); |
4664 | + } |
4665 | +EOF |
4666 | + $CC_FOR_BUILD -o $dummy $dummy.c && |
4667 | + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && |
4668 | + SYSTEM_NAME=`$dummy $dummyarg` && |
4669 | + { echo "$SYSTEM_NAME"; exit; } |
4670 | + echo mips-mips-riscos${UNAME_RELEASE} |
4671 | + exit ;; |
4672 | + Motorola:PowerMAX_OS:*:*) |
4673 | + echo powerpc-motorola-powermax |
4674 | + exit ;; |
4675 | + Motorola:*:4.3:PL8-*) |
4676 | + echo powerpc-harris-powermax |
4677 | + exit ;; |
4678 | + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) |
4679 | + echo powerpc-harris-powermax |
4680 | + exit ;; |
4681 | + Night_Hawk:Power_UNIX:*:*) |
4682 | + echo powerpc-harris-powerunix |
4683 | + exit ;; |
4684 | + m88k:CX/UX:7*:*) |
4685 | + echo m88k-harris-cxux7 |
4686 | + exit ;; |
4687 | + m88k:*:4*:R4*) |
4688 | + echo m88k-motorola-sysv4 |
4689 | + exit ;; |
4690 | + m88k:*:3*:R3*) |
4691 | + echo m88k-motorola-sysv3 |
4692 | + exit ;; |
4693 | + AViiON:dgux:*:*) |
4694 | + # DG/UX returns AViiON for all architectures |
4695 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
4696 | + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
4697 | + then |
4698 | + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
4699 | + [ ${TARGET_BINARY_INTERFACE}x = x ] |
4700 | + then |
4701 | + echo m88k-dg-dgux${UNAME_RELEASE} |
4702 | + else |
4703 | + echo m88k-dg-dguxbcs${UNAME_RELEASE} |
4704 | + fi |
4705 | + else |
4706 | + echo i586-dg-dgux${UNAME_RELEASE} |
4707 | + fi |
4708 | + exit ;; |
4709 | + M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
4710 | + echo m88k-dolphin-sysv3 |
4711 | + exit ;; |
4712 | + M88*:*:R3*:*) |
4713 | + # Delta 88k system running SVR3 |
4714 | + echo m88k-motorola-sysv3 |
4715 | + exit ;; |
4716 | + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) |
4717 | + echo m88k-tektronix-sysv3 |
4718 | + exit ;; |
4719 | + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) |
4720 | + echo m68k-tektronix-bsd |
4721 | + exit ;; |
4722 | + *:IRIX*:*:*) |
4723 | + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` |
4724 | + exit ;; |
4725 | + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. |
4726 | + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id |
4727 | + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' |
4728 | + i*86:AIX:*:*) |
4729 | + echo i386-ibm-aix |
4730 | + exit ;; |
4731 | + ia64:AIX:*:*) |
4732 | + if [ -x /usr/bin/oslevel ] ; then |
4733 | + IBM_REV=`/usr/bin/oslevel` |
4734 | + else |
4735 | + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} |
4736 | + fi |
4737 | + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} |
4738 | + exit ;; |
4739 | + *:AIX:2:3) |
4740 | + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then |
4741 | + eval $set_cc_for_build |
4742 | + sed 's/^ //' << EOF >$dummy.c |
4743 | + #include <sys/systemcfg.h> |
4744 | + |
4745 | + main() |
4746 | + { |
4747 | + if (!__power_pc()) |
4748 | + exit(1); |
4749 | + puts("powerpc-ibm-aix3.2.5"); |
4750 | + exit(0); |
4751 | + } |
4752 | +EOF |
4753 | + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` |
4754 | + then |
4755 | + echo "$SYSTEM_NAME" |
4756 | + else |
4757 | + echo rs6000-ibm-aix3.2.5 |
4758 | + fi |
4759 | + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then |
4760 | + echo rs6000-ibm-aix3.2.4 |
4761 | + else |
4762 | + echo rs6000-ibm-aix3.2 |
4763 | + fi |
4764 | + exit ;; |
4765 | + *:AIX:*:[4567]) |
4766 | + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
4767 | + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
4768 | + IBM_ARCH=rs6000 |
4769 | + else |
4770 | + IBM_ARCH=powerpc |
4771 | + fi |
4772 | + if [ -x /usr/bin/lslpp ] ; then |
4773 | + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | |
4774 | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` |
4775 | + else |
4776 | + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} |
4777 | + fi |
4778 | + echo ${IBM_ARCH}-ibm-aix${IBM_REV} |
4779 | + exit ;; |
4780 | + *:AIX:*:*) |
4781 | + echo rs6000-ibm-aix |
4782 | + exit ;; |
4783 | + ibmrt:4.4BSD:*|romp-ibm:BSD:*) |
4784 | + echo romp-ibm-bsd4.4 |
4785 | + exit ;; |
4786 | + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and |
4787 | + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to |
4788 | + exit ;; # report: romp-ibm BSD 4.3 |
4789 | + *:BOSX:*:*) |
4790 | + echo rs6000-bull-bosx |
4791 | + exit ;; |
4792 | + DPX/2?00:B.O.S.:*:*) |
4793 | + echo m68k-bull-sysv3 |
4794 | + exit ;; |
4795 | + 9000/[34]??:4.3bsd:1.*:*) |
4796 | + echo m68k-hp-bsd |
4797 | + exit ;; |
4798 | + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) |
4799 | + echo m68k-hp-bsd4.4 |
4800 | + exit ;; |
4801 | + 9000/[34678]??:HP-UX:*:*) |
4802 | + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` |
4803 | + case "${UNAME_MACHINE}" in |
4804 | + 9000/31? ) HP_ARCH=m68000 ;; |
4805 | + 9000/[34]?? ) HP_ARCH=m68k ;; |
4806 | + 9000/[678][0-9][0-9]) |
4807 | + if [ -x /usr/bin/getconf ]; then |
4808 | + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
4809 | + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
4810 | + case "${sc_cpu_version}" in |
4811 | + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
4812 | + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
4813 | + 532) # CPU_PA_RISC2_0 |
4814 | + case "${sc_kernel_bits}" in |
4815 | + 32) HP_ARCH="hppa2.0n" ;; |
4816 | + 64) HP_ARCH="hppa2.0w" ;; |
4817 | + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
4818 | + esac ;; |
4819 | + esac |
4820 | + fi |
4821 | + if [ "${HP_ARCH}" = "" ]; then |
4822 | + eval $set_cc_for_build |
4823 | + sed 's/^ //' << EOF >$dummy.c |
4824 | + |
4825 | + #define _HPUX_SOURCE |
4826 | + #include <stdlib.h> |
4827 | + #include <unistd.h> |
4828 | + |
4829 | + int main () |
4830 | + { |
4831 | + #if defined(_SC_KERNEL_BITS) |
4832 | + long bits = sysconf(_SC_KERNEL_BITS); |
4833 | + #endif |
4834 | + long cpu = sysconf (_SC_CPU_VERSION); |
4835 | + |
4836 | + switch (cpu) |
4837 | + { |
4838 | + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
4839 | + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
4840 | + case CPU_PA_RISC2_0: |
4841 | + #if defined(_SC_KERNEL_BITS) |
4842 | + switch (bits) |
4843 | + { |
4844 | + case 64: puts ("hppa2.0w"); break; |
4845 | + case 32: puts ("hppa2.0n"); break; |
4846 | + default: puts ("hppa2.0"); break; |
4847 | + } break; |
4848 | + #else /* !defined(_SC_KERNEL_BITS) */ |
4849 | + puts ("hppa2.0"); break; |
4850 | + #endif |
4851 | + default: puts ("hppa1.0"); break; |
4852 | + } |
4853 | + exit (0); |
4854 | + } |
4855 | +EOF |
4856 | + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
4857 | + test -z "$HP_ARCH" && HP_ARCH=hppa |
4858 | + fi ;; |
4859 | + esac |
4860 | + if [ ${HP_ARCH} = "hppa2.0w" ] |
4861 | + then |
4862 | + eval $set_cc_for_build |
4863 | + |
4864 | + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating |
4865 | + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler |
4866 | + # generating 64-bit code. GNU and HP use different nomenclature: |
4867 | + # |
4868 | + # $ CC_FOR_BUILD=cc ./config.guess |
4869 | + # => hppa2.0w-hp-hpux11.23 |
4870 | + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess |
4871 | + # => hppa64-hp-hpux11.23 |
4872 | + |
4873 | + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | |
4874 | + grep -q __LP64__ |
4875 | + then |
4876 | + HP_ARCH="hppa2.0w" |
4877 | + else |
4878 | + HP_ARCH="hppa64" |
4879 | + fi |
4880 | + fi |
4881 | + echo ${HP_ARCH}-hp-hpux${HPUX_REV} |
4882 | + exit ;; |
4883 | + ia64:HP-UX:*:*) |
4884 | + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` |
4885 | + echo ia64-hp-hpux${HPUX_REV} |
4886 | + exit ;; |
4887 | + 3050*:HI-UX:*:*) |
4888 | + eval $set_cc_for_build |
4889 | + sed 's/^ //' << EOF >$dummy.c |
4890 | + #include <unistd.h> |
4891 | + int |
4892 | + main () |
4893 | + { |
4894 | + long cpu = sysconf (_SC_CPU_VERSION); |
4895 | + /* The order matters, because CPU_IS_HP_MC68K erroneously returns |
4896 | + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct |
4897 | + results, however. */ |
4898 | + if (CPU_IS_PA_RISC (cpu)) |
4899 | + { |
4900 | + switch (cpu) |
4901 | + { |
4902 | + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; |
4903 | + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; |
4904 | + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; |
4905 | + default: puts ("hppa-hitachi-hiuxwe2"); break; |
4906 | + } |
4907 | + } |
4908 | + else if (CPU_IS_HP_MC68K (cpu)) |
4909 | + puts ("m68k-hitachi-hiuxwe2"); |
4910 | + else puts ("unknown-hitachi-hiuxwe2"); |
4911 | + exit (0); |
4912 | + } |
4913 | +EOF |
4914 | + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && |
4915 | + { echo "$SYSTEM_NAME"; exit; } |
4916 | + echo unknown-hitachi-hiuxwe2 |
4917 | + exit ;; |
4918 | + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) |
4919 | + echo hppa1.1-hp-bsd |
4920 | + exit ;; |
4921 | + 9000/8??:4.3bsd:*:*) |
4922 | + echo hppa1.0-hp-bsd |
4923 | + exit ;; |
4924 | + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) |
4925 | + echo hppa1.0-hp-mpeix |
4926 | + exit ;; |
4927 | + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) |
4928 | + echo hppa1.1-hp-osf |
4929 | + exit ;; |
4930 | + hp8??:OSF1:*:*) |
4931 | + echo hppa1.0-hp-osf |
4932 | + exit ;; |
4933 | + i*86:OSF1:*:*) |
4934 | + if [ -x /usr/sbin/sysversion ] ; then |
4935 | + echo ${UNAME_MACHINE}-unknown-osf1mk |
4936 | + else |
4937 | + echo ${UNAME_MACHINE}-unknown-osf1 |
4938 | + fi |
4939 | + exit ;; |
4940 | + parisc*:Lites*:*:*) |
4941 | + echo hppa1.1-hp-lites |
4942 | + exit ;; |
4943 | + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
4944 | + echo c1-convex-bsd |
4945 | + exit ;; |
4946 | + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
4947 | + if getsysinfo -f scalar_acc |
4948 | + then echo c32-convex-bsd |
4949 | + else echo c2-convex-bsd |
4950 | + fi |
4951 | + exit ;; |
4952 | + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
4953 | + echo c34-convex-bsd |
4954 | + exit ;; |
4955 | + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
4956 | + echo c38-convex-bsd |
4957 | + exit ;; |
4958 | + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
4959 | + echo c4-convex-bsd |
4960 | + exit ;; |
4961 | + CRAY*Y-MP:*:*:*) |
4962 | + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
4963 | + exit ;; |
4964 | + CRAY*[A-Z]90:*:*:*) |
4965 | + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ |
4966 | + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ |
4967 | + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ |
4968 | + -e 's/\.[^.]*$/.X/' |
4969 | + exit ;; |
4970 | + CRAY*TS:*:*:*) |
4971 | + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
4972 | + exit ;; |
4973 | + CRAY*T3E:*:*:*) |
4974 | + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
4975 | + exit ;; |
4976 | + CRAY*SV1:*:*:*) |
4977 | + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
4978 | + exit ;; |
4979 | + *:UNICOS/mp:*:*) |
4980 | + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
4981 | + exit ;; |
4982 | + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
4983 | + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
4984 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
4985 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
4986 | + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
4987 | + exit ;; |
4988 | + 5000:UNIX_System_V:4.*:*) |
4989 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
4990 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
4991 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
4992 | + exit ;; |
4993 | + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
4994 | + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
4995 | + exit ;; |
4996 | + sparc*:BSD/OS:*:*) |
4997 | + echo sparc-unknown-bsdi${UNAME_RELEASE} |
4998 | + exit ;; |
4999 | + *:BSD/OS:*:*) |
5000 | + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
The diff has been truncated for viewing.
Uploaded, thanks!
And, BTW: pleeease reconsider attaching debdiffs to a bug. They are so much easier/faster to sponsor.