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