Merge lp:~noskcaj/ubuntu/vivid/brasero/3.12 into lp:ubuntu/vivid/brasero
- Vivid (15.04)
- 3.12
- Merge into vivid
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merge reported by: | Sebastien Bacher |
Merged at revision: | not available |
Proposed branch: | lp:~noskcaj/ubuntu/vivid/brasero/3.12 |
Merge into: | lp:ubuntu/vivid/brasero |
Diff against target: |
22003 lines (+6387/-7207) 52 files modified
.pc/012_appindicator.patch/configure.ac (+3/-3) .pc/013_unity_launcher_progress.patch/configure.ac (+3/-3) .pc/01_fix-plugin-dialog-segfault.patch/src/brasero-plugin-manager-ui.c (+0/-1028) .pc/applied-patches (+0/-1) ChangeLog (+113/-0) Makefile.in (+2/-2) NEWS (+5/-1) aclocal.m4 (+1207/-1222) config.guess (+8/-156) config.sub (+17/-11) configure (+57/-51) configure.ac (+3/-3) data/brasero.desktop.in (+1/-1) debian/changelog (+7/-0) debian/patches/01_fix-plugin-dialog-segfault.patch (+0/-46) debian/patches/series (+0/-1) docs/reference/libbrasero-burn/html/libbrasero-burn-BraseroBurnDialog.html (+3/-3) docs/reference/libbrasero-burn/html/libbrasero-burn-BraseroBurnOptions.html (+5/-5) docs/reference/libbrasero-burn/html/libbrasero-burn-brasero-track-data-cfg.html (+17/-17) docs/reference/libbrasero-burn/version.xml (+1/-1) docs/reference/libbrasero-media/html/libbrasero-media-BraseroDriveSelection.html (+3/-3) docs/reference/libbrasero-media/html/libbrasero-media-BraseroMediumSelection.html (+3/-3) docs/reference/libbrasero-media/html/libbrasero-media-BraseroVolume.html (+2/-2) docs/reference/libbrasero-media/version.xml (+1/-1) help/id/create-cover.page (+1/-1) help/id/id.po (+46/-49) help/id/index.page (+1/-1) help/id/introduction.page (+1/-1) help/id/prob-cd.page (+1/-1) help/id/prob-dvd.page (+1/-1) help/id/project-audio.page (+1/-1) help/id/project-data.page (+1/-1) help/id/project-disc-copy.page (+1/-1) help/id/project-image-burn.page (+1/-1) help/id/project-save.page (+1/-1) help/id/project-video.page (+1/-1) help/id/split-track.page (+1/-1) help/id/tools-blank.page (+1/-1) help/id/tools-check-integrity.page (+1/-1) libbrasero-burn/brasero-burn-lib.h (+2/-2) libbrasero-media/brasero-media.h (+3/-3) ltmain.sh (+19/-13) nautilus/brasero-nautilus.desktop.in (+1/-1) po/af.po (+3061/-2979) po/bg.po (+398/-420) po/da.po (+5/-5) po/el.po (+342/-364) po/fi.po (+1/-1) po/hi.po (+491/-389) po/mr.po (+288/-275) po/sv.po (+8/-13) po/te.po (+247/-115) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/vivid/brasero/3.12 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Approve | ||
Review via email: mp+241881@code.launchpad.net |
Commit message
Description of the change
New upstream release (translations + upstreams a patch)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.pc/012_appindicator.patch/configure.ac' |
2 | --- .pc/012_appindicator.patch/configure.ac 2014-11-07 11:33:39 +0000 |
3 | +++ .pc/012_appindicator.patch/configure.ac 2014-11-15 21:17:54 +0000 |
4 | @@ -1,10 +1,10 @@ |
5 | dnl Process this file with autoconf to produce a configure script. |
6 | -AC_INIT([brasero],[3.11.4]) |
7 | +AC_INIT([brasero],[3.12.0]) |
8 | AC_CONFIG_SRCDIR(src/main.c) |
9 | |
10 | BRASERO_MAJOR_VERSION=3 |
11 | -BRASERO_MINOR_VERSION=11 |
12 | -BRASERO_SUB=4 |
13 | +BRASERO_MINOR_VERSION=12 |
14 | +BRASERO_SUB=0 |
15 | BRASERO_VERSION=$BRASERO_MAJOR_VERSION.$BRASERO_MINOR_VERSION.$BRASERO_SUB |
16 | |
17 | AC_SUBST(BRASERO_MAJOR_VERSION) |
18 | |
19 | === modified file '.pc/013_unity_launcher_progress.patch/configure.ac' |
20 | --- .pc/013_unity_launcher_progress.patch/configure.ac 2014-11-07 11:33:39 +0000 |
21 | +++ .pc/013_unity_launcher_progress.patch/configure.ac 2014-11-15 21:17:54 +0000 |
22 | @@ -1,10 +1,10 @@ |
23 | dnl Process this file with autoconf to produce a configure script. |
24 | -AC_INIT([brasero],[3.11.4]) |
25 | +AC_INIT([brasero],[3.12.0]) |
26 | AC_CONFIG_SRCDIR(src/main.c) |
27 | |
28 | BRASERO_MAJOR_VERSION=3 |
29 | -BRASERO_MINOR_VERSION=11 |
30 | -BRASERO_SUB=4 |
31 | +BRASERO_MINOR_VERSION=12 |
32 | +BRASERO_SUB=0 |
33 | BRASERO_VERSION=$BRASERO_MAJOR_VERSION.$BRASERO_MINOR_VERSION.$BRASERO_SUB |
34 | |
35 | AC_SUBST(BRASERO_MAJOR_VERSION) |
36 | |
37 | === removed directory '.pc/01_fix-plugin-dialog-segfault.patch' |
38 | === removed directory '.pc/01_fix-plugin-dialog-segfault.patch/src' |
39 | === removed file '.pc/01_fix-plugin-dialog-segfault.patch/src/brasero-plugin-manager-ui.c' |
40 | --- .pc/01_fix-plugin-dialog-segfault.patch/src/brasero-plugin-manager-ui.c 2014-10-04 15:48:52 +0000 |
41 | +++ .pc/01_fix-plugin-dialog-segfault.patch/src/brasero-plugin-manager-ui.c 1970-01-01 00:00:00 +0000 |
42 | @@ -1,1028 +0,0 @@ |
43 | -/* |
44 | - * brasero-plugin-manager.c |
45 | - * This file is part of brasero |
46 | - * |
47 | - * Copyright (C) 2007 Philippe Rouquier |
48 | - * |
49 | - * Based on gedit code (gedit/gedit-plugin-manager.c) by: |
50 | - * - Paolo Maggi <paolo@gnome.org> |
51 | - * |
52 | - * Libbrasero-media is free software; you can redistribute it and/or modify |
53 | -fy |
54 | - * it under the terms of the GNU General Public License as published by |
55 | - * the Free Software Foundation; either version 2 of the License, or |
56 | - * (at your option) any later version. |
57 | - * |
58 | - * Brasero is distributed in the hope that it will be useful, |
59 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
60 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
61 | - * GNU General Public License for more details. |
62 | - * |
63 | - * You should have received a copy of the GNU General Public License |
64 | - * along with this program; if not, write to: |
65 | - * The Free Software Foundation, Inc., |
66 | - * 51 Franklin Street, Fifth Floor |
67 | - * Boston, MA 02110-1301, USA. |
68 | - */ |
69 | - |
70 | -#ifdef HAVE_CONFIG_H |
71 | -#include <config.h> |
72 | -#endif |
73 | - |
74 | -#include <string.h> |
75 | - |
76 | -#include <glib/gi18n.h> |
77 | - |
78 | -#include "brasero-misc.h" |
79 | - |
80 | -#include "brasero-plugin-manager-ui.h" |
81 | - |
82 | -#include "brasero-plugin.h" |
83 | -#include "brasero-plugin-private.h" |
84 | -#include "brasero-plugin-information.h" |
85 | -#include "brasero-burn-lib.h" |
86 | -#include "brasero-plugin-option.h" |
87 | - |
88 | -typedef enum { |
89 | - BRASERO_PLUGIN_BURN_ENGINE = 0, |
90 | - BRASERO_PLUGIN_IMAGE_ENGINE, |
91 | - BRASERO_PLUGIN_CONVERT_ENGINE, |
92 | - BRASERO_PLUGIN_MISCELLANEOUS, |
93 | - BRASERO_PLUGIN_ERROR |
94 | -} BraseroPluginCategory; |
95 | - |
96 | -enum |
97 | -{ |
98 | - ACTIVE_COLUMN, |
99 | - AVAILABLE_COLUMN, |
100 | - PLUGIN_COLUMN, |
101 | - N_COLUMNS |
102 | -}; |
103 | - |
104 | -#define PLUGIN_MANAGER_UI_NAME_TITLE _("Plugin") |
105 | -#define PLUGIN_MANAGER_UI_ACTIVE_TITLE _("Enabled") |
106 | - |
107 | -#define BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), BRASERO_TYPE_PLUGIN_MANAGER_UI, BraseroPluginManagerUIPrivate)) |
108 | - |
109 | -struct _BraseroPluginManagerUIPrivate |
110 | -{ |
111 | - GtkWidget *tree; |
112 | - |
113 | - GtkWidget *about_button; |
114 | - GtkWidget *configure_button; |
115 | - |
116 | - GtkWidget *about; |
117 | - |
118 | - GtkWidget *popup_menu; |
119 | - |
120 | - GSList *plugins; |
121 | -}; |
122 | - |
123 | -G_DEFINE_TYPE (BraseroPluginManagerUI, brasero_plugin_manager_ui, GTK_TYPE_BOX) |
124 | - |
125 | -static void plugin_manager_ui_toggle_active (GtkTreeIter *iter, GtkTreeModel *model); |
126 | -static void brasero_plugin_manager_ui_finalize (GObject *object); |
127 | - |
128 | -static void |
129 | -brasero_plugin_manager_ui_class_init (BraseroPluginManagerUIClass *klass) |
130 | -{ |
131 | - GObjectClass *object_class = G_OBJECT_CLASS (klass); |
132 | - |
133 | - object_class->finalize = brasero_plugin_manager_ui_finalize; |
134 | - |
135 | - g_type_class_add_private (object_class, sizeof (BraseroPluginManagerUIPrivate)); |
136 | -} |
137 | - |
138 | -static BraseroPlugin * |
139 | -plugin_manager_ui_get_selected_plugin (BraseroPluginManagerUI *pm) |
140 | -{ |
141 | - BraseroPlugin *plugin = NULL; |
142 | - GtkTreeModel *model; |
143 | - GtkTreeIter iter; |
144 | - GtkTreeSelection *selection; |
145 | - BraseroPluginManagerUIPrivate *priv; |
146 | - |
147 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
148 | - |
149 | - model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree)); |
150 | - g_return_val_if_fail (model != NULL, NULL); |
151 | - |
152 | - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree)); |
153 | - g_return_val_if_fail (selection != NULL, NULL); |
154 | - |
155 | - if (gtk_tree_selection_get_selected (selection, NULL, &iter)) |
156 | - { |
157 | - gtk_tree_model_get (model, &iter, PLUGIN_COLUMN, &plugin, -1); |
158 | - } |
159 | - |
160 | - return plugin; |
161 | -} |
162 | - |
163 | -static void |
164 | -about_button_cb (GtkWidget *button, |
165 | - BraseroPluginManagerUI *pm) |
166 | -{ |
167 | - GtkWidget *dialog; |
168 | - gchar *copyright; |
169 | - BraseroPlugin *plugin; |
170 | - BraseroPluginManagerUIPrivate *priv; |
171 | - const gchar *authors [2] = { NULL }; |
172 | - |
173 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
174 | - |
175 | - plugin = plugin_manager_ui_get_selected_plugin (pm); |
176 | - |
177 | - g_return_if_fail (plugin != NULL); |
178 | - |
179 | - /* if there is another about dialog already open destroy it */ |
180 | - if (priv->about) |
181 | - gtk_widget_destroy (priv->about); |
182 | - |
183 | - authors [0] = brasero_plugin_get_author (plugin); |
184 | - |
185 | - copyright = g_strdup_printf (_("Copyright %s"), |
186 | - brasero_plugin_get_author (plugin)); |
187 | - |
188 | - dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG, |
189 | - "program-name", _(brasero_plugin_get_display_name (plugin)), |
190 | - "copyright", copyright, |
191 | - "authors", authors, |
192 | - "comments", brasero_plugin_get_description (plugin), |
193 | - "logo-icon-name", brasero_plugin_get_icon_name (plugin), |
194 | - NULL); |
195 | - |
196 | - g_free (copyright); |
197 | - |
198 | - gtk_window_set_transient_for (GTK_WINDOW (dialog), |
199 | - GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (pm)))); |
200 | - |
201 | - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); |
202 | - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT); |
203 | - |
204 | - gtk_widget_show_all (dialog); |
205 | - gtk_dialog_run (GTK_DIALOG (dialog)); |
206 | - gtk_widget_destroy (dialog); |
207 | -} |
208 | - |
209 | -static void |
210 | -configure_button_cb (GtkWidget *button, |
211 | - BraseroPluginManagerUI *pm) |
212 | -{ |
213 | - BraseroPlugin *plugin; |
214 | - GtkWidget *dialog; |
215 | - |
216 | - plugin = plugin_manager_ui_get_selected_plugin (pm); |
217 | - |
218 | - g_return_if_fail (plugin != NULL); |
219 | - |
220 | - dialog = brasero_plugin_option_new (); |
221 | - |
222 | - brasero_plugin_option_set_plugin (BRASERO_PLUGIN_OPTION (dialog), plugin); |
223 | - gtk_window_set_transient_for (GTK_WINDOW (dialog), |
224 | - GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (pm)))); |
225 | - |
226 | - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); |
227 | - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT); |
228 | - |
229 | - gtk_dialog_run (GTK_DIALOG (dialog)); |
230 | - gtk_widget_destroy (dialog); |
231 | -} |
232 | - |
233 | -static void |
234 | -plugin_manager_ui_view_info_cell_cb (GtkTreeViewColumn *tree_column, |
235 | - GtkCellRenderer *cell, |
236 | - GtkTreeModel *tree_model, |
237 | - GtkTreeIter *iter, |
238 | - gpointer data) |
239 | -{ |
240 | - BraseroPlugin *plugin; |
241 | - gchar *error_string; |
242 | - gchar *text; |
243 | - |
244 | - g_return_if_fail (tree_model != NULL); |
245 | - g_return_if_fail (tree_column != NULL); |
246 | - |
247 | - gtk_tree_model_get (tree_model, iter, |
248 | - PLUGIN_COLUMN, &plugin, |
249 | - -1); |
250 | - |
251 | - if (!plugin) |
252 | - return; |
253 | - |
254 | - error_string = brasero_plugin_get_error_string (plugin); |
255 | - if (error_string) { |
256 | - text = g_markup_printf_escaped ("<b>%s</b>\n%s\n<i>%s</i>", |
257 | - /* Use the translated name of |
258 | - * the plugin. */ |
259 | - _(brasero_plugin_get_display_name (plugin)), |
260 | - brasero_plugin_get_description (plugin), |
261 | - error_string); |
262 | - g_free (error_string); |
263 | - } |
264 | - else |
265 | - text = g_markup_printf_escaped ("<b>%s</b>\n%s", |
266 | - /* Use the translated name of |
267 | - * the plugin. */ |
268 | - _(brasero_plugin_get_display_name (plugin)), |
269 | - brasero_plugin_get_description (plugin)); |
270 | - |
271 | - g_object_set (G_OBJECT (cell), |
272 | - "markup", text, |
273 | - "sensitive", brasero_plugin_get_gtype (plugin) != G_TYPE_NONE && !brasero_plugin_get_compulsory (plugin), |
274 | - NULL); |
275 | - |
276 | - g_free (text); |
277 | -} |
278 | - |
279 | -static void |
280 | -plugin_manager_ui_view_icon_cell_cb (GtkTreeViewColumn *tree_column, |
281 | - GtkCellRenderer *cell, |
282 | - GtkTreeModel *tree_model, |
283 | - GtkTreeIter *iter, |
284 | - gpointer data) |
285 | -{ |
286 | - BraseroPlugin *plugin; |
287 | - |
288 | - g_return_if_fail (tree_model != NULL); |
289 | - g_return_if_fail (tree_column != NULL); |
290 | - |
291 | - gtk_tree_model_get (tree_model, iter, PLUGIN_COLUMN, &plugin, -1); |
292 | - |
293 | - g_object_set (G_OBJECT (cell), |
294 | - "visible", FALSE, |
295 | - "sensitive", brasero_plugin_get_gtype (plugin) != G_TYPE_NONE && !brasero_plugin_get_compulsory (plugin), |
296 | - NULL); |
297 | - return; |
298 | -/* |
299 | - For the time being don't use it since there is no plugin with icon |
300 | - BraseroPlugin *plugin; |
301 | - |
302 | - gtk_tree_model_get (tree_model, iter, PLUGIN_COLUMN, &plugin, -1); |
303 | - |
304 | - if (!plugin) { |
305 | - g_object_set (G_OBJECT (cell), |
306 | - "visible", FALSE, |
307 | - NULL); |
308 | - return; |
309 | - } |
310 | - |
311 | - g_object_set (G_OBJECT (cell), |
312 | - "visible", TRUE, |
313 | - "icon-name", |
314 | - brasero_plugin_get_icon_name (plugin), |
315 | - "sensitive", |
316 | - brasero_plugin_get_gtype (plugin) != G_TYPE_NONE, |
317 | - NULL); |
318 | -*/ |
319 | -} |
320 | - |
321 | -static void |
322 | -active_toggled_cb (GtkCellRendererToggle *cell, |
323 | - gchar *path_str, |
324 | - BraseroPluginManagerUI *pm) |
325 | -{ |
326 | - GtkTreeIter iter; |
327 | - GtkTreePath *path; |
328 | - GtkTreeModel *model; |
329 | - BraseroPluginManagerUIPrivate *priv; |
330 | - |
331 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
332 | - path = gtk_tree_path_new_from_string (path_str); |
333 | - |
334 | - model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree)); |
335 | - g_return_if_fail (model != NULL); |
336 | - |
337 | - if (gtk_tree_model_get_iter (model, &iter, path)) |
338 | - plugin_manager_ui_toggle_active (&iter, model); |
339 | - |
340 | - gtk_tree_path_free (path); |
341 | -} |
342 | - |
343 | -static void |
344 | -cursor_changed_cb (GtkTreeView *view, |
345 | - gpointer data) |
346 | -{ |
347 | - BraseroPlugin *plugin; |
348 | - BraseroPluginManagerUI *pm = data; |
349 | - BraseroPluginManagerUIPrivate *priv; |
350 | - |
351 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
352 | - plugin = plugin_manager_ui_get_selected_plugin (pm); |
353 | - |
354 | - gtk_widget_set_sensitive (GTK_WIDGET (priv->about_button), |
355 | - plugin != NULL); |
356 | - gtk_widget_set_sensitive (GTK_WIDGET (priv->configure_button), |
357 | - (plugin != NULL) && |
358 | - brasero_plugin_get_next_conf_option (plugin, NULL)); |
359 | -} |
360 | - |
361 | -static void |
362 | -row_activated_cb (GtkTreeView *tree_view, |
363 | - GtkTreePath *path, |
364 | - GtkTreeViewColumn *column, |
365 | - gpointer data) |
366 | -{ |
367 | - GtkTreeIter iter; |
368 | - GtkTreeModel *model; |
369 | - BraseroPluginManagerUI *pm = data; |
370 | - BraseroPluginManagerUIPrivate *priv; |
371 | - |
372 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
373 | - model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree)); |
374 | - |
375 | - g_return_if_fail (model != NULL); |
376 | - g_return_if_fail (gtk_tree_model_get_iter (model, &iter, path)); |
377 | - |
378 | - plugin_manager_ui_toggle_active (&iter, model); |
379 | -} |
380 | - |
381 | -static void |
382 | -plugin_manager_ui_populate_lists (BraseroPluginManagerUI *pm) |
383 | -{ |
384 | - BraseroPluginManagerUIPrivate *priv; |
385 | - BraseroPlugin *plugin; |
386 | - const GSList *plugins; |
387 | - GtkListStore *model; |
388 | - GtkTreeIter iter; |
389 | - |
390 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
391 | - plugins = priv->plugins; |
392 | - |
393 | - model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree))); |
394 | - |
395 | - for (; plugins; plugins = plugins->next) { |
396 | - plugin = plugins->data; |
397 | - |
398 | - gtk_list_store_append (model, &iter); |
399 | - gtk_list_store_set (model, &iter, |
400 | - ACTIVE_COLUMN, brasero_plugin_get_active (plugin, 0), |
401 | - AVAILABLE_COLUMN, brasero_plugin_get_gtype (plugin) != G_TYPE_NONE && !brasero_plugin_get_compulsory (plugin), |
402 | - PLUGIN_COLUMN, plugin, |
403 | - -1); |
404 | - } |
405 | - |
406 | - plugin = NULL; |
407 | - if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter)) |
408 | - { |
409 | - GtkTreeSelection *selection; |
410 | - |
411 | - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree)); |
412 | - g_return_if_fail (selection != NULL); |
413 | - |
414 | - gtk_tree_selection_select_iter (selection, &iter); |
415 | - |
416 | - gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, |
417 | - PLUGIN_COLUMN, &plugin, -1); |
418 | - |
419 | - gtk_widget_set_sensitive (GTK_WIDGET (priv->configure_button), |
420 | - (brasero_plugin_get_next_conf_option (plugin, NULL) != NULL)); |
421 | - } |
422 | - |
423 | - /* update buttons */ |
424 | - gtk_widget_set_sensitive (GTK_WIDGET (priv->about_button), |
425 | - plugin != NULL); |
426 | - gtk_widget_set_sensitive (GTK_WIDGET (priv->configure_button), |
427 | - (plugin != NULL) && |
428 | - brasero_plugin_get_next_conf_option (plugin, NULL)); |
429 | -} |
430 | - |
431 | -static gboolean |
432 | -plugin_manager_ui_set_active (GtkTreeIter *iter, |
433 | - GtkTreeModel *model, |
434 | - gboolean active) |
435 | -{ |
436 | - BraseroPlugin *plugin; |
437 | - GtkTreeIter category; |
438 | - gboolean res = TRUE; |
439 | - |
440 | - gtk_tree_model_get (model, iter, PLUGIN_COLUMN, &plugin, -1); |
441 | - |
442 | - g_return_val_if_fail (plugin != NULL, FALSE); |
443 | - |
444 | - if (brasero_plugin_get_gtype (plugin) == G_TYPE_NONE |
445 | - || brasero_plugin_get_compulsory (plugin)) |
446 | - return FALSE; |
447 | - |
448 | - brasero_plugin_set_active (plugin, active); |
449 | - |
450 | - /* set new value */ |
451 | - gtk_list_store_set (GTK_LIST_STORE (model), |
452 | - iter, |
453 | - ACTIVE_COLUMN, brasero_plugin_get_active (plugin, 0), |
454 | - AVAILABLE_COLUMN, brasero_plugin_get_gtype (plugin) != G_TYPE_NONE && !brasero_plugin_get_compulsory (plugin), |
455 | - -1); |
456 | - |
457 | - /* search if this plugin appears under other categories |
458 | - * and deactivate it as well */ |
459 | - if (!gtk_tree_model_get_iter_first (model, &category)) |
460 | - return res; |
461 | - |
462 | - do { |
463 | - GtkTreeIter child; |
464 | - |
465 | - if (!gtk_tree_model_iter_children (model, &child, &category)) |
466 | - continue; |
467 | - |
468 | - do { |
469 | - BraseroPlugin *tmp_plugin; |
470 | - |
471 | - tmp_plugin = NULL; |
472 | - gtk_tree_model_get (model, &child, |
473 | - PLUGIN_COLUMN, &tmp_plugin, |
474 | - -1); |
475 | - |
476 | - if (plugin == tmp_plugin) { |
477 | - gtk_list_store_set (GTK_LIST_STORE (model), &child, |
478 | - ACTIVE_COLUMN, active, |
479 | - AVAILABLE_COLUMN, brasero_plugin_get_gtype (plugin) != G_TYPE_NONE && !brasero_plugin_get_compulsory (plugin), |
480 | - -1); |
481 | - break; |
482 | - } |
483 | - |
484 | - } while (gtk_tree_model_iter_next (model, &child)); |
485 | - |
486 | - } while (gtk_tree_model_iter_next (model, &category)); |
487 | - |
488 | - return res; |
489 | -} |
490 | - |
491 | -static void |
492 | -plugin_manager_ui_toggle_active (GtkTreeIter *iter, |
493 | - GtkTreeModel *model) |
494 | -{ |
495 | - gboolean active; |
496 | - |
497 | - gtk_tree_model_get (model, iter, ACTIVE_COLUMN, &active, -1); |
498 | - |
499 | - active ^= 1; |
500 | - |
501 | - if (!plugin_manager_ui_set_active (iter, model, active)) |
502 | - return; |
503 | -} |
504 | - |
505 | -static void |
506 | -plugin_manager_ui_set_active_all (BraseroPluginManagerUI *pm, |
507 | - gboolean active) |
508 | -{ |
509 | - BraseroPluginManagerUIPrivate *priv; |
510 | - GtkTreeModel *model; |
511 | - GtkTreeIter iter; |
512 | - |
513 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
514 | - model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree)); |
515 | - |
516 | - g_return_if_fail (model != NULL); |
517 | - |
518 | - gtk_tree_model_get_iter_first (model, &iter); |
519 | - |
520 | - do { |
521 | - plugin_manager_ui_set_active (&iter, model, active); |
522 | - } |
523 | - while (gtk_tree_model_iter_next (model, &iter)); |
524 | -} |
525 | - |
526 | -/* Callback used as the interactive search comparison function */ |
527 | -static gboolean |
528 | -name_search_cb (GtkTreeModel *model, |
529 | - gint column, |
530 | - const gchar *key, |
531 | - GtkTreeIter *iter, |
532 | - gpointer data) |
533 | -{ |
534 | - BraseroPlugin *plugin; |
535 | - gchar *normalized_string; |
536 | - gchar *normalized_key; |
537 | - gchar *case_normalized_string; |
538 | - gchar *case_normalized_key; |
539 | - gint key_len; |
540 | - gboolean retval; |
541 | - |
542 | - gtk_tree_model_get (model, iter, PLUGIN_COLUMN, &plugin, -1); |
543 | - if (!plugin) |
544 | - return FALSE; |
545 | - |
546 | - /* Use translated name for the plugin */ |
547 | - normalized_string = g_utf8_normalize (_(brasero_plugin_get_display_name (plugin)), |
548 | - -1, |
549 | - G_NORMALIZE_ALL); |
550 | - normalized_key = g_utf8_normalize (key, |
551 | - -1, |
552 | - G_NORMALIZE_ALL); |
553 | - case_normalized_string = g_utf8_casefold (normalized_string, -1); |
554 | - case_normalized_key = g_utf8_casefold (normalized_key, -1); |
555 | - |
556 | - key_len = strlen (case_normalized_key); |
557 | - |
558 | - /* Oddly enough, this callback must return whether to stop the search |
559 | - * because we found a match, not whether we actually matched. |
560 | - */ |
561 | - retval = (strncmp (case_normalized_key, case_normalized_string, key_len) != 0); |
562 | - |
563 | - g_free (normalized_key); |
564 | - g_free (normalized_string); |
565 | - g_free (case_normalized_key); |
566 | - g_free (case_normalized_string); |
567 | - |
568 | - return retval; |
569 | -} |
570 | - |
571 | -static void |
572 | -enable_plugin_menu_cb (GtkMenu *menu, |
573 | - BraseroPluginManagerUI *pm) |
574 | -{ |
575 | - GtkTreeModel *model; |
576 | - GtkTreeIter iter; |
577 | - GtkTreeSelection *selection; |
578 | - BraseroPluginManagerUIPrivate *priv; |
579 | - |
580 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
581 | - |
582 | - model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree)); |
583 | - g_return_if_fail (model != NULL); |
584 | - |
585 | - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree)); |
586 | - g_return_if_fail (selection != NULL); |
587 | - |
588 | - if (gtk_tree_selection_get_selected (selection, NULL, &iter)) |
589 | - plugin_manager_ui_toggle_active (&iter, model); |
590 | -} |
591 | - |
592 | -static void |
593 | -enable_all_menu_cb (GtkMenu *menu, |
594 | - BraseroPluginManagerUI *pm) |
595 | -{ |
596 | - plugin_manager_ui_set_active_all (pm, TRUE); |
597 | -} |
598 | - |
599 | -static void |
600 | -disable_all_menu_cb (GtkMenu *menu, |
601 | - BraseroPluginManagerUI *pm) |
602 | -{ |
603 | - plugin_manager_ui_set_active_all (pm, FALSE); |
604 | -} |
605 | - |
606 | -static GtkWidget * |
607 | -create_tree_popup_menu (BraseroPluginManagerUI *pm) |
608 | -{ |
609 | - GtkWidget *menu; |
610 | - GtkWidget *item; |
611 | - GtkWidget *image; |
612 | - BraseroPlugin *plugin; |
613 | - |
614 | - plugin = plugin_manager_ui_get_selected_plugin (pm); |
615 | - |
616 | - if (!plugin) |
617 | - return NULL; |
618 | - |
619 | - menu = gtk_menu_new (); |
620 | - |
621 | - item = gtk_image_menu_item_new_with_mnemonic (_("_About")); |
622 | - image = gtk_image_new_from_stock (GTK_STOCK_ABOUT, |
623 | - GTK_ICON_SIZE_MENU); |
624 | - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); |
625 | - g_signal_connect (item, "activate", |
626 | - G_CALLBACK (about_button_cb), pm); |
627 | - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); |
628 | - |
629 | - item = gtk_image_menu_item_new_with_mnemonic (_("C_onfigure")); |
630 | - image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, |
631 | - GTK_ICON_SIZE_MENU); |
632 | - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); |
633 | - g_signal_connect (item, "activate", |
634 | - G_CALLBACK (configure_button_cb), pm); |
635 | - gtk_widget_set_sensitive (item, |
636 | - (brasero_plugin_get_next_conf_option (plugin, NULL) != NULL)); |
637 | - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); |
638 | - |
639 | - item = gtk_check_menu_item_new_with_mnemonic (_("A_ctivate")); |
640 | - gtk_widget_set_sensitive (item, |
641 | - brasero_plugin_get_gtype (plugin) != G_TYPE_NONE && !brasero_plugin_get_compulsory (plugin)); |
642 | - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), |
643 | - brasero_plugin_get_active (plugin, 0)); |
644 | - g_signal_connect (item, "toggled", |
645 | - G_CALLBACK (enable_plugin_menu_cb), pm); |
646 | - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); |
647 | - |
648 | - item = gtk_separator_menu_item_new (); |
649 | - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); |
650 | - |
651 | - item = gtk_menu_item_new_with_mnemonic (_("Ac_tivate All")); |
652 | - g_signal_connect (item, "activate", |
653 | - G_CALLBACK (enable_all_menu_cb), pm); |
654 | - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); |
655 | - |
656 | - item = gtk_menu_item_new_with_mnemonic (_("_Deactivate All")); |
657 | - g_signal_connect (item, "activate", |
658 | - G_CALLBACK (disable_all_menu_cb), pm); |
659 | - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); |
660 | - |
661 | - gtk_widget_show_all (menu); |
662 | - |
663 | - return menu; |
664 | -} |
665 | - |
666 | -static void |
667 | -tree_popup_menu_detach (BraseroPluginManagerUI *pm, |
668 | - GtkMenu *menu) |
669 | -{ |
670 | - BraseroPluginManagerUIPrivate *priv; |
671 | - |
672 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
673 | - priv->popup_menu = NULL; |
674 | -} |
675 | - |
676 | -static void |
677 | -menu_position_under_widget (GtkMenu *menu, |
678 | - gint *x, |
679 | - gint *y, |
680 | - gboolean *push_in, |
681 | - gpointer user_data) |
682 | -{ |
683 | - GtkWidget *w = GTK_WIDGET (user_data); |
684 | - GtkRequisition requisition; |
685 | - GtkAllocation allocation; |
686 | - |
687 | - gdk_window_get_origin (gtk_widget_get_window (w), x, y); |
688 | - gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL); |
689 | - |
690 | - gtk_widget_get_allocation (w, &allocation); |
691 | - if (gtk_widget_get_direction (w) == GTK_TEXT_DIR_RTL) { |
692 | - *x += allocation.x + allocation.width - requisition.width; |
693 | - } else { |
694 | - *x += allocation.x; |
695 | - } |
696 | - |
697 | - *y += allocation.y + allocation.height; |
698 | - |
699 | - *push_in = TRUE; |
700 | -} |
701 | - |
702 | -static void |
703 | -menu_position_under_tree_view (GtkMenu *menu, |
704 | - gint *x, |
705 | - gint *y, |
706 | - gboolean *push_in, |
707 | - gpointer user_data) |
708 | -{ |
709 | - GtkTreeView *tree = GTK_TREE_VIEW (user_data); |
710 | - GtkTreeModel *model; |
711 | - GtkTreeSelection *selection; |
712 | - GtkTreeIter iter; |
713 | - |
714 | - model = gtk_tree_view_get_model (tree); |
715 | - |
716 | - g_return_if_fail (model != NULL); |
717 | - |
718 | - selection = gtk_tree_view_get_selection (tree); |
719 | - |
720 | - g_return_if_fail (selection != NULL); |
721 | - |
722 | - if (gtk_tree_selection_get_selected (selection, NULL, &iter)) { |
723 | - GtkTreePath *path; |
724 | - GdkRectangle rect; |
725 | - |
726 | - gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (tree)), x, y); |
727 | - |
728 | - path = gtk_tree_model_get_path (model, &iter); |
729 | - |
730 | - gtk_tree_view_get_cell_area (tree, |
731 | - path, |
732 | - gtk_tree_view_get_column (tree, 0), /* FIXME 0 for RTL ? */ |
733 | - &rect); |
734 | - gtk_tree_path_free (path); |
735 | - |
736 | - *x += rect.x; |
737 | - *y += rect.y + rect.height; |
738 | - |
739 | - if (gtk_widget_get_direction (GTK_WIDGET (tree)) == GTK_TEXT_DIR_RTL) { |
740 | - GtkRequisition requisition; |
741 | - |
742 | - gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL); |
743 | - |
744 | - *x += rect.width - requisition.width; |
745 | - } |
746 | - } else { |
747 | - /* No selection -> regular "under widget" positioning */ |
748 | - menu_position_under_widget (menu, |
749 | - x, y, push_in, |
750 | - tree); |
751 | - } |
752 | -} |
753 | - |
754 | -static void |
755 | -show_tree_popup_menu (GtkTreeView *tree, |
756 | - BraseroPluginManagerUI *pm, |
757 | - GdkEventButton *event) |
758 | -{ |
759 | - BraseroPluginManagerUIPrivate *priv; |
760 | - |
761 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
762 | - |
763 | - if (priv->popup_menu) |
764 | - gtk_widget_destroy (priv->popup_menu); |
765 | - |
766 | - priv->popup_menu = create_tree_popup_menu (pm); |
767 | - if (!priv->popup_menu) |
768 | - return; |
769 | - |
770 | - gtk_menu_attach_to_widget (GTK_MENU (priv->popup_menu), |
771 | - GTK_WIDGET (pm), |
772 | - (GtkMenuDetachFunc) tree_popup_menu_detach); |
773 | - |
774 | - if (event != NULL) |
775 | - { |
776 | - gtk_menu_popup (GTK_MENU (priv->popup_menu), NULL, NULL, |
777 | - NULL, NULL, |
778 | - event->button, event->time); |
779 | - } |
780 | - else |
781 | - { |
782 | - gtk_menu_popup (GTK_MENU (priv->popup_menu), NULL, NULL, |
783 | - menu_position_under_tree_view, tree, |
784 | - 0, gtk_get_current_event_time ()); |
785 | - |
786 | - gtk_menu_shell_select_first (GTK_MENU_SHELL (priv->popup_menu), |
787 | - FALSE); |
788 | - } |
789 | -} |
790 | - |
791 | -static gboolean |
792 | -button_press_event_cb (GtkWidget *tree, |
793 | - GdkEventButton *event, |
794 | - BraseroPluginManagerUI *pm) |
795 | -{ |
796 | - /* We want the treeview selection to be updated before showing the menu. |
797 | - * This code is evil, thanks to Federico Mena Quintero's black magic. |
798 | - * See: http://mail.gnome.org/archives/gtk-devel-list/2006-February/msg00168.html |
799 | - * FIXME: Let's remove it asap. |
800 | - */ |
801 | - |
802 | - static gboolean in_press = FALSE; |
803 | - gboolean handled; |
804 | - |
805 | - if (in_press) |
806 | - return FALSE; /* we re-entered */ |
807 | - |
808 | - if (GDK_BUTTON_PRESS != event->type || 3 != event->button) |
809 | - return FALSE; /* let the normal handler run */ |
810 | - |
811 | - in_press = TRUE; |
812 | - handled = gtk_widget_event (tree, (GdkEvent *) event); |
813 | - in_press = FALSE; |
814 | - |
815 | - if (!handled) |
816 | - return FALSE; |
817 | - |
818 | - /* The selection is fully updated by now */ |
819 | - show_tree_popup_menu (GTK_TREE_VIEW (tree), pm, event); |
820 | - return TRUE; |
821 | -} |
822 | - |
823 | -static gboolean |
824 | -popup_menu_cb (GtkTreeView *tree, |
825 | - BraseroPluginManagerUI *pm) |
826 | -{ |
827 | - show_tree_popup_menu (tree, pm, NULL); |
828 | - return TRUE; |
829 | -} |
830 | - |
831 | -static gint |
832 | -model_name_sort_func (GtkTreeModel *model, |
833 | - GtkTreeIter *iter1, |
834 | - GtkTreeIter *iter2, |
835 | - gpointer user_data) |
836 | -{ |
837 | - BraseroPlugin *plugin1, *plugin2; |
838 | - gboolean active1, active2; |
839 | - |
840 | - gtk_tree_model_get (model, iter1, PLUGIN_COLUMN, &plugin1, -1); |
841 | - gtk_tree_model_get (model, iter2, PLUGIN_COLUMN, &plugin2, -1); |
842 | - |
843 | - active1 = brasero_plugin_get_gtype (plugin1) != G_TYPE_NONE && !brasero_plugin_get_compulsory (plugin1); |
844 | - active2 = brasero_plugin_get_gtype (plugin2) != G_TYPE_NONE && !brasero_plugin_get_compulsory (plugin2); |
845 | - |
846 | - if (active1 && !active2) |
847 | - return -1; |
848 | - |
849 | - if (active2 && !active1) |
850 | - return 1; |
851 | - |
852 | - /* Use the translated name for the plugins */ |
853 | - return g_utf8_collate (_(brasero_plugin_get_display_name (plugin1)), |
854 | - _(brasero_plugin_get_display_name (plugin2))); |
855 | -} |
856 | - |
857 | -static void |
858 | -plugin_manager_ui_construct_tree (BraseroPluginManagerUI *pm) |
859 | -{ |
860 | - BraseroPluginManagerUIPrivate *priv; |
861 | - GtkTreeViewColumn *column; |
862 | - GtkCellRenderer *cell; |
863 | - GtkListStore *model; |
864 | - |
865 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
866 | - |
867 | - model = gtk_list_store_new (N_COLUMNS, |
868 | - G_TYPE_BOOLEAN, |
869 | - G_TYPE_BOOLEAN, |
870 | - G_TYPE_POINTER); |
871 | - |
872 | - gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree), |
873 | - GTK_TREE_MODEL (model)); |
874 | - g_object_unref (model); |
875 | - |
876 | - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (priv->tree), TRUE); |
877 | - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->tree), TRUE); |
878 | - |
879 | - /* First column */ |
880 | - column = gtk_tree_view_column_new (); |
881 | - gtk_tree_view_column_set_title (column, PLUGIN_MANAGER_UI_NAME_TITLE); |
882 | - gtk_tree_view_column_set_resizable (column, TRUE); |
883 | - gtk_tree_view_column_set_expand (column, TRUE); |
884 | - |
885 | - cell = gtk_cell_renderer_pixbuf_new (); |
886 | - gtk_tree_view_column_pack_start (column, cell, FALSE); |
887 | - g_object_set (cell, "stock-size", GTK_ICON_SIZE_SMALL_TOOLBAR, NULL); |
888 | - gtk_tree_view_column_add_attribute (column, |
889 | - cell, |
890 | - "sensitive", AVAILABLE_COLUMN); |
891 | - gtk_tree_view_column_set_cell_data_func (column, cell, |
892 | - plugin_manager_ui_view_icon_cell_cb, |
893 | - pm, NULL); |
894 | - |
895 | - cell = gtk_cell_renderer_text_new (); |
896 | - gtk_tree_view_column_pack_start (column, cell, TRUE); |
897 | - gtk_tree_view_column_add_attribute (column, |
898 | - cell, |
899 | - "sensitive", AVAILABLE_COLUMN); |
900 | - g_object_set (cell, "ellipsize", PANGO_ELLIPSIZE_END, NULL); |
901 | - gtk_tree_view_column_set_cell_data_func (column, cell, |
902 | - plugin_manager_ui_view_info_cell_cb, |
903 | - pm, NULL); |
904 | - |
905 | - gtk_tree_view_column_set_spacing (column, 6); |
906 | - gtk_tree_view_append_column (GTK_TREE_VIEW (priv->tree), column); |
907 | - |
908 | - /* Last column */ |
909 | - cell = gtk_cell_renderer_toggle_new (); |
910 | - g_signal_connect (cell, |
911 | - "toggled", |
912 | - G_CALLBACK (active_toggled_cb), |
913 | - pm); |
914 | - column = gtk_tree_view_column_new_with_attributes (PLUGIN_MANAGER_UI_ACTIVE_TITLE, |
915 | - cell, |
916 | - "active", ACTIVE_COLUMN, |
917 | - "activatable", AVAILABLE_COLUMN, |
918 | - "sensitive", AVAILABLE_COLUMN, |
919 | - NULL); |
920 | - |
921 | - gtk_tree_view_column_set_title (column, PLUGIN_MANAGER_UI_ACTIVE_TITLE); |
922 | - gtk_tree_view_column_set_expand (column, FALSE); |
923 | - gtk_tree_view_append_column (GTK_TREE_VIEW (priv->tree), column); |
924 | - g_object_set (cell, "xpad", 6, NULL); |
925 | - |
926 | - /* Sort on the plugin names */ |
927 | - gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (model), |
928 | - model_name_sort_func, |
929 | - NULL, |
930 | - NULL); |
931 | - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), |
932 | - GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, |
933 | - GTK_SORT_ASCENDING); |
934 | - |
935 | - /* Enable search for our non-string column */ |
936 | - gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->tree), |
937 | - PLUGIN_COLUMN); |
938 | - gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (priv->tree), |
939 | - name_search_cb, |
940 | - NULL, |
941 | - NULL); |
942 | - |
943 | - g_signal_connect (priv->tree, |
944 | - "cursor_changed", |
945 | - G_CALLBACK (cursor_changed_cb), |
946 | - pm); |
947 | - g_signal_connect (priv->tree, |
948 | - "row_activated", |
949 | - G_CALLBACK (row_activated_cb), |
950 | - pm); |
951 | - |
952 | - g_signal_connect (priv->tree, |
953 | - "button-press-event", |
954 | - G_CALLBACK (button_press_event_cb), |
955 | - pm); |
956 | - g_signal_connect (priv->tree, |
957 | - "popup-menu", |
958 | - G_CALLBACK (popup_menu_cb), |
959 | - pm); |
960 | - gtk_widget_show (priv->tree); |
961 | -} |
962 | - |
963 | -static void |
964 | -brasero_plugin_manager_ui_init (BraseroPluginManagerUI *pm) |
965 | -{ |
966 | - GtkWidget *vbox; |
967 | - GtkWidget *hbox; |
968 | - GtkWidget *viewport; |
969 | - GtkWidget *alignment; |
970 | - GtkWidget *vbuttonbox; |
971 | - BraseroPluginManagerUIPrivate *priv; |
972 | - |
973 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
974 | - |
975 | - gtk_orientable_set_orientation (GTK_ORIENTABLE (pm), GTK_ORIENTATION_VERTICAL); |
976 | - gtk_box_set_spacing (GTK_BOX (pm), 6); |
977 | - gtk_container_set_border_width (GTK_CONTAINER (pm), 12); |
978 | - |
979 | - alignment = gtk_alignment_new (0., 0., 1., 1.); |
980 | - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0); |
981 | - gtk_box_pack_start (GTK_BOX (pm), alignment, TRUE, TRUE, 0); |
982 | - |
983 | - vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); |
984 | - gtk_widget_show (vbox); |
985 | - gtk_container_add (GTK_CONTAINER (alignment), vbox); |
986 | - |
987 | - /* bottom part: tree, buttons */ |
988 | - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); |
989 | - gtk_widget_show (hbox); |
990 | - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 6); |
991 | - |
992 | - viewport = gtk_scrolled_window_new (NULL, NULL); |
993 | - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (viewport), |
994 | - GTK_POLICY_AUTOMATIC, |
995 | - GTK_POLICY_AUTOMATIC); |
996 | - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (viewport), |
997 | - GTK_SHADOW_IN); |
998 | - |
999 | - gtk_box_pack_start (GTK_BOX (hbox), viewport, TRUE, TRUE, 0); |
1000 | - |
1001 | - priv->tree = gtk_tree_view_new (); |
1002 | - gtk_container_add (GTK_CONTAINER (viewport), priv->tree); |
1003 | - |
1004 | - vbuttonbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL); |
1005 | - gtk_box_pack_start (GTK_BOX (hbox), vbuttonbox, FALSE, FALSE, 0); |
1006 | - gtk_button_box_set_layout (GTK_BUTTON_BOX (vbuttonbox), GTK_BUTTONBOX_START); |
1007 | - gtk_box_set_spacing (GTK_BOX (vbuttonbox), 8); |
1008 | - |
1009 | - priv->about_button = brasero_utils_make_button (_("_About"), |
1010 | - NULL, |
1011 | - GTK_STOCK_ABOUT, |
1012 | - GTK_ICON_SIZE_BUTTON); |
1013 | - gtk_container_add (GTK_CONTAINER (vbuttonbox), priv->about_button); |
1014 | - |
1015 | - priv->configure_button = brasero_utils_make_button (_("C_onfigure"), |
1016 | - NULL, |
1017 | - GTK_STOCK_PREFERENCES, |
1018 | - GTK_ICON_SIZE_BUTTON); |
1019 | - gtk_container_add (GTK_CONTAINER (vbuttonbox), priv->configure_button); |
1020 | - |
1021 | - /* setup a window of a sane size. */ |
1022 | - gtk_widget_set_size_request (GTK_WIDGET (viewport), 300, 200); |
1023 | - |
1024 | - g_signal_connect (priv->about_button, |
1025 | - "clicked", |
1026 | - G_CALLBACK (about_button_cb), |
1027 | - pm); |
1028 | - g_signal_connect (priv->configure_button, |
1029 | - "clicked", |
1030 | - G_CALLBACK (configure_button_cb), |
1031 | - pm); |
1032 | - |
1033 | - plugin_manager_ui_construct_tree (pm); |
1034 | - |
1035 | - /* get the list of available plugins (or installed) */ |
1036 | - priv->plugins = brasero_burn_library_get_plugins_list (); |
1037 | - |
1038 | - if (!priv->plugins){ |
1039 | - gtk_widget_set_sensitive (priv->about_button, FALSE); |
1040 | - gtk_widget_set_sensitive (priv->configure_button, FALSE); |
1041 | - } |
1042 | - else |
1043 | - plugin_manager_ui_populate_lists (pm); |
1044 | -} |
1045 | - |
1046 | -static void |
1047 | -brasero_plugin_manager_ui_finalize (GObject *object) |
1048 | -{ |
1049 | - BraseroPluginManagerUI *pm = BRASERO_PLUGIN_MANAGER_UI (object); |
1050 | - BraseroPluginManagerUIPrivate *priv; |
1051 | - |
1052 | - priv = BRASERO_PLUGIN_MANAGER_UI_GET_PRIVATE (pm); |
1053 | - |
1054 | - if (priv->plugins) { |
1055 | - g_slist_foreach (priv->plugins, (GFunc) g_object_unref, NULL); |
1056 | - g_slist_free (priv->plugins); |
1057 | - priv->plugins = NULL; |
1058 | - } |
1059 | - |
1060 | - if (priv->popup_menu) |
1061 | - gtk_widget_destroy (priv->popup_menu); |
1062 | - |
1063 | - G_OBJECT_CLASS (brasero_plugin_manager_ui_parent_class)->finalize (object); |
1064 | - |
1065 | -} |
1066 | - |
1067 | -GtkWidget *brasero_plugin_manager_ui_new (void) |
1068 | -{ |
1069 | - return g_object_new (BRASERO_TYPE_PLUGIN_MANAGER_UI,0); |
1070 | -} |
1071 | |
1072 | === modified file '.pc/applied-patches' |
1073 | --- .pc/applied-patches 2014-11-07 11:33:39 +0000 |
1074 | +++ .pc/applied-patches 2014-11-15 21:17:54 +0000 |
1075 | @@ -1,3 +1,2 @@ |
1076 | 012_appindicator.patch |
1077 | 013_unity_launcher_progress.patch |
1078 | -01_fix-plugin-dialog-segfault.patch |
1079 | |
1080 | === modified file 'ChangeLog' |
1081 | --- ChangeLog 2014-11-07 11:33:39 +0000 |
1082 | +++ ChangeLog 2014-11-15 21:17:54 +0000 |
1083 | @@ -1,5 +1,118 @@ |
1084 | # Generated by Makefile. Do not edit. |
1085 | |
1086 | +commit 2d2d4be966d5a76ee5e78f77863b6403ee9c7b34 |
1087 | +Author: Laurent Bigonville <bigon@bigon.be> |
1088 | +Date: Sat Oct 4 15:31:19 2014 +0200 |
1089 | + |
1090 | + Fix segfault when displaying the plugin dialog |
1091 | + |
1092 | + This partially revert changes from |
1093 | + 426841b445f8f62191f2b0569088e0da15c42068 |
1094 | + |
1095 | + https://bugzilla.gnome.org/show_bug.cgi?id=728376 |
1096 | + |
1097 | + src/brasero-plugin-manager-ui.c | 6 +----- |
1098 | + 1 file changed, 1 insertion(+), 5 deletions(-) |
1099 | + |
1100 | +commit ecffe2800b651ee3b4e2c1c8264f787329bb802b |
1101 | +Author: Timo Jyrinki <timo@debian.org> |
1102 | +Date: Mon Nov 3 18:43:41 2014 +0200 |
1103 | + |
1104 | + Change Finnish translation team web page to l10n.gnome.org |
1105 | + |
1106 | + po/fi.po | 2 +- |
1107 | + 1 file changed, 1 insertion(+), 1 deletion(-) |
1108 | + |
1109 | +commit 283b67aad7130012a078a2bce95022923f814e83 |
1110 | +Author: Seong-ho Cho <shcho@gnome.org> |
1111 | +Date: Sat Oct 4 22:43:04 2014 +0900 |
1112 | + |
1113 | + Updated Korean help translation |
1114 | + |
1115 | + help/ko/figures/brasero-main-window.png | Bin 0 -> 66110 bytes |
1116 | + 1 file changed, 0 insertions(+), 0 deletions(-) |
1117 | + |
1118 | +commit d5927682bb8ab7be7051edfe389cfbe428c76bf8 |
1119 | +Author: Krasimir Chonov <mk2616@abv.bg> |
1120 | +Date: Thu Oct 2 06:49:42 2014 +0300 |
1121 | + |
1122 | + Updated Bulgarian translation |
1123 | + |
1124 | + po/bg.po | 814 +++++++++++++++++++++++++++++++-------------------------------- |
1125 | + 1 file changed, 396 insertions(+), 418 deletions(-) |
1126 | + |
1127 | +commit 14f3126ae370242af3f52ec5070f6302f0f4341c |
1128 | +Author: Krishnababu Krothapalli <k.meetme@gmail.com> |
1129 | +Date: Tue Sep 23 14:22:45 2014 +0000 |
1130 | + |
1131 | + Updated Telugu translation |
1132 | + |
1133 | + po/te.po | 362 +++++++++++++++++++++++++++++++++++++++++++-------------------- |
1134 | + 1 file changed, 247 insertions(+), 115 deletions(-) |
1135 | + |
1136 | +commit 4df12008fd28c2603bcda25dc3ec8451d3e85297 |
1137 | +Author: Friedel Wolff <friedel@translate.org.za> |
1138 | +Date: Tue Sep 23 15:59:31 2014 +0200 |
1139 | + |
1140 | + Updated translation for Afrikaans (af) |
1141 | + |
1142 | + po/af.po | 6394 +++++++++++++++++++++++++++++++------------------------------- |
1143 | + 1 file changed, 3238 insertions(+), 3156 deletions(-) |
1144 | + |
1145 | +commit c7264631b3417a9fa68df66828978ad178ed76b9 |
1146 | +Author: Maria Mavridou <mavridou@gmail.com> |
1147 | +Date: Sun Sep 21 13:40:58 2014 +0000 |
1148 | + |
1149 | + Updated Greek translation |
1150 | + |
1151 | + po/el.po | 678 ++++++++++++++++++++++++++++++--------------------------------- |
1152 | + 1 file changed, 328 insertions(+), 350 deletions(-) |
1153 | + |
1154 | +commit faf9ba38cde86f7b0ec656ed84383096a2772af8 |
1155 | +Author: Kenneth Nielsen <k.nielsen81@gmail.com> |
1156 | +Date: Sun Sep 21 14:53:08 2014 +0200 |
1157 | + |
1158 | + Updated Danish translation |
1159 | + |
1160 | + po/da.po | 10 +++++----- |
1161 | + 1 file changed, 5 insertions(+), 5 deletions(-) |
1162 | + |
1163 | +commit 844d87fde3671d38f5e073cc94a224f3ed53d648 |
1164 | +Author: Andika Triwidada <andika@gmail.com> |
1165 | +Date: Wed Sep 17 13:23:28 2014 +0000 |
1166 | + |
1167 | + Updated Indonesian translation |
1168 | + |
1169 | + help/id/id.po | 95 +++++++++++++++++++++++++++++------------------------------ |
1170 | + 1 file changed, 46 insertions(+), 49 deletions(-) |
1171 | + |
1172 | +commit eb05201fd2575b8e34d259cf9b2fe76839c9a40f |
1173 | +Author: Rajesh Ranjan <rajeshkajha@yahoo.com> |
1174 | +Date: Wed Sep 17 06:05:07 2014 +0000 |
1175 | + |
1176 | + Updated Hindi translation |
1177 | + |
1178 | + po/hi.po | 794 +++++++++++++++++++++++++++++++++++---------------------------- |
1179 | + 1 file changed, 448 insertions(+), 346 deletions(-) |
1180 | + |
1181 | +commit 7c1b54fb178086d6fa2de35caf83849a8caeb8eb |
1182 | +Author: Anders Jonsson <anders.jonsson@norsjovallen.se> |
1183 | +Date: Sun Sep 14 12:36:31 2014 +0000 |
1184 | + |
1185 | + Updated Swedish translation |
1186 | + |
1187 | + po/sv.po | 21 ++++++++------------- |
1188 | + 1 file changed, 8 insertions(+), 13 deletions(-) |
1189 | + |
1190 | +commit 30e635503143447c809d9e763a5dd081b1ba4ec5 |
1191 | +Author: Sandeep Sheshrao Shedmake <sshedmak@redhat.com> |
1192 | +Date: Thu Sep 11 18:45:47 2014 +0530 |
1193 | + |
1194 | + Updated Marathi Translations |
1195 | + |
1196 | + po/mr.po | 545 ++++++++++++++++++++++++++++++++------------------------------- |
1197 | + 1 file changed, 279 insertions(+), 266 deletions(-) |
1198 | + |
1199 | commit 499a24b09369be1d9d1b588bfea394504026e1f0 |
1200 | Author: Matthias Clasen <mclasen@redhat.com> |
1201 | Date: Wed Sep 10 19:59:27 2014 -0400 |
1202 | |
1203 | === modified file 'Makefile.in' |
1204 | --- Makefile.in 2014-11-07 11:33:39 +0000 |
1205 | +++ Makefile.in 2014-11-15 21:17:54 +0000 |
1206 | @@ -86,8 +86,8 @@ |
1207 | $(top_srcdir)/configure $(am__configure_deps) \ |
1208 | $(srcdir)/config.h.in $(srcdir)/libbrasero-media3.pc.in \ |
1209 | $(srcdir)/libbrasero-burn3.pc.in AUTHORS COPYING INSTALL NEWS \ |
1210 | - README compile config.guess config.sub install-sh missing \ |
1211 | - ltmain.sh |
1212 | + README compile config.guess config.sub depcomp install-sh \ |
1213 | + missing ltmain.sh |
1214 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1215 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
1216 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1217 | |
1218 | === modified file 'NEWS' |
1219 | --- NEWS 2014-11-07 11:33:39 +0000 |
1220 | +++ NEWS 2014-11-15 21:17:54 +0000 |
1221 | @@ -1,9 +1,13 @@ |
1222 | +* Brasero 3.12.0 |
1223 | + - Fix crash in plugin dialog |
1224 | + - Translation updates |
1225 | + |
1226 | * Brasero 3.11.4 |
1227 | - Make desktop file validate |
1228 | - Make appdata file validate |
1229 | - Allow building with tracker 1.0 |
1230 | - Fix problem with constructors |
1231 | - - Translation updates |
1232 | + - Translation updates |
1233 | |
1234 | * Brasero 3.11.3 |
1235 | - Indonesian translation of help |
1236 | |
1237 | === modified file 'aclocal.m4' |
1238 | --- aclocal.m4 2014-11-07 11:33:39 +0000 |
1239 | +++ aclocal.m4 2014-11-15 21:17:54 +0000 |
1240 | @@ -20,1169 +20,6 @@ |
1241 | If you have problems, you may need to regenerate the build system entirely. |
1242 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
1243 | |
1244 | -# Copyright (C) 2002-2013 Free Software Foundation, Inc. |
1245 | -# |
1246 | -# This file is free software; the Free Software Foundation |
1247 | -# gives unlimited permission to copy and/or distribute it, |
1248 | -# with or without modifications, as long as this notice is preserved. |
1249 | - |
1250 | -# AM_AUTOMAKE_VERSION(VERSION) |
1251 | -# ---------------------------- |
1252 | -# Automake X.Y traces this macro to ensure aclocal.m4 has been |
1253 | -# generated from the m4 files accompanying Automake X.Y. |
1254 | -# (This private macro should not be called outside this file.) |
1255 | -AC_DEFUN([AM_AUTOMAKE_VERSION], |
1256 | -[am__api_version='1.14' |
1257 | -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
1258 | -dnl require some minimum version. Point them to the right macro. |
1259 | -m4_if([$1], [1.14.1], [], |
1260 | - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
1261 | -]) |
1262 | - |
1263 | -# _AM_AUTOCONF_VERSION(VERSION) |
1264 | -# ----------------------------- |
1265 | -# aclocal traces this macro to find the Autoconf version. |
1266 | -# This is a private macro too. Using m4_define simplifies |
1267 | -# the logic in aclocal, which can simply ignore this definition. |
1268 | -m4_define([_AM_AUTOCONF_VERSION], []) |
1269 | - |
1270 | -# AM_SET_CURRENT_AUTOMAKE_VERSION |
1271 | -# ------------------------------- |
1272 | -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
1273 | -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
1274 | -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
1275 | -[AM_AUTOMAKE_VERSION([1.14.1])dnl |
1276 | -m4_ifndef([AC_AUTOCONF_VERSION], |
1277 | - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1278 | -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
1279 | - |
1280 | -# AM_AUX_DIR_EXPAND -*- Autoconf -*- |
1281 | - |
1282 | -# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1283 | -# |
1284 | -# This file is free software; the Free Software Foundation |
1285 | -# gives unlimited permission to copy and/or distribute it, |
1286 | -# with or without modifications, as long as this notice is preserved. |
1287 | - |
1288 | -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
1289 | -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
1290 | -# '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
1291 | -# |
1292 | -# Of course, Automake must honor this variable whenever it calls a |
1293 | -# tool from the auxiliary directory. The problem is that $srcdir (and |
1294 | -# therefore $ac_aux_dir as well) can be either absolute or relative, |
1295 | -# depending on how configure is run. This is pretty annoying, since |
1296 | -# it makes $ac_aux_dir quite unusable in subdirectories: in the top |
1297 | -# source directory, any form will work fine, but in subdirectories a |
1298 | -# relative path needs to be adjusted first. |
1299 | -# |
1300 | -# $ac_aux_dir/missing |
1301 | -# fails when called from a subdirectory if $ac_aux_dir is relative |
1302 | -# $top_srcdir/$ac_aux_dir/missing |
1303 | -# fails if $ac_aux_dir is absolute, |
1304 | -# fails when called from a subdirectory in a VPATH build with |
1305 | -# a relative $ac_aux_dir |
1306 | -# |
1307 | -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir |
1308 | -# are both prefixed by $srcdir. In an in-source build this is usually |
1309 | -# harmless because $srcdir is '.', but things will broke when you |
1310 | -# start a VPATH build or use an absolute $srcdir. |
1311 | -# |
1312 | -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, |
1313 | -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: |
1314 | -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` |
1315 | -# and then we would define $MISSING as |
1316 | -# MISSING="\${SHELL} $am_aux_dir/missing" |
1317 | -# This will work as long as MISSING is not called from configure, because |
1318 | -# unfortunately $(top_srcdir) has no meaning in configure. |
1319 | -# However there are other variables, like CC, which are often used in |
1320 | -# configure, and could therefore not use this "fixed" $ac_aux_dir. |
1321 | -# |
1322 | -# Another solution, used here, is to always expand $ac_aux_dir to an |
1323 | -# absolute PATH. The drawback is that using absolute paths prevent a |
1324 | -# configured tree to be moved without reconfiguration. |
1325 | - |
1326 | -AC_DEFUN([AM_AUX_DIR_EXPAND], |
1327 | -[dnl Rely on autoconf to set up CDPATH properly. |
1328 | -AC_PREREQ([2.50])dnl |
1329 | -# expand $ac_aux_dir to an absolute path |
1330 | -am_aux_dir=`cd $ac_aux_dir && pwd` |
1331 | -]) |
1332 | - |
1333 | -# AM_CONDITIONAL -*- Autoconf -*- |
1334 | - |
1335 | -# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
1336 | -# |
1337 | -# This file is free software; the Free Software Foundation |
1338 | -# gives unlimited permission to copy and/or distribute it, |
1339 | -# with or without modifications, as long as this notice is preserved. |
1340 | - |
1341 | -# AM_CONDITIONAL(NAME, SHELL-CONDITION) |
1342 | -# ------------------------------------- |
1343 | -# Define a conditional. |
1344 | -AC_DEFUN([AM_CONDITIONAL], |
1345 | -[AC_PREREQ([2.52])dnl |
1346 | - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
1347 | - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
1348 | -AC_SUBST([$1_TRUE])dnl |
1349 | -AC_SUBST([$1_FALSE])dnl |
1350 | -_AM_SUBST_NOTMAKE([$1_TRUE])dnl |
1351 | -_AM_SUBST_NOTMAKE([$1_FALSE])dnl |
1352 | -m4_define([_AM_COND_VALUE_$1], [$2])dnl |
1353 | -if $2; then |
1354 | - $1_TRUE= |
1355 | - $1_FALSE='#' |
1356 | -else |
1357 | - $1_TRUE='#' |
1358 | - $1_FALSE= |
1359 | -fi |
1360 | -AC_CONFIG_COMMANDS_PRE( |
1361 | -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then |
1362 | - AC_MSG_ERROR([[conditional "$1" was never defined. |
1363 | -Usually this means the macro was only invoked conditionally.]]) |
1364 | -fi])]) |
1365 | - |
1366 | -# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
1367 | -# |
1368 | -# This file is free software; the Free Software Foundation |
1369 | -# gives unlimited permission to copy and/or distribute it, |
1370 | -# with or without modifications, as long as this notice is preserved. |
1371 | - |
1372 | - |
1373 | -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be |
1374 | -# written in clear, in which case automake, when reading aclocal.m4, |
1375 | -# will think it sees a *use*, and therefore will trigger all it's |
1376 | -# C support machinery. Also note that it means that autoscan, seeing |
1377 | -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... |
1378 | - |
1379 | - |
1380 | -# _AM_DEPENDENCIES(NAME) |
1381 | -# ---------------------- |
1382 | -# See how the compiler implements dependency checking. |
1383 | -# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". |
1384 | -# We try a few techniques and use that to set a single cache variable. |
1385 | -# |
1386 | -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was |
1387 | -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular |
1388 | -# dependency, and given that the user is not expected to run this macro, |
1389 | -# just rely on AC_PROG_CC. |
1390 | -AC_DEFUN([_AM_DEPENDENCIES], |
1391 | -[AC_REQUIRE([AM_SET_DEPDIR])dnl |
1392 | -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl |
1393 | -AC_REQUIRE([AM_MAKE_INCLUDE])dnl |
1394 | -AC_REQUIRE([AM_DEP_TRACK])dnl |
1395 | - |
1396 | -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], |
1397 | - [$1], [CXX], [depcc="$CXX" am_compiler_list=], |
1398 | - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
1399 | - [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], |
1400 | - [$1], [UPC], [depcc="$UPC" am_compiler_list=], |
1401 | - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
1402 | - [depcc="$$1" am_compiler_list=]) |
1403 | - |
1404 | -AC_CACHE_CHECK([dependency style of $depcc], |
1405 | - [am_cv_$1_dependencies_compiler_type], |
1406 | -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
1407 | - # We make a subdir and do the tests there. Otherwise we can end up |
1408 | - # making bogus files that we don't know about and never remove. For |
1409 | - # instance it was reported that on HP-UX the gcc test will end up |
1410 | - # making a dummy file named 'D' -- because '-MD' means "put the output |
1411 | - # in D". |
1412 | - rm -rf conftest.dir |
1413 | - mkdir conftest.dir |
1414 | - # Copy depcomp to subdir because otherwise we won't find it if we're |
1415 | - # using a relative directory. |
1416 | - cp "$am_depcomp" conftest.dir |
1417 | - cd conftest.dir |
1418 | - # We will build objects and dependencies in a subdirectory because |
1419 | - # it helps to detect inapplicable dependency modes. For instance |
1420 | - # both Tru64's cc and ICC support -MD to output dependencies as a |
1421 | - # side effect of compilation, but ICC will put the dependencies in |
1422 | - # the current directory while Tru64 will put them in the object |
1423 | - # directory. |
1424 | - mkdir sub |
1425 | - |
1426 | - am_cv_$1_dependencies_compiler_type=none |
1427 | - if test "$am_compiler_list" = ""; then |
1428 | - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` |
1429 | - fi |
1430 | - am__universal=false |
1431 | - m4_case([$1], [CC], |
1432 | - [case " $depcc " in #( |
1433 | - *\ -arch\ *\ -arch\ *) am__universal=true ;; |
1434 | - esac], |
1435 | - [CXX], |
1436 | - [case " $depcc " in #( |
1437 | - *\ -arch\ *\ -arch\ *) am__universal=true ;; |
1438 | - esac]) |
1439 | - |
1440 | - for depmode in $am_compiler_list; do |
1441 | - # Setup a source with many dependencies, because some compilers |
1442 | - # like to wrap large dependency lists on column 80 (with \), and |
1443 | - # we should not choose a depcomp mode which is confused by this. |
1444 | - # |
1445 | - # We need to recreate these files for each test, as the compiler may |
1446 | - # overwrite some of them when testing with obscure command lines. |
1447 | - # This happens at least with the AIX C compiler. |
1448 | - : > sub/conftest.c |
1449 | - for i in 1 2 3 4 5 6; do |
1450 | - echo '#include "conftst'$i'.h"' >> sub/conftest.c |
1451 | - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
1452 | - # Solaris 10 /bin/sh. |
1453 | - echo '/* dummy */' > sub/conftst$i.h |
1454 | - done |
1455 | - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
1456 | - |
1457 | - # We check with '-c' and '-o' for the sake of the "dashmstdout" |
1458 | - # mode. It turns out that the SunPro C++ compiler does not properly |
1459 | - # handle '-M -o', and we need to detect this. Also, some Intel |
1460 | - # versions had trouble with output in subdirs. |
1461 | - am__obj=sub/conftest.${OBJEXT-o} |
1462 | - am__minus_obj="-o $am__obj" |
1463 | - case $depmode in |
1464 | - gcc) |
1465 | - # This depmode causes a compiler race in universal mode. |
1466 | - test "$am__universal" = false || continue |
1467 | - ;; |
1468 | - nosideeffect) |
1469 | - # After this tag, mechanisms are not by side-effect, so they'll |
1470 | - # only be used when explicitly requested. |
1471 | - if test "x$enable_dependency_tracking" = xyes; then |
1472 | - continue |
1473 | - else |
1474 | - break |
1475 | - fi |
1476 | - ;; |
1477 | - msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
1478 | - # This compiler won't grok '-c -o', but also, the minuso test has |
1479 | - # not run yet. These depmodes are late enough in the game, and |
1480 | - # so weak that their functioning should not be impacted. |
1481 | - am__obj=conftest.${OBJEXT-o} |
1482 | - am__minus_obj= |
1483 | - ;; |
1484 | - none) break ;; |
1485 | - esac |
1486 | - if depmode=$depmode \ |
1487 | - source=sub/conftest.c object=$am__obj \ |
1488 | - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
1489 | - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ |
1490 | - >/dev/null 2>conftest.err && |
1491 | - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
1492 | - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
1493 | - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && |
1494 | - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
1495 | - # icc doesn't choke on unknown options, it will just issue warnings |
1496 | - # or remarks (even with -Werror). So we grep stderr for any message |
1497 | - # that says an option was ignored or not supported. |
1498 | - # When given -MP, icc 7.0 and 7.1 complain thusly: |
1499 | - # icc: Command line warning: ignoring option '-M'; no argument required |
1500 | - # The diagnosis changed in icc 8.0: |
1501 | - # icc: Command line remark: option '-MP' not supported |
1502 | - if (grep 'ignoring option' conftest.err || |
1503 | - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else |
1504 | - am_cv_$1_dependencies_compiler_type=$depmode |
1505 | - break |
1506 | - fi |
1507 | - fi |
1508 | - done |
1509 | - |
1510 | - cd .. |
1511 | - rm -rf conftest.dir |
1512 | -else |
1513 | - am_cv_$1_dependencies_compiler_type=none |
1514 | -fi |
1515 | -]) |
1516 | -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) |
1517 | -AM_CONDITIONAL([am__fastdep$1], [ |
1518 | - test "x$enable_dependency_tracking" != xno \ |
1519 | - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) |
1520 | -]) |
1521 | - |
1522 | - |
1523 | -# AM_SET_DEPDIR |
1524 | -# ------------- |
1525 | -# Choose a directory name for dependency files. |
1526 | -# This macro is AC_REQUIREd in _AM_DEPENDENCIES. |
1527 | -AC_DEFUN([AM_SET_DEPDIR], |
1528 | -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
1529 | -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl |
1530 | -]) |
1531 | - |
1532 | - |
1533 | -# AM_DEP_TRACK |
1534 | -# ------------ |
1535 | -AC_DEFUN([AM_DEP_TRACK], |
1536 | -[AC_ARG_ENABLE([dependency-tracking], [dnl |
1537 | -AS_HELP_STRING( |
1538 | - [--enable-dependency-tracking], |
1539 | - [do not reject slow dependency extractors]) |
1540 | -AS_HELP_STRING( |
1541 | - [--disable-dependency-tracking], |
1542 | - [speeds up one-time build])]) |
1543 | -if test "x$enable_dependency_tracking" != xno; then |
1544 | - am_depcomp="$ac_aux_dir/depcomp" |
1545 | - AMDEPBACKSLASH='\' |
1546 | - am__nodep='_no' |
1547 | -fi |
1548 | -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
1549 | -AC_SUBST([AMDEPBACKSLASH])dnl |
1550 | -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
1551 | -AC_SUBST([am__nodep])dnl |
1552 | -_AM_SUBST_NOTMAKE([am__nodep])dnl |
1553 | -]) |
1554 | - |
1555 | -# Generate code to set up dependency tracking. -*- Autoconf -*- |
1556 | - |
1557 | -# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
1558 | -# |
1559 | -# This file is free software; the Free Software Foundation |
1560 | -# gives unlimited permission to copy and/or distribute it, |
1561 | -# with or without modifications, as long as this notice is preserved. |
1562 | - |
1563 | - |
1564 | -# _AM_OUTPUT_DEPENDENCY_COMMANDS |
1565 | -# ------------------------------ |
1566 | -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
1567 | -[{ |
1568 | - # Older Autoconf quotes --file arguments for eval, but not when files |
1569 | - # are listed without --file. Let's play safe and only enable the eval |
1570 | - # if we detect the quoting. |
1571 | - case $CONFIG_FILES in |
1572 | - *\'*) eval set x "$CONFIG_FILES" ;; |
1573 | - *) set x $CONFIG_FILES ;; |
1574 | - esac |
1575 | - shift |
1576 | - for mf |
1577 | - do |
1578 | - # Strip MF so we end up with the name of the file. |
1579 | - mf=`echo "$mf" | sed -e 's/:.*$//'` |
1580 | - # Check whether this is an Automake generated Makefile or not. |
1581 | - # We used to match only the files named 'Makefile.in', but |
1582 | - # some people rename them; so instead we look at the file content. |
1583 | - # Grep'ing the first line is not enough: some people post-process |
1584 | - # each Makefile.in and add a new line on top of each file to say so. |
1585 | - # Grep'ing the whole file is not good either: AIX grep has a line |
1586 | - # limit of 2048, but all sed's we know have understand at least 4000. |
1587 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
1588 | - dirpart=`AS_DIRNAME("$mf")` |
1589 | - else |
1590 | - continue |
1591 | - fi |
1592 | - # Extract the definition of DEPDIR, am__include, and am__quote |
1593 | - # from the Makefile without running 'make'. |
1594 | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
1595 | - test -z "$DEPDIR" && continue |
1596 | - am__include=`sed -n 's/^am__include = //p' < "$mf"` |
1597 | - test -z "$am__include" && continue |
1598 | - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
1599 | - # Find all dependency output files, they are included files with |
1600 | - # $(DEPDIR) in their names. We invoke sed twice because it is the |
1601 | - # simplest approach to changing $(DEPDIR) to its actual value in the |
1602 | - # expansion. |
1603 | - for file in `sed -n " |
1604 | - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
1605 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
1606 | - # Make sure the directory exists. |
1607 | - test -f "$dirpart/$file" && continue |
1608 | - fdir=`AS_DIRNAME(["$file"])` |
1609 | - AS_MKDIR_P([$dirpart/$fdir]) |
1610 | - # echo "creating $dirpart/$file" |
1611 | - echo '# dummy' > "$dirpart/$file" |
1612 | - done |
1613 | - done |
1614 | -} |
1615 | -])# _AM_OUTPUT_DEPENDENCY_COMMANDS |
1616 | - |
1617 | - |
1618 | -# AM_OUTPUT_DEPENDENCY_COMMANDS |
1619 | -# ----------------------------- |
1620 | -# This macro should only be invoked once -- use via AC_REQUIRE. |
1621 | -# |
1622 | -# This code is only required when automatic dependency tracking |
1623 | -# is enabled. FIXME. This creates each '.P' file that we will |
1624 | -# need in order to bootstrap the dependency handling code. |
1625 | -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
1626 | -[AC_CONFIG_COMMANDS([depfiles], |
1627 | - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], |
1628 | - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
1629 | -]) |
1630 | - |
1631 | -# Do all the work for Automake. -*- Autoconf -*- |
1632 | - |
1633 | -# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
1634 | -# |
1635 | -# This file is free software; the Free Software Foundation |
1636 | -# gives unlimited permission to copy and/or distribute it, |
1637 | -# with or without modifications, as long as this notice is preserved. |
1638 | - |
1639 | -# This macro actually does too much. Some checks are only needed if |
1640 | -# your package does certain things. But this isn't really a big deal. |
1641 | - |
1642 | -dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. |
1643 | -m4_define([AC_PROG_CC], |
1644 | -m4_defn([AC_PROG_CC]) |
1645 | -[_AM_PROG_CC_C_O |
1646 | -]) |
1647 | - |
1648 | -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
1649 | -# AM_INIT_AUTOMAKE([OPTIONS]) |
1650 | -# ----------------------------------------------- |
1651 | -# The call with PACKAGE and VERSION arguments is the old style |
1652 | -# call (pre autoconf-2.50), which is being phased out. PACKAGE |
1653 | -# and VERSION should now be passed to AC_INIT and removed from |
1654 | -# the call to AM_INIT_AUTOMAKE. |
1655 | -# We support both call styles for the transition. After |
1656 | -# the next Automake release, Autoconf can make the AC_INIT |
1657 | -# arguments mandatory, and then we can depend on a new Autoconf |
1658 | -# release and drop the old call support. |
1659 | -AC_DEFUN([AM_INIT_AUTOMAKE], |
1660 | -[AC_PREREQ([2.65])dnl |
1661 | -dnl Autoconf wants to disallow AM_ names. We explicitly allow |
1662 | -dnl the ones we care about. |
1663 | -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
1664 | -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl |
1665 | -AC_REQUIRE([AC_PROG_INSTALL])dnl |
1666 | -if test "`cd $srcdir && pwd`" != "`pwd`"; then |
1667 | - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output |
1668 | - # is not polluted with repeated "-I." |
1669 | - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl |
1670 | - # test to see if srcdir already configured |
1671 | - if test -f $srcdir/config.status; then |
1672 | - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) |
1673 | - fi |
1674 | -fi |
1675 | - |
1676 | -# test whether we have cygpath |
1677 | -if test -z "$CYGPATH_W"; then |
1678 | - if (cygpath --version) >/dev/null 2>/dev/null; then |
1679 | - CYGPATH_W='cygpath -w' |
1680 | - else |
1681 | - CYGPATH_W=echo |
1682 | - fi |
1683 | -fi |
1684 | -AC_SUBST([CYGPATH_W]) |
1685 | - |
1686 | -# Define the identity of the package. |
1687 | -dnl Distinguish between old-style and new-style calls. |
1688 | -m4_ifval([$2], |
1689 | -[AC_DIAGNOSE([obsolete], |
1690 | - [$0: two- and three-arguments forms are deprecated.]) |
1691 | -m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
1692 | - AC_SUBST([PACKAGE], [$1])dnl |
1693 | - AC_SUBST([VERSION], [$2])], |
1694 | -[_AM_SET_OPTIONS([$1])dnl |
1695 | -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
1696 | -m4_if( |
1697 | - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), |
1698 | - [ok:ok],, |
1699 | - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
1700 | - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
1701 | - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
1702 | - |
1703 | -_AM_IF_OPTION([no-define],, |
1704 | -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) |
1705 | - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl |
1706 | - |
1707 | -# Some tools Automake needs. |
1708 | -AC_REQUIRE([AM_SANITY_CHECK])dnl |
1709 | -AC_REQUIRE([AC_ARG_PROGRAM])dnl |
1710 | -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) |
1711 | -AM_MISSING_PROG([AUTOCONF], [autoconf]) |
1712 | -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) |
1713 | -AM_MISSING_PROG([AUTOHEADER], [autoheader]) |
1714 | -AM_MISSING_PROG([MAKEINFO], [makeinfo]) |
1715 | -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
1716 | -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
1717 | -AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
1718 | -# For better backward compatibility. To be removed once Automake 1.9.x |
1719 | -# dies out for good. For more background, see: |
1720 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
1721 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
1722 | -AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
1723 | -# We need awk for the "check" target. The system "awk" is bad on |
1724 | -# some platforms. |
1725 | -AC_REQUIRE([AC_PROG_AWK])dnl |
1726 | -AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
1727 | -AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
1728 | -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], |
1729 | - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], |
1730 | - [_AM_PROG_TAR([v7])])]) |
1731 | -_AM_IF_OPTION([no-dependencies],, |
1732 | -[AC_PROVIDE_IFELSE([AC_PROG_CC], |
1733 | - [_AM_DEPENDENCIES([CC])], |
1734 | - [m4_define([AC_PROG_CC], |
1735 | - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl |
1736 | -AC_PROVIDE_IFELSE([AC_PROG_CXX], |
1737 | - [_AM_DEPENDENCIES([CXX])], |
1738 | - [m4_define([AC_PROG_CXX], |
1739 | - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl |
1740 | -AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
1741 | - [_AM_DEPENDENCIES([OBJC])], |
1742 | - [m4_define([AC_PROG_OBJC], |
1743 | - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
1744 | -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
1745 | - [_AM_DEPENDENCIES([OBJCXX])], |
1746 | - [m4_define([AC_PROG_OBJCXX], |
1747 | - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl |
1748 | -]) |
1749 | -AC_REQUIRE([AM_SILENT_RULES])dnl |
1750 | -dnl The testsuite driver may need to know about EXEEXT, so add the |
1751 | -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This |
1752 | -dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. |
1753 | -AC_CONFIG_COMMANDS_PRE(dnl |
1754 | -[m4_provide_if([_AM_COMPILER_EXEEXT], |
1755 | - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
1756 | - |
1757 | -# POSIX will say in a future version that running "rm -f" with no argument |
1758 | -# is OK; and we want to be able to make that assumption in our Makefile |
1759 | -# recipes. So use an aggressive probe to check that the usage we want is |
1760 | -# actually supported "in the wild" to an acceptable degree. |
1761 | -# See automake bug#10828. |
1762 | -# To make any issue more visible, cause the running configure to be aborted |
1763 | -# by default if the 'rm' program in use doesn't match our expectations; the |
1764 | -# user can still override this though. |
1765 | -if rm -f && rm -fr && rm -rf; then : OK; else |
1766 | - cat >&2 <<'END' |
1767 | -Oops! |
1768 | - |
1769 | -Your 'rm' program seems unable to run without file operands specified |
1770 | -on the command line, even when the '-f' option is present. This is contrary |
1771 | -to the behaviour of most rm programs out there, and not conforming with |
1772 | -the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
1773 | - |
1774 | -Please tell bug-automake@gnu.org about your system, including the value |
1775 | -of your $PATH and any error possibly output before this message. This |
1776 | -can help us improve future automake versions. |
1777 | - |
1778 | -END |
1779 | - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
1780 | - echo 'Configuration will proceed anyway, since you have set the' >&2 |
1781 | - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
1782 | - echo >&2 |
1783 | - else |
1784 | - cat >&2 <<'END' |
1785 | -Aborting the configuration process, to ensure you take notice of the issue. |
1786 | - |
1787 | -You can download and install GNU coreutils to get an 'rm' implementation |
1788 | -that behaves properly: <http://www.gnu.org/software/coreutils/>. |
1789 | - |
1790 | -If you want to complete the configuration process using your problematic |
1791 | -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
1792 | -to "yes", and re-run configure. |
1793 | - |
1794 | -END |
1795 | - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
1796 | - fi |
1797 | -fi]) |
1798 | - |
1799 | -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
1800 | -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
1801 | -dnl mangled by Autoconf and run in a shell conditional statement. |
1802 | -m4_define([_AC_COMPILER_EXEEXT], |
1803 | -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
1804 | - |
1805 | -# When config.status generates a header, we must update the stamp-h file. |
1806 | -# This file resides in the same directory as the config header |
1807 | -# that is generated. The stamp files are numbered to have different names. |
1808 | - |
1809 | -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the |
1810 | -# loop where config.status creates the headers, so we can generate |
1811 | -# our stamp files there. |
1812 | -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], |
1813 | -[# Compute $1's index in $config_headers. |
1814 | -_am_arg=$1 |
1815 | -_am_stamp_count=1 |
1816 | -for _am_header in $config_headers :; do |
1817 | - case $_am_header in |
1818 | - $_am_arg | $_am_arg:* ) |
1819 | - break ;; |
1820 | - * ) |
1821 | - _am_stamp_count=`expr $_am_stamp_count + 1` ;; |
1822 | - esac |
1823 | -done |
1824 | -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
1825 | - |
1826 | -# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1827 | -# |
1828 | -# This file is free software; the Free Software Foundation |
1829 | -# gives unlimited permission to copy and/or distribute it, |
1830 | -# with or without modifications, as long as this notice is preserved. |
1831 | - |
1832 | -# AM_PROG_INSTALL_SH |
1833 | -# ------------------ |
1834 | -# Define $install_sh. |
1835 | -AC_DEFUN([AM_PROG_INSTALL_SH], |
1836 | -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
1837 | -if test x"${install_sh}" != xset; then |
1838 | - case $am_aux_dir in |
1839 | - *\ * | *\ *) |
1840 | - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; |
1841 | - *) |
1842 | - install_sh="\${SHELL} $am_aux_dir/install-sh" |
1843 | - esac |
1844 | -fi |
1845 | -AC_SUBST([install_sh])]) |
1846 | - |
1847 | -# Copyright (C) 2003-2013 Free Software Foundation, Inc. |
1848 | -# |
1849 | -# This file is free software; the Free Software Foundation |
1850 | -# gives unlimited permission to copy and/or distribute it, |
1851 | -# with or without modifications, as long as this notice is preserved. |
1852 | - |
1853 | -# Check whether the underlying file-system supports filenames |
1854 | -# with a leading dot. For instance MS-DOS doesn't. |
1855 | -AC_DEFUN([AM_SET_LEADING_DOT], |
1856 | -[rm -rf .tst 2>/dev/null |
1857 | -mkdir .tst 2>/dev/null |
1858 | -if test -d .tst; then |
1859 | - am__leading_dot=. |
1860 | -else |
1861 | - am__leading_dot=_ |
1862 | -fi |
1863 | -rmdir .tst 2>/dev/null |
1864 | -AC_SUBST([am__leading_dot])]) |
1865 | - |
1866 | -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
1867 | -# From Jim Meyering |
1868 | - |
1869 | -# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
1870 | -# |
1871 | -# This file is free software; the Free Software Foundation |
1872 | -# gives unlimited permission to copy and/or distribute it, |
1873 | -# with or without modifications, as long as this notice is preserved. |
1874 | - |
1875 | -# AM_MAINTAINER_MODE([DEFAULT-MODE]) |
1876 | -# ---------------------------------- |
1877 | -# Control maintainer-specific portions of Makefiles. |
1878 | -# Default is to disable them, unless 'enable' is passed literally. |
1879 | -# For symmetry, 'disable' may be passed as well. Anyway, the user |
1880 | -# can override the default with the --enable/--disable switch. |
1881 | -AC_DEFUN([AM_MAINTAINER_MODE], |
1882 | -[m4_case(m4_default([$1], [disable]), |
1883 | - [enable], [m4_define([am_maintainer_other], [disable])], |
1884 | - [disable], [m4_define([am_maintainer_other], [enable])], |
1885 | - [m4_define([am_maintainer_other], [enable]) |
1886 | - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) |
1887 | -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
1888 | - dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
1889 | - AC_ARG_ENABLE([maintainer-mode], |
1890 | - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], |
1891 | - am_maintainer_other[ make rules and dependencies not useful |
1892 | - (and sometimes confusing) to the casual installer])], |
1893 | - [USE_MAINTAINER_MODE=$enableval], |
1894 | - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
1895 | - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) |
1896 | - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) |
1897 | - MAINT=$MAINTAINER_MODE_TRUE |
1898 | - AC_SUBST([MAINT])dnl |
1899 | -] |
1900 | -) |
1901 | - |
1902 | -# Check to see how 'make' treats includes. -*- Autoconf -*- |
1903 | - |
1904 | -# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1905 | -# |
1906 | -# This file is free software; the Free Software Foundation |
1907 | -# gives unlimited permission to copy and/or distribute it, |
1908 | -# with or without modifications, as long as this notice is preserved. |
1909 | - |
1910 | -# AM_MAKE_INCLUDE() |
1911 | -# ----------------- |
1912 | -# Check to see how make treats includes. |
1913 | -AC_DEFUN([AM_MAKE_INCLUDE], |
1914 | -[am_make=${MAKE-make} |
1915 | -cat > confinc << 'END' |
1916 | -am__doit: |
1917 | - @echo this is the am__doit target |
1918 | -.PHONY: am__doit |
1919 | -END |
1920 | -# If we don't find an include directive, just comment out the code. |
1921 | -AC_MSG_CHECKING([for style of include used by $am_make]) |
1922 | -am__include="#" |
1923 | -am__quote= |
1924 | -_am_result=none |
1925 | -# First try GNU make style include. |
1926 | -echo "include confinc" > confmf |
1927 | -# Ignore all kinds of additional output from 'make'. |
1928 | -case `$am_make -s -f confmf 2> /dev/null` in #( |
1929 | -*the\ am__doit\ target*) |
1930 | - am__include=include |
1931 | - am__quote= |
1932 | - _am_result=GNU |
1933 | - ;; |
1934 | -esac |
1935 | -# Now try BSD make style include. |
1936 | -if test "$am__include" = "#"; then |
1937 | - echo '.include "confinc"' > confmf |
1938 | - case `$am_make -s -f confmf 2> /dev/null` in #( |
1939 | - *the\ am__doit\ target*) |
1940 | - am__include=.include |
1941 | - am__quote="\"" |
1942 | - _am_result=BSD |
1943 | - ;; |
1944 | - esac |
1945 | -fi |
1946 | -AC_SUBST([am__include]) |
1947 | -AC_SUBST([am__quote]) |
1948 | -AC_MSG_RESULT([$_am_result]) |
1949 | -rm -f confinc confmf |
1950 | -]) |
1951 | - |
1952 | -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
1953 | - |
1954 | -# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
1955 | -# |
1956 | -# This file is free software; the Free Software Foundation |
1957 | -# gives unlimited permission to copy and/or distribute it, |
1958 | -# with or without modifications, as long as this notice is preserved. |
1959 | - |
1960 | -# AM_MISSING_PROG(NAME, PROGRAM) |
1961 | -# ------------------------------ |
1962 | -AC_DEFUN([AM_MISSING_PROG], |
1963 | -[AC_REQUIRE([AM_MISSING_HAS_RUN]) |
1964 | -$1=${$1-"${am_missing_run}$2"} |
1965 | -AC_SUBST($1)]) |
1966 | - |
1967 | -# AM_MISSING_HAS_RUN |
1968 | -# ------------------ |
1969 | -# Define MISSING if not defined so far and test if it is modern enough. |
1970 | -# If it is, set am_missing_run to use it, otherwise, to nothing. |
1971 | -AC_DEFUN([AM_MISSING_HAS_RUN], |
1972 | -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
1973 | -AC_REQUIRE_AUX_FILE([missing])dnl |
1974 | -if test x"${MISSING+set}" != xset; then |
1975 | - case $am_aux_dir in |
1976 | - *\ * | *\ *) |
1977 | - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; |
1978 | - *) |
1979 | - MISSING="\${SHELL} $am_aux_dir/missing" ;; |
1980 | - esac |
1981 | -fi |
1982 | -# Use eval to expand $SHELL |
1983 | -if eval "$MISSING --is-lightweight"; then |
1984 | - am_missing_run="$MISSING " |
1985 | -else |
1986 | - am_missing_run= |
1987 | - AC_MSG_WARN(['missing' script is too old or missing]) |
1988 | -fi |
1989 | -]) |
1990 | - |
1991 | -# Helper functions for option handling. -*- Autoconf -*- |
1992 | - |
1993 | -# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1994 | -# |
1995 | -# This file is free software; the Free Software Foundation |
1996 | -# gives unlimited permission to copy and/or distribute it, |
1997 | -# with or without modifications, as long as this notice is preserved. |
1998 | - |
1999 | -# _AM_MANGLE_OPTION(NAME) |
2000 | -# ----------------------- |
2001 | -AC_DEFUN([_AM_MANGLE_OPTION], |
2002 | -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
2003 | - |
2004 | -# _AM_SET_OPTION(NAME) |
2005 | -# -------------------- |
2006 | -# Set option NAME. Presently that only means defining a flag for this option. |
2007 | -AC_DEFUN([_AM_SET_OPTION], |
2008 | -[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) |
2009 | - |
2010 | -# _AM_SET_OPTIONS(OPTIONS) |
2011 | -# ------------------------ |
2012 | -# OPTIONS is a space-separated list of Automake options. |
2013 | -AC_DEFUN([_AM_SET_OPTIONS], |
2014 | -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
2015 | - |
2016 | -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) |
2017 | -# ------------------------------------------- |
2018 | -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. |
2019 | -AC_DEFUN([_AM_IF_OPTION], |
2020 | -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
2021 | - |
2022 | -# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
2023 | -# |
2024 | -# This file is free software; the Free Software Foundation |
2025 | -# gives unlimited permission to copy and/or distribute it, |
2026 | -# with or without modifications, as long as this notice is preserved. |
2027 | - |
2028 | -# _AM_PROG_CC_C_O |
2029 | -# --------------- |
2030 | -# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC |
2031 | -# to automatically call this. |
2032 | -AC_DEFUN([_AM_PROG_CC_C_O], |
2033 | -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
2034 | -AC_REQUIRE_AUX_FILE([compile])dnl |
2035 | -AC_LANG_PUSH([C])dnl |
2036 | -AC_CACHE_CHECK( |
2037 | - [whether $CC understands -c and -o together], |
2038 | - [am_cv_prog_cc_c_o], |
2039 | - [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) |
2040 | - # Make sure it works both with $CC and with simple cc. |
2041 | - # Following AC_PROG_CC_C_O, we do the test twice because some |
2042 | - # compilers refuse to overwrite an existing .o file with -o, |
2043 | - # though they will create one. |
2044 | - am_cv_prog_cc_c_o=yes |
2045 | - for am_i in 1 2; do |
2046 | - if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ |
2047 | - && test -f conftest2.$ac_objext; then |
2048 | - : OK |
2049 | - else |
2050 | - am_cv_prog_cc_c_o=no |
2051 | - break |
2052 | - fi |
2053 | - done |
2054 | - rm -f core conftest* |
2055 | - unset am_i]) |
2056 | -if test "$am_cv_prog_cc_c_o" != yes; then |
2057 | - # Losing compiler, so override with the script. |
2058 | - # FIXME: It is wrong to rewrite CC. |
2059 | - # But if we don't then we get into trouble of one sort or another. |
2060 | - # A longer-term fix would be to have automake use am__CC in this case, |
2061 | - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
2062 | - CC="$am_aux_dir/compile $CC" |
2063 | -fi |
2064 | -AC_LANG_POP([C])]) |
2065 | - |
2066 | -# For backward compatibility. |
2067 | -AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
2068 | - |
2069 | -# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
2070 | -# |
2071 | -# This file is free software; the Free Software Foundation |
2072 | -# gives unlimited permission to copy and/or distribute it, |
2073 | -# with or without modifications, as long as this notice is preserved. |
2074 | - |
2075 | -# AM_RUN_LOG(COMMAND) |
2076 | -# ------------------- |
2077 | -# Run COMMAND, save the exit status in ac_status, and log it. |
2078 | -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) |
2079 | -AC_DEFUN([AM_RUN_LOG], |
2080 | -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD |
2081 | - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD |
2082 | - ac_status=$? |
2083 | - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2084 | - (exit $ac_status); }]) |
2085 | - |
2086 | -# Check to make sure that the build environment is sane. -*- Autoconf -*- |
2087 | - |
2088 | -# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
2089 | -# |
2090 | -# This file is free software; the Free Software Foundation |
2091 | -# gives unlimited permission to copy and/or distribute it, |
2092 | -# with or without modifications, as long as this notice is preserved. |
2093 | - |
2094 | -# AM_SANITY_CHECK |
2095 | -# --------------- |
2096 | -AC_DEFUN([AM_SANITY_CHECK], |
2097 | -[AC_MSG_CHECKING([whether build environment is sane]) |
2098 | -# Reject unsafe characters in $srcdir or the absolute working directory |
2099 | -# name. Accept space and tab only in the latter. |
2100 | -am_lf=' |
2101 | -' |
2102 | -case `pwd` in |
2103 | - *[[\\\"\#\$\&\'\`$am_lf]]*) |
2104 | - AC_MSG_ERROR([unsafe absolute working directory name]);; |
2105 | -esac |
2106 | -case $srcdir in |
2107 | - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) |
2108 | - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; |
2109 | -esac |
2110 | - |
2111 | -# Do 'set' in a subshell so we don't clobber the current shell's |
2112 | -# arguments. Must try -L first in case configure is actually a |
2113 | -# symlink; some systems play weird games with the mod time of symlinks |
2114 | -# (eg FreeBSD returns the mod time of the symlink's containing |
2115 | -# directory). |
2116 | -if ( |
2117 | - am_has_slept=no |
2118 | - for am_try in 1 2; do |
2119 | - echo "timestamp, slept: $am_has_slept" > conftest.file |
2120 | - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
2121 | - if test "$[*]" = "X"; then |
2122 | - # -L didn't work. |
2123 | - set X `ls -t "$srcdir/configure" conftest.file` |
2124 | - fi |
2125 | - if test "$[*]" != "X $srcdir/configure conftest.file" \ |
2126 | - && test "$[*]" != "X conftest.file $srcdir/configure"; then |
2127 | - |
2128 | - # If neither matched, then we have a broken ls. This can happen |
2129 | - # if, for instance, CONFIG_SHELL is bash and it inherits a |
2130 | - # broken ls alias from the environment. This has actually |
2131 | - # happened. Such a system could not be considered "sane". |
2132 | - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
2133 | - alias in your environment]) |
2134 | - fi |
2135 | - if test "$[2]" = conftest.file || test $am_try -eq 2; then |
2136 | - break |
2137 | - fi |
2138 | - # Just in case. |
2139 | - sleep 1 |
2140 | - am_has_slept=yes |
2141 | - done |
2142 | - test "$[2]" = conftest.file |
2143 | - ) |
2144 | -then |
2145 | - # Ok. |
2146 | - : |
2147 | -else |
2148 | - AC_MSG_ERROR([newly created file is older than distributed files! |
2149 | -Check your system clock]) |
2150 | -fi |
2151 | -AC_MSG_RESULT([yes]) |
2152 | -# If we didn't sleep, we still need to ensure time stamps of config.status and |
2153 | -# generated files are strictly newer. |
2154 | -am_sleep_pid= |
2155 | -if grep 'slept: no' conftest.file >/dev/null 2>&1; then |
2156 | - ( sleep 1 ) & |
2157 | - am_sleep_pid=$! |
2158 | -fi |
2159 | -AC_CONFIG_COMMANDS_PRE( |
2160 | - [AC_MSG_CHECKING([that generated files are newer than configure]) |
2161 | - if test -n "$am_sleep_pid"; then |
2162 | - # Hide warnings about reused PIDs. |
2163 | - wait $am_sleep_pid 2>/dev/null |
2164 | - fi |
2165 | - AC_MSG_RESULT([done])]) |
2166 | -rm -f conftest.file |
2167 | -]) |
2168 | - |
2169 | -# Copyright (C) 2009-2013 Free Software Foundation, Inc. |
2170 | -# |
2171 | -# This file is free software; the Free Software Foundation |
2172 | -# gives unlimited permission to copy and/or distribute it, |
2173 | -# with or without modifications, as long as this notice is preserved. |
2174 | - |
2175 | -# AM_SILENT_RULES([DEFAULT]) |
2176 | -# -------------------------- |
2177 | -# Enable less verbose build rules; with the default set to DEFAULT |
2178 | -# ("yes" being less verbose, "no" or empty being verbose). |
2179 | -AC_DEFUN([AM_SILENT_RULES], |
2180 | -[AC_ARG_ENABLE([silent-rules], [dnl |
2181 | -AS_HELP_STRING( |
2182 | - [--enable-silent-rules], |
2183 | - [less verbose build output (undo: "make V=1")]) |
2184 | -AS_HELP_STRING( |
2185 | - [--disable-silent-rules], |
2186 | - [verbose build output (undo: "make V=0")])dnl |
2187 | -]) |
2188 | -case $enable_silent_rules in @%:@ ((( |
2189 | - yes) AM_DEFAULT_VERBOSITY=0;; |
2190 | - no) AM_DEFAULT_VERBOSITY=1;; |
2191 | - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
2192 | -esac |
2193 | -dnl |
2194 | -dnl A few 'make' implementations (e.g., NonStop OS and NextStep) |
2195 | -dnl do not support nested variable expansions. |
2196 | -dnl See automake bug#9928 and bug#10237. |
2197 | -am_make=${MAKE-make} |
2198 | -AC_CACHE_CHECK([whether $am_make supports nested variables], |
2199 | - [am_cv_make_support_nested_variables], |
2200 | - [if AS_ECHO([['TRUE=$(BAR$(V)) |
2201 | -BAR0=false |
2202 | -BAR1=true |
2203 | -V=1 |
2204 | -am__doit: |
2205 | - @$(TRUE) |
2206 | -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then |
2207 | - am_cv_make_support_nested_variables=yes |
2208 | -else |
2209 | - am_cv_make_support_nested_variables=no |
2210 | -fi]) |
2211 | -if test $am_cv_make_support_nested_variables = yes; then |
2212 | - dnl Using '$V' instead of '$(V)' breaks IRIX make. |
2213 | - AM_V='$(V)' |
2214 | - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
2215 | -else |
2216 | - AM_V=$AM_DEFAULT_VERBOSITY |
2217 | - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
2218 | -fi |
2219 | -AC_SUBST([AM_V])dnl |
2220 | -AM_SUBST_NOTMAKE([AM_V])dnl |
2221 | -AC_SUBST([AM_DEFAULT_V])dnl |
2222 | -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl |
2223 | -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl |
2224 | -AM_BACKSLASH='\' |
2225 | -AC_SUBST([AM_BACKSLASH])dnl |
2226 | -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
2227 | -]) |
2228 | - |
2229 | -# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
2230 | -# |
2231 | -# This file is free software; the Free Software Foundation |
2232 | -# gives unlimited permission to copy and/or distribute it, |
2233 | -# with or without modifications, as long as this notice is preserved. |
2234 | - |
2235 | -# AM_PROG_INSTALL_STRIP |
2236 | -# --------------------- |
2237 | -# One issue with vendor 'install' (even GNU) is that you can't |
2238 | -# specify the program used to strip binaries. This is especially |
2239 | -# annoying in cross-compiling environments, where the build's strip |
2240 | -# is unlikely to handle the host's binaries. |
2241 | -# Fortunately install-sh will honor a STRIPPROG variable, so we |
2242 | -# always use install-sh in "make install-strip", and initialize |
2243 | -# STRIPPROG with the value of the STRIP variable (set by the user). |
2244 | -AC_DEFUN([AM_PROG_INSTALL_STRIP], |
2245 | -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
2246 | -# Installed binaries are usually stripped using 'strip' when the user |
2247 | -# run "make install-strip". However 'strip' might not be the right |
2248 | -# tool to use in cross-compilation environments, therefore Automake |
2249 | -# will honor the 'STRIP' environment variable to overrule this program. |
2250 | -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. |
2251 | -if test "$cross_compiling" != no; then |
2252 | - AC_CHECK_TOOL([STRIP], [strip], :) |
2253 | -fi |
2254 | -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
2255 | -AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
2256 | - |
2257 | -# Copyright (C) 2006-2013 Free Software Foundation, Inc. |
2258 | -# |
2259 | -# This file is free software; the Free Software Foundation |
2260 | -# gives unlimited permission to copy and/or distribute it, |
2261 | -# with or without modifications, as long as this notice is preserved. |
2262 | - |
2263 | -# _AM_SUBST_NOTMAKE(VARIABLE) |
2264 | -# --------------------------- |
2265 | -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
2266 | -# This macro is traced by Automake. |
2267 | -AC_DEFUN([_AM_SUBST_NOTMAKE]) |
2268 | - |
2269 | -# AM_SUBST_NOTMAKE(VARIABLE) |
2270 | -# -------------------------- |
2271 | -# Public sister of _AM_SUBST_NOTMAKE. |
2272 | -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
2273 | - |
2274 | -# Check how to create a tarball. -*- Autoconf -*- |
2275 | - |
2276 | -# Copyright (C) 2004-2013 Free Software Foundation, Inc. |
2277 | -# |
2278 | -# This file is free software; the Free Software Foundation |
2279 | -# gives unlimited permission to copy and/or distribute it, |
2280 | -# with or without modifications, as long as this notice is preserved. |
2281 | - |
2282 | -# _AM_PROG_TAR(FORMAT) |
2283 | -# -------------------- |
2284 | -# Check how to create a tarball in format FORMAT. |
2285 | -# FORMAT should be one of 'v7', 'ustar', or 'pax'. |
2286 | -# |
2287 | -# Substitute a variable $(am__tar) that is a command |
2288 | -# writing to stdout a FORMAT-tarball containing the directory |
2289 | -# $tardir. |
2290 | -# tardir=directory && $(am__tar) > result.tar |
2291 | -# |
2292 | -# Substitute a variable $(am__untar) that extract such |
2293 | -# a tarball read from stdin. |
2294 | -# $(am__untar) < result.tar |
2295 | -# |
2296 | -AC_DEFUN([_AM_PROG_TAR], |
2297 | -[# Always define AMTAR for backward compatibility. Yes, it's still used |
2298 | -# in the wild :-( We should find a proper way to deprecate it ... |
2299 | -AC_SUBST([AMTAR], ['$${TAR-tar}']) |
2300 | - |
2301 | -# We'll loop over all known methods to create a tar archive until one works. |
2302 | -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
2303 | - |
2304 | -m4_if([$1], [v7], |
2305 | - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
2306 | - |
2307 | - [m4_case([$1], |
2308 | - [ustar], |
2309 | - [# The POSIX 1988 'ustar' format is defined with fixed-size fields. |
2310 | - # There is notably a 21 bits limit for the UID and the GID. In fact, |
2311 | - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 |
2312 | - # and bug#13588). |
2313 | - am_max_uid=2097151 # 2^21 - 1 |
2314 | - am_max_gid=$am_max_uid |
2315 | - # The $UID and $GID variables are not portable, so we need to resort |
2316 | - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls |
2317 | - # below are definitely unexpected, so allow the users to see them |
2318 | - # (that is, avoid stderr redirection). |
2319 | - am_uid=`id -u || echo unknown` |
2320 | - am_gid=`id -g || echo unknown` |
2321 | - AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) |
2322 | - if test $am_uid -le $am_max_uid; then |
2323 | - AC_MSG_RESULT([yes]) |
2324 | - else |
2325 | - AC_MSG_RESULT([no]) |
2326 | - _am_tools=none |
2327 | - fi |
2328 | - AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) |
2329 | - if test $am_gid -le $am_max_gid; then |
2330 | - AC_MSG_RESULT([yes]) |
2331 | - else |
2332 | - AC_MSG_RESULT([no]) |
2333 | - _am_tools=none |
2334 | - fi], |
2335 | - |
2336 | - [pax], |
2337 | - [], |
2338 | - |
2339 | - [m4_fatal([Unknown tar format])]) |
2340 | - |
2341 | - AC_MSG_CHECKING([how to create a $1 tar archive]) |
2342 | - |
2343 | - # Go ahead even if we have the value already cached. We do so because we |
2344 | - # need to set the values for the 'am__tar' and 'am__untar' variables. |
2345 | - _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
2346 | - |
2347 | - for _am_tool in $_am_tools; do |
2348 | - case $_am_tool in |
2349 | - gnutar) |
2350 | - for _am_tar in tar gnutar gtar; do |
2351 | - AM_RUN_LOG([$_am_tar --version]) && break |
2352 | - done |
2353 | - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
2354 | - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
2355 | - am__untar="$_am_tar -xf -" |
2356 | - ;; |
2357 | - plaintar) |
2358 | - # Must skip GNU tar: if it does not support --format= it doesn't create |
2359 | - # ustar tarball either. |
2360 | - (tar --version) >/dev/null 2>&1 && continue |
2361 | - am__tar='tar chf - "$$tardir"' |
2362 | - am__tar_='tar chf - "$tardir"' |
2363 | - am__untar='tar xf -' |
2364 | - ;; |
2365 | - pax) |
2366 | - am__tar='pax -L -x $1 -w "$$tardir"' |
2367 | - am__tar_='pax -L -x $1 -w "$tardir"' |
2368 | - am__untar='pax -r' |
2369 | - ;; |
2370 | - cpio) |
2371 | - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
2372 | - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
2373 | - am__untar='cpio -i -H $1 -d' |
2374 | - ;; |
2375 | - none) |
2376 | - am__tar=false |
2377 | - am__tar_=false |
2378 | - am__untar=false |
2379 | - ;; |
2380 | - esac |
2381 | - |
2382 | - # If the value was cached, stop now. We just wanted to have am__tar |
2383 | - # and am__untar set. |
2384 | - test -n "${am_cv_prog_tar_$1}" && break |
2385 | - |
2386 | - # tar/untar a dummy directory, and stop if the command works. |
2387 | - rm -rf conftest.dir |
2388 | - mkdir conftest.dir |
2389 | - echo GrepMe > conftest.dir/file |
2390 | - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
2391 | - rm -rf conftest.dir |
2392 | - if test -s conftest.tar; then |
2393 | - AM_RUN_LOG([$am__untar <conftest.tar]) |
2394 | - AM_RUN_LOG([cat conftest.dir/file]) |
2395 | - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
2396 | - fi |
2397 | - done |
2398 | - rm -rf conftest.dir |
2399 | - |
2400 | - AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
2401 | - AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
2402 | - |
2403 | -AC_SUBST([am__tar]) |
2404 | -AC_SUBST([am__untar]) |
2405 | -]) # _AM_PROG_TAR |
2406 | - |
2407 | |
2408 | dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) |
2409 | # serial 42 IT_PROG_INTLTOOL |
2410 | @@ -2716,12 +1553,19 @@ |
2411 | LD="${LD-ld} -m elf_i386_fbsd" |
2412 | ;; |
2413 | x86_64-*linux*) |
2414 | - LD="${LD-ld} -m elf_i386" |
2415 | + case `/usr/bin/file conftest.o` in |
2416 | + *x86-64*) |
2417 | + LD="${LD-ld} -m elf32_x86_64" |
2418 | + ;; |
2419 | + *) |
2420 | + LD="${LD-ld} -m elf_i386" |
2421 | + ;; |
2422 | + esac |
2423 | ;; |
2424 | - powerpc64le-*linux*) |
2425 | + powerpc64le-*) |
2426 | LD="${LD-ld} -m elf32lppclinux" |
2427 | ;; |
2428 | - powerpc64-*linux*) |
2429 | + powerpc64-*) |
2430 | LD="${LD-ld} -m elf32ppclinux" |
2431 | ;; |
2432 | s390x-*linux*) |
2433 | @@ -2740,10 +1584,10 @@ |
2434 | x86_64-*linux*) |
2435 | LD="${LD-ld} -m elf_x86_64" |
2436 | ;; |
2437 | - powerpcle-*linux*) |
2438 | + powerpcle-*) |
2439 | LD="${LD-ld} -m elf64lppc" |
2440 | ;; |
2441 | - powerpc-*linux*) |
2442 | + powerpc-*) |
2443 | LD="${LD-ld} -m elf64ppc" |
2444 | ;; |
2445 | s390*-*linux*|s390*-*tpf*) |
2446 | @@ -3086,7 +1930,8 @@ |
2447 | ;; |
2448 | *) |
2449 | lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` |
2450 | - if test -n "$lt_cv_sys_max_cmd_len"; then |
2451 | + if test -n "$lt_cv_sys_max_cmd_len" && \ |
2452 | + test undefined != "$lt_cv_sys_max_cmd_len"; then |
2453 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
2454 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
2455 | else |
2456 | @@ -3910,17 +2755,6 @@ |
2457 | esac |
2458 | ;; |
2459 | |
2460 | -gnu*) |
2461 | - version_type=linux # correct to gnu/linux during the next big refactor |
2462 | - need_lib_prefix=no |
2463 | - need_version=no |
2464 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
2465 | - soname_spec='${libname}${release}${shared_ext}$major' |
2466 | - shlibpath_var=LD_LIBRARY_PATH |
2467 | - shlibpath_overrides_runpath=no |
2468 | - hardcode_into_libs=yes |
2469 | - ;; |
2470 | - |
2471 | haiku*) |
2472 | version_type=linux # correct to gnu/linux during the next big refactor |
2473 | need_lib_prefix=no |
2474 | @@ -4037,7 +2871,7 @@ |
2475 | ;; |
2476 | |
2477 | # This must be glibc/ELF. |
2478 | -linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2479 | +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
2480 | version_type=linux # correct to gnu/linux during the next big refactor |
2481 | need_lib_prefix=no |
2482 | need_version=no |
2483 | @@ -4067,14 +2901,10 @@ |
2484 | # before this can be enabled. |
2485 | hardcode_into_libs=yes |
2486 | |
2487 | - # Add ABI-specific directories to the system library path. |
2488 | - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" |
2489 | - |
2490 | # Append ld.so.conf contents to the search path |
2491 | if test -f /etc/ld.so.conf; then |
2492 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` |
2493 | - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" |
2494 | - |
2495 | + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
2496 | fi |
2497 | |
2498 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
2499 | @@ -4086,6 +2916,18 @@ |
2500 | dynamic_linker='GNU/Linux ld.so' |
2501 | ;; |
2502 | |
2503 | +netbsdelf*-gnu) |
2504 | + version_type=linux |
2505 | + need_lib_prefix=no |
2506 | + need_version=no |
2507 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2508 | + soname_spec='${libname}${release}${shared_ext}$major' |
2509 | + shlibpath_var=LD_LIBRARY_PATH |
2510 | + shlibpath_overrides_runpath=no |
2511 | + hardcode_into_libs=yes |
2512 | + dynamic_linker='NetBSD ld.elf_so' |
2513 | + ;; |
2514 | + |
2515 | netbsd*) |
2516 | version_type=sunos |
2517 | need_lib_prefix=no |
2518 | @@ -4645,10 +3487,6 @@ |
2519 | fi |
2520 | ;; |
2521 | |
2522 | -gnu*) |
2523 | - lt_cv_deplibs_check_method=pass_all |
2524 | - ;; |
2525 | - |
2526 | haiku*) |
2527 | lt_cv_deplibs_check_method=pass_all |
2528 | ;; |
2529 | @@ -4687,11 +3525,11 @@ |
2530 | ;; |
2531 | |
2532 | # This must be glibc/ELF. |
2533 | -linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2534 | +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
2535 | lt_cv_deplibs_check_method=pass_all |
2536 | ;; |
2537 | |
2538 | -netbsd*) |
2539 | +netbsd* | netbsdelf*-gnu) |
2540 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
2541 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
2542 | else |
2543 | @@ -5439,7 +4277,7 @@ |
2544 | ;; |
2545 | esac |
2546 | ;; |
2547 | - linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2548 | + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
2549 | case $cc_basename in |
2550 | KCC*) |
2551 | # KAI C++ Compiler |
2552 | @@ -5503,7 +4341,7 @@ |
2553 | ;; |
2554 | esac |
2555 | ;; |
2556 | - netbsd*) |
2557 | + netbsd* | netbsdelf*-gnu) |
2558 | ;; |
2559 | *qnx* | *nto*) |
2560 | # QNX uses GNU C++, but need to define -shared option too, otherwise |
2561 | @@ -5738,7 +4576,7 @@ |
2562 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
2563 | ;; |
2564 | |
2565 | - linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2566 | + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
2567 | case $cc_basename in |
2568 | # old Intel for x86_64 which still supported -KPIC. |
2569 | ecc*) |
2570 | @@ -5980,6 +4818,9 @@ |
2571 | ;; |
2572 | esac |
2573 | ;; |
2574 | + linux* | k*bsd*-gnu | gnu*) |
2575 | + _LT_TAGVAR(link_all_deplibs, $1)=no |
2576 | + ;; |
2577 | *) |
2578 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
2579 | ;; |
2580 | @@ -6042,6 +4883,9 @@ |
2581 | openbsd*) |
2582 | with_gnu_ld=no |
2583 | ;; |
2584 | + linux* | k*bsd*-gnu | gnu*) |
2585 | + _LT_TAGVAR(link_all_deplibs, $1)=no |
2586 | + ;; |
2587 | esac |
2588 | |
2589 | _LT_TAGVAR(ld_shlibs, $1)=yes |
2590 | @@ -6263,7 +5107,7 @@ |
2591 | fi |
2592 | ;; |
2593 | |
2594 | - netbsd*) |
2595 | + netbsd* | netbsdelf*-gnu) |
2596 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
2597 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
2598 | wlarc= |
2599 | @@ -6440,6 +5284,7 @@ |
2600 | if test "$aix_use_runtimelinking" = yes; then |
2601 | shared_flag="$shared_flag "'${wl}-G' |
2602 | fi |
2603 | + _LT_TAGVAR(link_all_deplibs, $1)=no |
2604 | else |
2605 | # not using gcc |
2606 | if test "$host_cpu" = ia64; then |
2607 | @@ -6744,7 +5589,7 @@ |
2608 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
2609 | ;; |
2610 | |
2611 | - netbsd*) |
2612 | + netbsd* | netbsdelf*-gnu) |
2613 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
2614 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
2615 | else |
2616 | @@ -7620,9 +6465,6 @@ |
2617 | _LT_TAGVAR(ld_shlibs, $1)=yes |
2618 | ;; |
2619 | |
2620 | - gnu*) |
2621 | - ;; |
2622 | - |
2623 | haiku*) |
2624 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
2625 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
2626 | @@ -7784,7 +6626,7 @@ |
2627 | _LT_TAGVAR(inherit_rpath, $1)=yes |
2628 | ;; |
2629 | |
2630 | - linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2631 | + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
2632 | case $cc_basename in |
2633 | KCC*) |
2634 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
2635 | @@ -10684,33 +9526,13 @@ |
2636 | # serial 3 |
2637 | # |
2638 | |
2639 | -dnl GNOME_COMMON_INIT |
2640 | - |
2641 | -AU_DEFUN([GNOME_COMMON_INIT], |
2642 | -[ |
2643 | - dnl this macro should come after AC_CONFIG_MACRO_DIR |
2644 | - AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) |
2645 | - |
2646 | - dnl ensure that when the Automake generated makefile calls aclocal, |
2647 | - dnl it honours the $ACLOCAL_FLAGS environment variable |
2648 | - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" |
2649 | - if test -n "$ac_macro_dir"; then |
2650 | - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" |
2651 | - fi |
2652 | - |
2653 | - AC_SUBST([ACLOCAL_AMFLAGS]) |
2654 | -], |
2655 | -[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}" |
2656 | -in your top-level Makefile.am, instead, where "m4" is the macro directory set |
2657 | -with AC_CONFIG_MACRO_DIR() in your configure.ac]]) |
2658 | - |
2659 | AU_DEFUN([GNOME_DEBUG_CHECK], |
2660 | [ |
2661 | AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG]) |
2662 | ], |
2663 | [[$0: This macro is deprecated. You should use AX_CHECK_ENABLE_DEBUG instead and |
2664 | replace uses of GNOME_ENABLE_DEBUG with ENABLE_DEBUG. |
2665 | -See: https://savannah.gnu.org/patch/?8452]]) |
2666 | +See: http://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html#ax_check_enable_debug]]) |
2667 | |
2668 | dnl GNOME_MAINTAINER_MODE_DEFINES () |
2669 | dnl define DISABLE_DEPRECATED |
2670 | @@ -11297,3 +10119,1166 @@ |
2671 | m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) |
2672 | ]) |
2673 | |
2674 | +# Copyright (C) 2002-2013 Free Software Foundation, Inc. |
2675 | +# |
2676 | +# This file is free software; the Free Software Foundation |
2677 | +# gives unlimited permission to copy and/or distribute it, |
2678 | +# with or without modifications, as long as this notice is preserved. |
2679 | + |
2680 | +# AM_AUTOMAKE_VERSION(VERSION) |
2681 | +# ---------------------------- |
2682 | +# Automake X.Y traces this macro to ensure aclocal.m4 has been |
2683 | +# generated from the m4 files accompanying Automake X.Y. |
2684 | +# (This private macro should not be called outside this file.) |
2685 | +AC_DEFUN([AM_AUTOMAKE_VERSION], |
2686 | +[am__api_version='1.14' |
2687 | +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
2688 | +dnl require some minimum version. Point them to the right macro. |
2689 | +m4_if([$1], [1.14.1], [], |
2690 | + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
2691 | +]) |
2692 | + |
2693 | +# _AM_AUTOCONF_VERSION(VERSION) |
2694 | +# ----------------------------- |
2695 | +# aclocal traces this macro to find the Autoconf version. |
2696 | +# This is a private macro too. Using m4_define simplifies |
2697 | +# the logic in aclocal, which can simply ignore this definition. |
2698 | +m4_define([_AM_AUTOCONF_VERSION], []) |
2699 | + |
2700 | +# AM_SET_CURRENT_AUTOMAKE_VERSION |
2701 | +# ------------------------------- |
2702 | +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
2703 | +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
2704 | +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
2705 | +[AM_AUTOMAKE_VERSION([1.14.1])dnl |
2706 | +m4_ifndef([AC_AUTOCONF_VERSION], |
2707 | + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
2708 | +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
2709 | + |
2710 | +# AM_AUX_DIR_EXPAND -*- Autoconf -*- |
2711 | + |
2712 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
2713 | +# |
2714 | +# This file is free software; the Free Software Foundation |
2715 | +# gives unlimited permission to copy and/or distribute it, |
2716 | +# with or without modifications, as long as this notice is preserved. |
2717 | + |
2718 | +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
2719 | +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
2720 | +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
2721 | +# |
2722 | +# Of course, Automake must honor this variable whenever it calls a |
2723 | +# tool from the auxiliary directory. The problem is that $srcdir (and |
2724 | +# therefore $ac_aux_dir as well) can be either absolute or relative, |
2725 | +# depending on how configure is run. This is pretty annoying, since |
2726 | +# it makes $ac_aux_dir quite unusable in subdirectories: in the top |
2727 | +# source directory, any form will work fine, but in subdirectories a |
2728 | +# relative path needs to be adjusted first. |
2729 | +# |
2730 | +# $ac_aux_dir/missing |
2731 | +# fails when called from a subdirectory if $ac_aux_dir is relative |
2732 | +# $top_srcdir/$ac_aux_dir/missing |
2733 | +# fails if $ac_aux_dir is absolute, |
2734 | +# fails when called from a subdirectory in a VPATH build with |
2735 | +# a relative $ac_aux_dir |
2736 | +# |
2737 | +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir |
2738 | +# are both prefixed by $srcdir. In an in-source build this is usually |
2739 | +# harmless because $srcdir is '.', but things will broke when you |
2740 | +# start a VPATH build or use an absolute $srcdir. |
2741 | +# |
2742 | +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, |
2743 | +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: |
2744 | +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` |
2745 | +# and then we would define $MISSING as |
2746 | +# MISSING="\${SHELL} $am_aux_dir/missing" |
2747 | +# This will work as long as MISSING is not called from configure, because |
2748 | +# unfortunately $(top_srcdir) has no meaning in configure. |
2749 | +# However there are other variables, like CC, which are often used in |
2750 | +# configure, and could therefore not use this "fixed" $ac_aux_dir. |
2751 | +# |
2752 | +# Another solution, used here, is to always expand $ac_aux_dir to an |
2753 | +# absolute PATH. The drawback is that using absolute paths prevent a |
2754 | +# configured tree to be moved without reconfiguration. |
2755 | + |
2756 | +AC_DEFUN([AM_AUX_DIR_EXPAND], |
2757 | +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl |
2758 | +# Expand $ac_aux_dir to an absolute path. |
2759 | +am_aux_dir=`cd "$ac_aux_dir" && pwd` |
2760 | +]) |
2761 | + |
2762 | +# AM_CONDITIONAL -*- Autoconf -*- |
2763 | + |
2764 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
2765 | +# |
2766 | +# This file is free software; the Free Software Foundation |
2767 | +# gives unlimited permission to copy and/or distribute it, |
2768 | +# with or without modifications, as long as this notice is preserved. |
2769 | + |
2770 | +# AM_CONDITIONAL(NAME, SHELL-CONDITION) |
2771 | +# ------------------------------------- |
2772 | +# Define a conditional. |
2773 | +AC_DEFUN([AM_CONDITIONAL], |
2774 | +[AC_PREREQ([2.52])dnl |
2775 | + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
2776 | + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
2777 | +AC_SUBST([$1_TRUE])dnl |
2778 | +AC_SUBST([$1_FALSE])dnl |
2779 | +_AM_SUBST_NOTMAKE([$1_TRUE])dnl |
2780 | +_AM_SUBST_NOTMAKE([$1_FALSE])dnl |
2781 | +m4_define([_AM_COND_VALUE_$1], [$2])dnl |
2782 | +if $2; then |
2783 | + $1_TRUE= |
2784 | + $1_FALSE='#' |
2785 | +else |
2786 | + $1_TRUE='#' |
2787 | + $1_FALSE= |
2788 | +fi |
2789 | +AC_CONFIG_COMMANDS_PRE( |
2790 | +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then |
2791 | + AC_MSG_ERROR([[conditional "$1" was never defined. |
2792 | +Usually this means the macro was only invoked conditionally.]]) |
2793 | +fi])]) |
2794 | + |
2795 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
2796 | +# |
2797 | +# This file is free software; the Free Software Foundation |
2798 | +# gives unlimited permission to copy and/or distribute it, |
2799 | +# with or without modifications, as long as this notice is preserved. |
2800 | + |
2801 | + |
2802 | +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be |
2803 | +# written in clear, in which case automake, when reading aclocal.m4, |
2804 | +# will think it sees a *use*, and therefore will trigger all it's |
2805 | +# C support machinery. Also note that it means that autoscan, seeing |
2806 | +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... |
2807 | + |
2808 | + |
2809 | +# _AM_DEPENDENCIES(NAME) |
2810 | +# ---------------------- |
2811 | +# See how the compiler implements dependency checking. |
2812 | +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". |
2813 | +# We try a few techniques and use that to set a single cache variable. |
2814 | +# |
2815 | +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was |
2816 | +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular |
2817 | +# dependency, and given that the user is not expected to run this macro, |
2818 | +# just rely on AC_PROG_CC. |
2819 | +AC_DEFUN([_AM_DEPENDENCIES], |
2820 | +[AC_REQUIRE([AM_SET_DEPDIR])dnl |
2821 | +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl |
2822 | +AC_REQUIRE([AM_MAKE_INCLUDE])dnl |
2823 | +AC_REQUIRE([AM_DEP_TRACK])dnl |
2824 | + |
2825 | +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], |
2826 | + [$1], [CXX], [depcc="$CXX" am_compiler_list=], |
2827 | + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
2828 | + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], |
2829 | + [$1], [UPC], [depcc="$UPC" am_compiler_list=], |
2830 | + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
2831 | + [depcc="$$1" am_compiler_list=]) |
2832 | + |
2833 | +AC_CACHE_CHECK([dependency style of $depcc], |
2834 | + [am_cv_$1_dependencies_compiler_type], |
2835 | +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
2836 | + # We make a subdir and do the tests there. Otherwise we can end up |
2837 | + # making bogus files that we don't know about and never remove. For |
2838 | + # instance it was reported that on HP-UX the gcc test will end up |
2839 | + # making a dummy file named 'D' -- because '-MD' means "put the output |
2840 | + # in D". |
2841 | + rm -rf conftest.dir |
2842 | + mkdir conftest.dir |
2843 | + # Copy depcomp to subdir because otherwise we won't find it if we're |
2844 | + # using a relative directory. |
2845 | + cp "$am_depcomp" conftest.dir |
2846 | + cd conftest.dir |
2847 | + # We will build objects and dependencies in a subdirectory because |
2848 | + # it helps to detect inapplicable dependency modes. For instance |
2849 | + # both Tru64's cc and ICC support -MD to output dependencies as a |
2850 | + # side effect of compilation, but ICC will put the dependencies in |
2851 | + # the current directory while Tru64 will put them in the object |
2852 | + # directory. |
2853 | + mkdir sub |
2854 | + |
2855 | + am_cv_$1_dependencies_compiler_type=none |
2856 | + if test "$am_compiler_list" = ""; then |
2857 | + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` |
2858 | + fi |
2859 | + am__universal=false |
2860 | + m4_case([$1], [CC], |
2861 | + [case " $depcc " in #( |
2862 | + *\ -arch\ *\ -arch\ *) am__universal=true ;; |
2863 | + esac], |
2864 | + [CXX], |
2865 | + [case " $depcc " in #( |
2866 | + *\ -arch\ *\ -arch\ *) am__universal=true ;; |
2867 | + esac]) |
2868 | + |
2869 | + for depmode in $am_compiler_list; do |
2870 | + # Setup a source with many dependencies, because some compilers |
2871 | + # like to wrap large dependency lists on column 80 (with \), and |
2872 | + # we should not choose a depcomp mode which is confused by this. |
2873 | + # |
2874 | + # We need to recreate these files for each test, as the compiler may |
2875 | + # overwrite some of them when testing with obscure command lines. |
2876 | + # This happens at least with the AIX C compiler. |
2877 | + : > sub/conftest.c |
2878 | + for i in 1 2 3 4 5 6; do |
2879 | + echo '#include "conftst'$i'.h"' >> sub/conftest.c |
2880 | + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with |
2881 | + # Solaris 10 /bin/sh. |
2882 | + echo '/* dummy */' > sub/conftst$i.h |
2883 | + done |
2884 | + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
2885 | + |
2886 | + # We check with '-c' and '-o' for the sake of the "dashmstdout" |
2887 | + # mode. It turns out that the SunPro C++ compiler does not properly |
2888 | + # handle '-M -o', and we need to detect this. Also, some Intel |
2889 | + # versions had trouble with output in subdirs. |
2890 | + am__obj=sub/conftest.${OBJEXT-o} |
2891 | + am__minus_obj="-o $am__obj" |
2892 | + case $depmode in |
2893 | + gcc) |
2894 | + # This depmode causes a compiler race in universal mode. |
2895 | + test "$am__universal" = false || continue |
2896 | + ;; |
2897 | + nosideeffect) |
2898 | + # After this tag, mechanisms are not by side-effect, so they'll |
2899 | + # only be used when explicitly requested. |
2900 | + if test "x$enable_dependency_tracking" = xyes; then |
2901 | + continue |
2902 | + else |
2903 | + break |
2904 | + fi |
2905 | + ;; |
2906 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2907 | + # This compiler won't grok '-c -o', but also, the minuso test has |
2908 | + # not run yet. These depmodes are late enough in the game, and |
2909 | + # so weak that their functioning should not be impacted. |
2910 | + am__obj=conftest.${OBJEXT-o} |
2911 | + am__minus_obj= |
2912 | + ;; |
2913 | + none) break ;; |
2914 | + esac |
2915 | + if depmode=$depmode \ |
2916 | + source=sub/conftest.c object=$am__obj \ |
2917 | + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
2918 | + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ |
2919 | + >/dev/null 2>conftest.err && |
2920 | + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
2921 | + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
2922 | + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && |
2923 | + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
2924 | + # icc doesn't choke on unknown options, it will just issue warnings |
2925 | + # or remarks (even with -Werror). So we grep stderr for any message |
2926 | + # that says an option was ignored or not supported. |
2927 | + # When given -MP, icc 7.0 and 7.1 complain thusly: |
2928 | + # icc: Command line warning: ignoring option '-M'; no argument required |
2929 | + # The diagnosis changed in icc 8.0: |
2930 | + # icc: Command line remark: option '-MP' not supported |
2931 | + if (grep 'ignoring option' conftest.err || |
2932 | + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else |
2933 | + am_cv_$1_dependencies_compiler_type=$depmode |
2934 | + break |
2935 | + fi |
2936 | + fi |
2937 | + done |
2938 | + |
2939 | + cd .. |
2940 | + rm -rf conftest.dir |
2941 | +else |
2942 | + am_cv_$1_dependencies_compiler_type=none |
2943 | +fi |
2944 | +]) |
2945 | +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) |
2946 | +AM_CONDITIONAL([am__fastdep$1], [ |
2947 | + test "x$enable_dependency_tracking" != xno \ |
2948 | + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) |
2949 | +]) |
2950 | + |
2951 | + |
2952 | +# AM_SET_DEPDIR |
2953 | +# ------------- |
2954 | +# Choose a directory name for dependency files. |
2955 | +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. |
2956 | +AC_DEFUN([AM_SET_DEPDIR], |
2957 | +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
2958 | +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl |
2959 | +]) |
2960 | + |
2961 | + |
2962 | +# AM_DEP_TRACK |
2963 | +# ------------ |
2964 | +AC_DEFUN([AM_DEP_TRACK], |
2965 | +[AC_ARG_ENABLE([dependency-tracking], [dnl |
2966 | +AS_HELP_STRING( |
2967 | + [--enable-dependency-tracking], |
2968 | + [do not reject slow dependency extractors]) |
2969 | +AS_HELP_STRING( |
2970 | + [--disable-dependency-tracking], |
2971 | + [speeds up one-time build])]) |
2972 | +if test "x$enable_dependency_tracking" != xno; then |
2973 | + am_depcomp="$ac_aux_dir/depcomp" |
2974 | + AMDEPBACKSLASH='\' |
2975 | + am__nodep='_no' |
2976 | +fi |
2977 | +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
2978 | +AC_SUBST([AMDEPBACKSLASH])dnl |
2979 | +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
2980 | +AC_SUBST([am__nodep])dnl |
2981 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
2982 | +]) |
2983 | + |
2984 | +# Generate code to set up dependency tracking. -*- Autoconf -*- |
2985 | + |
2986 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
2987 | +# |
2988 | +# This file is free software; the Free Software Foundation |
2989 | +# gives unlimited permission to copy and/or distribute it, |
2990 | +# with or without modifications, as long as this notice is preserved. |
2991 | + |
2992 | + |
2993 | +# _AM_OUTPUT_DEPENDENCY_COMMANDS |
2994 | +# ------------------------------ |
2995 | +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
2996 | +[{ |
2997 | + # Older Autoconf quotes --file arguments for eval, but not when files |
2998 | + # are listed without --file. Let's play safe and only enable the eval |
2999 | + # if we detect the quoting. |
3000 | + case $CONFIG_FILES in |
3001 | + *\'*) eval set x "$CONFIG_FILES" ;; |
3002 | + *) set x $CONFIG_FILES ;; |
3003 | + esac |
3004 | + shift |
3005 | + for mf |
3006 | + do |
3007 | + # Strip MF so we end up with the name of the file. |
3008 | + mf=`echo "$mf" | sed -e 's/:.*$//'` |
3009 | + # Check whether this is an Automake generated Makefile or not. |
3010 | + # We used to match only the files named 'Makefile.in', but |
3011 | + # some people rename them; so instead we look at the file content. |
3012 | + # Grep'ing the first line is not enough: some people post-process |
3013 | + # each Makefile.in and add a new line on top of each file to say so. |
3014 | + # Grep'ing the whole file is not good either: AIX grep has a line |
3015 | + # limit of 2048, but all sed's we know have understand at least 4000. |
3016 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
3017 | + dirpart=`AS_DIRNAME("$mf")` |
3018 | + else |
3019 | + continue |
3020 | + fi |
3021 | + # Extract the definition of DEPDIR, am__include, and am__quote |
3022 | + # from the Makefile without running 'make'. |
3023 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
3024 | + test -z "$DEPDIR" && continue |
3025 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` |
3026 | + test -z "$am__include" && continue |
3027 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
3028 | + # Find all dependency output files, they are included files with |
3029 | + # $(DEPDIR) in their names. We invoke sed twice because it is the |
3030 | + # simplest approach to changing $(DEPDIR) to its actual value in the |
3031 | + # expansion. |
3032 | + for file in `sed -n " |
3033 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
3034 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
3035 | + # Make sure the directory exists. |
3036 | + test -f "$dirpart/$file" && continue |
3037 | + fdir=`AS_DIRNAME(["$file"])` |
3038 | + AS_MKDIR_P([$dirpart/$fdir]) |
3039 | + # echo "creating $dirpart/$file" |
3040 | + echo '# dummy' > "$dirpart/$file" |
3041 | + done |
3042 | + done |
3043 | +} |
3044 | +])# _AM_OUTPUT_DEPENDENCY_COMMANDS |
3045 | + |
3046 | + |
3047 | +# AM_OUTPUT_DEPENDENCY_COMMANDS |
3048 | +# ----------------------------- |
3049 | +# This macro should only be invoked once -- use via AC_REQUIRE. |
3050 | +# |
3051 | +# This code is only required when automatic dependency tracking |
3052 | +# is enabled. FIXME. This creates each '.P' file that we will |
3053 | +# need in order to bootstrap the dependency handling code. |
3054 | +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
3055 | +[AC_CONFIG_COMMANDS([depfiles], |
3056 | + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], |
3057 | + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
3058 | +]) |
3059 | + |
3060 | +# Do all the work for Automake. -*- Autoconf -*- |
3061 | + |
3062 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
3063 | +# |
3064 | +# This file is free software; the Free Software Foundation |
3065 | +# gives unlimited permission to copy and/or distribute it, |
3066 | +# with or without modifications, as long as this notice is preserved. |
3067 | + |
3068 | +# This macro actually does too much. Some checks are only needed if |
3069 | +# your package does certain things. But this isn't really a big deal. |
3070 | + |
3071 | +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. |
3072 | +m4_define([AC_PROG_CC], |
3073 | +m4_defn([AC_PROG_CC]) |
3074 | +[_AM_PROG_CC_C_O |
3075 | +]) |
3076 | + |
3077 | +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
3078 | +# AM_INIT_AUTOMAKE([OPTIONS]) |
3079 | +# ----------------------------------------------- |
3080 | +# The call with PACKAGE and VERSION arguments is the old style |
3081 | +# call (pre autoconf-2.50), which is being phased out. PACKAGE |
3082 | +# and VERSION should now be passed to AC_INIT and removed from |
3083 | +# the call to AM_INIT_AUTOMAKE. |
3084 | +# We support both call styles for the transition. After |
3085 | +# the next Automake release, Autoconf can make the AC_INIT |
3086 | +# arguments mandatory, and then we can depend on a new Autoconf |
3087 | +# release and drop the old call support. |
3088 | +AC_DEFUN([AM_INIT_AUTOMAKE], |
3089 | +[AC_PREREQ([2.65])dnl |
3090 | +dnl Autoconf wants to disallow AM_ names. We explicitly allow |
3091 | +dnl the ones we care about. |
3092 | +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
3093 | +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl |
3094 | +AC_REQUIRE([AC_PROG_INSTALL])dnl |
3095 | +if test "`cd $srcdir && pwd`" != "`pwd`"; then |
3096 | + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output |
3097 | + # is not polluted with repeated "-I." |
3098 | + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl |
3099 | + # test to see if srcdir already configured |
3100 | + if test -f $srcdir/config.status; then |
3101 | + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) |
3102 | + fi |
3103 | +fi |
3104 | + |
3105 | +# test whether we have cygpath |
3106 | +if test -z "$CYGPATH_W"; then |
3107 | + if (cygpath --version) >/dev/null 2>/dev/null; then |
3108 | + CYGPATH_W='cygpath -w' |
3109 | + else |
3110 | + CYGPATH_W=echo |
3111 | + fi |
3112 | +fi |
3113 | +AC_SUBST([CYGPATH_W]) |
3114 | + |
3115 | +# Define the identity of the package. |
3116 | +dnl Distinguish between old-style and new-style calls. |
3117 | +m4_ifval([$2], |
3118 | +[AC_DIAGNOSE([obsolete], |
3119 | + [$0: two- and three-arguments forms are deprecated.]) |
3120 | +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
3121 | + AC_SUBST([PACKAGE], [$1])dnl |
3122 | + AC_SUBST([VERSION], [$2])], |
3123 | +[_AM_SET_OPTIONS([$1])dnl |
3124 | +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
3125 | +m4_if( |
3126 | + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), |
3127 | + [ok:ok],, |
3128 | + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
3129 | + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
3130 | + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
3131 | + |
3132 | +_AM_IF_OPTION([no-define],, |
3133 | +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) |
3134 | + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl |
3135 | + |
3136 | +# Some tools Automake needs. |
3137 | +AC_REQUIRE([AM_SANITY_CHECK])dnl |
3138 | +AC_REQUIRE([AC_ARG_PROGRAM])dnl |
3139 | +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) |
3140 | +AM_MISSING_PROG([AUTOCONF], [autoconf]) |
3141 | +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) |
3142 | +AM_MISSING_PROG([AUTOHEADER], [autoheader]) |
3143 | +AM_MISSING_PROG([MAKEINFO], [makeinfo]) |
3144 | +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
3145 | +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
3146 | +AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
3147 | +# For better backward compatibility. To be removed once Automake 1.9.x |
3148 | +# dies out for good. For more background, see: |
3149 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
3150 | +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
3151 | +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
3152 | +# We need awk for the "check" target. The system "awk" is bad on |
3153 | +# some platforms. |
3154 | +AC_REQUIRE([AC_PROG_AWK])dnl |
3155 | +AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
3156 | +AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
3157 | +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], |
3158 | + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], |
3159 | + [_AM_PROG_TAR([v7])])]) |
3160 | +_AM_IF_OPTION([no-dependencies],, |
3161 | +[AC_PROVIDE_IFELSE([AC_PROG_CC], |
3162 | + [_AM_DEPENDENCIES([CC])], |
3163 | + [m4_define([AC_PROG_CC], |
3164 | + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl |
3165 | +AC_PROVIDE_IFELSE([AC_PROG_CXX], |
3166 | + [_AM_DEPENDENCIES([CXX])], |
3167 | + [m4_define([AC_PROG_CXX], |
3168 | + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl |
3169 | +AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
3170 | + [_AM_DEPENDENCIES([OBJC])], |
3171 | + [m4_define([AC_PROG_OBJC], |
3172 | + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
3173 | +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
3174 | + [_AM_DEPENDENCIES([OBJCXX])], |
3175 | + [m4_define([AC_PROG_OBJCXX], |
3176 | + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl |
3177 | +]) |
3178 | +AC_REQUIRE([AM_SILENT_RULES])dnl |
3179 | +dnl The testsuite driver may need to know about EXEEXT, so add the |
3180 | +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This |
3181 | +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. |
3182 | +AC_CONFIG_COMMANDS_PRE(dnl |
3183 | +[m4_provide_if([_AM_COMPILER_EXEEXT], |
3184 | + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
3185 | + |
3186 | +# POSIX will say in a future version that running "rm -f" with no argument |
3187 | +# is OK; and we want to be able to make that assumption in our Makefile |
3188 | +# recipes. So use an aggressive probe to check that the usage we want is |
3189 | +# actually supported "in the wild" to an acceptable degree. |
3190 | +# See automake bug#10828. |
3191 | +# To make any issue more visible, cause the running configure to be aborted |
3192 | +# by default if the 'rm' program in use doesn't match our expectations; the |
3193 | +# user can still override this though. |
3194 | +if rm -f && rm -fr && rm -rf; then : OK; else |
3195 | + cat >&2 <<'END' |
3196 | +Oops! |
3197 | + |
3198 | +Your 'rm' program seems unable to run without file operands specified |
3199 | +on the command line, even when the '-f' option is present. This is contrary |
3200 | +to the behaviour of most rm programs out there, and not conforming with |
3201 | +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
3202 | + |
3203 | +Please tell bug-automake@gnu.org about your system, including the value |
3204 | +of your $PATH and any error possibly output before this message. This |
3205 | +can help us improve future automake versions. |
3206 | + |
3207 | +END |
3208 | + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
3209 | + echo 'Configuration will proceed anyway, since you have set the' >&2 |
3210 | + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
3211 | + echo >&2 |
3212 | + else |
3213 | + cat >&2 <<'END' |
3214 | +Aborting the configuration process, to ensure you take notice of the issue. |
3215 | + |
3216 | +You can download and install GNU coreutils to get an 'rm' implementation |
3217 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. |
3218 | + |
3219 | +If you want to complete the configuration process using your problematic |
3220 | +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
3221 | +to "yes", and re-run configure. |
3222 | + |
3223 | +END |
3224 | + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
3225 | + fi |
3226 | +fi |
3227 | +]) |
3228 | + |
3229 | +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
3230 | +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
3231 | +dnl mangled by Autoconf and run in a shell conditional statement. |
3232 | +m4_define([_AC_COMPILER_EXEEXT], |
3233 | +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
3234 | + |
3235 | +# When config.status generates a header, we must update the stamp-h file. |
3236 | +# This file resides in the same directory as the config header |
3237 | +# that is generated. The stamp files are numbered to have different names. |
3238 | + |
3239 | +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the |
3240 | +# loop where config.status creates the headers, so we can generate |
3241 | +# our stamp files there. |
3242 | +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], |
3243 | +[# Compute $1's index in $config_headers. |
3244 | +_am_arg=$1 |
3245 | +_am_stamp_count=1 |
3246 | +for _am_header in $config_headers :; do |
3247 | + case $_am_header in |
3248 | + $_am_arg | $_am_arg:* ) |
3249 | + break ;; |
3250 | + * ) |
3251 | + _am_stamp_count=`expr $_am_stamp_count + 1` ;; |
3252 | + esac |
3253 | +done |
3254 | +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
3255 | + |
3256 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
3257 | +# |
3258 | +# This file is free software; the Free Software Foundation |
3259 | +# gives unlimited permission to copy and/or distribute it, |
3260 | +# with or without modifications, as long as this notice is preserved. |
3261 | + |
3262 | +# AM_PROG_INSTALL_SH |
3263 | +# ------------------ |
3264 | +# Define $install_sh. |
3265 | +AC_DEFUN([AM_PROG_INSTALL_SH], |
3266 | +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
3267 | +if test x"${install_sh}" != xset; then |
3268 | + case $am_aux_dir in |
3269 | + *\ * | *\ *) |
3270 | + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; |
3271 | + *) |
3272 | + install_sh="\${SHELL} $am_aux_dir/install-sh" |
3273 | + esac |
3274 | +fi |
3275 | +AC_SUBST([install_sh])]) |
3276 | + |
3277 | +# Copyright (C) 2003-2013 Free Software Foundation, Inc. |
3278 | +# |
3279 | +# This file is free software; the Free Software Foundation |
3280 | +# gives unlimited permission to copy and/or distribute it, |
3281 | +# with or without modifications, as long as this notice is preserved. |
3282 | + |
3283 | +# Check whether the underlying file-system supports filenames |
3284 | +# with a leading dot. For instance MS-DOS doesn't. |
3285 | +AC_DEFUN([AM_SET_LEADING_DOT], |
3286 | +[rm -rf .tst 2>/dev/null |
3287 | +mkdir .tst 2>/dev/null |
3288 | +if test -d .tst; then |
3289 | + am__leading_dot=. |
3290 | +else |
3291 | + am__leading_dot=_ |
3292 | +fi |
3293 | +rmdir .tst 2>/dev/null |
3294 | +AC_SUBST([am__leading_dot])]) |
3295 | + |
3296 | +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
3297 | +# From Jim Meyering |
3298 | + |
3299 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
3300 | +# |
3301 | +# This file is free software; the Free Software Foundation |
3302 | +# gives unlimited permission to copy and/or distribute it, |
3303 | +# with or without modifications, as long as this notice is preserved. |
3304 | + |
3305 | +# AM_MAINTAINER_MODE([DEFAULT-MODE]) |
3306 | +# ---------------------------------- |
3307 | +# Control maintainer-specific portions of Makefiles. |
3308 | +# Default is to disable them, unless 'enable' is passed literally. |
3309 | +# For symmetry, 'disable' may be passed as well. Anyway, the user |
3310 | +# can override the default with the --enable/--disable switch. |
3311 | +AC_DEFUN([AM_MAINTAINER_MODE], |
3312 | +[m4_case(m4_default([$1], [disable]), |
3313 | + [enable], [m4_define([am_maintainer_other], [disable])], |
3314 | + [disable], [m4_define([am_maintainer_other], [enable])], |
3315 | + [m4_define([am_maintainer_other], [enable]) |
3316 | + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) |
3317 | +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
3318 | + dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
3319 | + AC_ARG_ENABLE([maintainer-mode], |
3320 | + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], |
3321 | + am_maintainer_other[ make rules and dependencies not useful |
3322 | + (and sometimes confusing) to the casual installer])], |
3323 | + [USE_MAINTAINER_MODE=$enableval], |
3324 | + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
3325 | + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) |
3326 | + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) |
3327 | + MAINT=$MAINTAINER_MODE_TRUE |
3328 | + AC_SUBST([MAINT])dnl |
3329 | +] |
3330 | +) |
3331 | + |
3332 | +# Check to see how 'make' treats includes. -*- Autoconf -*- |
3333 | + |
3334 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
3335 | +# |
3336 | +# This file is free software; the Free Software Foundation |
3337 | +# gives unlimited permission to copy and/or distribute it, |
3338 | +# with or without modifications, as long as this notice is preserved. |
3339 | + |
3340 | +# AM_MAKE_INCLUDE() |
3341 | +# ----------------- |
3342 | +# Check to see how make treats includes. |
3343 | +AC_DEFUN([AM_MAKE_INCLUDE], |
3344 | +[am_make=${MAKE-make} |
3345 | +cat > confinc << 'END' |
3346 | +am__doit: |
3347 | + @echo this is the am__doit target |
3348 | +.PHONY: am__doit |
3349 | +END |
3350 | +# If we don't find an include directive, just comment out the code. |
3351 | +AC_MSG_CHECKING([for style of include used by $am_make]) |
3352 | +am__include="#" |
3353 | +am__quote= |
3354 | +_am_result=none |
3355 | +# First try GNU make style include. |
3356 | +echo "include confinc" > confmf |
3357 | +# Ignore all kinds of additional output from 'make'. |
3358 | +case `$am_make -s -f confmf 2> /dev/null` in #( |
3359 | +*the\ am__doit\ target*) |
3360 | + am__include=include |
3361 | + am__quote= |
3362 | + _am_result=GNU |
3363 | + ;; |
3364 | +esac |
3365 | +# Now try BSD make style include. |
3366 | +if test "$am__include" = "#"; then |
3367 | + echo '.include "confinc"' > confmf |
3368 | + case `$am_make -s -f confmf 2> /dev/null` in #( |
3369 | + *the\ am__doit\ target*) |
3370 | + am__include=.include |
3371 | + am__quote="\"" |
3372 | + _am_result=BSD |
3373 | + ;; |
3374 | + esac |
3375 | +fi |
3376 | +AC_SUBST([am__include]) |
3377 | +AC_SUBST([am__quote]) |
3378 | +AC_MSG_RESULT([$_am_result]) |
3379 | +rm -f confinc confmf |
3380 | +]) |
3381 | + |
3382 | +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
3383 | + |
3384 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
3385 | +# |
3386 | +# This file is free software; the Free Software Foundation |
3387 | +# gives unlimited permission to copy and/or distribute it, |
3388 | +# with or without modifications, as long as this notice is preserved. |
3389 | + |
3390 | +# AM_MISSING_PROG(NAME, PROGRAM) |
3391 | +# ------------------------------ |
3392 | +AC_DEFUN([AM_MISSING_PROG], |
3393 | +[AC_REQUIRE([AM_MISSING_HAS_RUN]) |
3394 | +$1=${$1-"${am_missing_run}$2"} |
3395 | +AC_SUBST($1)]) |
3396 | + |
3397 | +# AM_MISSING_HAS_RUN |
3398 | +# ------------------ |
3399 | +# Define MISSING if not defined so far and test if it is modern enough. |
3400 | +# If it is, set am_missing_run to use it, otherwise, to nothing. |
3401 | +AC_DEFUN([AM_MISSING_HAS_RUN], |
3402 | +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
3403 | +AC_REQUIRE_AUX_FILE([missing])dnl |
3404 | +if test x"${MISSING+set}" != xset; then |
3405 | + case $am_aux_dir in |
3406 | + *\ * | *\ *) |
3407 | + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; |
3408 | + *) |
3409 | + MISSING="\${SHELL} $am_aux_dir/missing" ;; |
3410 | + esac |
3411 | +fi |
3412 | +# Use eval to expand $SHELL |
3413 | +if eval "$MISSING --is-lightweight"; then |
3414 | + am_missing_run="$MISSING " |
3415 | +else |
3416 | + am_missing_run= |
3417 | + AC_MSG_WARN(['missing' script is too old or missing]) |
3418 | +fi |
3419 | +]) |
3420 | + |
3421 | +# Helper functions for option handling. -*- Autoconf -*- |
3422 | + |
3423 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
3424 | +# |
3425 | +# This file is free software; the Free Software Foundation |
3426 | +# gives unlimited permission to copy and/or distribute it, |
3427 | +# with or without modifications, as long as this notice is preserved. |
3428 | + |
3429 | +# _AM_MANGLE_OPTION(NAME) |
3430 | +# ----------------------- |
3431 | +AC_DEFUN([_AM_MANGLE_OPTION], |
3432 | +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
3433 | + |
3434 | +# _AM_SET_OPTION(NAME) |
3435 | +# -------------------- |
3436 | +# Set option NAME. Presently that only means defining a flag for this option. |
3437 | +AC_DEFUN([_AM_SET_OPTION], |
3438 | +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) |
3439 | + |
3440 | +# _AM_SET_OPTIONS(OPTIONS) |
3441 | +# ------------------------ |
3442 | +# OPTIONS is a space-separated list of Automake options. |
3443 | +AC_DEFUN([_AM_SET_OPTIONS], |
3444 | +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
3445 | + |
3446 | +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) |
3447 | +# ------------------------------------------- |
3448 | +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. |
3449 | +AC_DEFUN([_AM_IF_OPTION], |
3450 | +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
3451 | + |
3452 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
3453 | +# |
3454 | +# This file is free software; the Free Software Foundation |
3455 | +# gives unlimited permission to copy and/or distribute it, |
3456 | +# with or without modifications, as long as this notice is preserved. |
3457 | + |
3458 | +# _AM_PROG_CC_C_O |
3459 | +# --------------- |
3460 | +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC |
3461 | +# to automatically call this. |
3462 | +AC_DEFUN([_AM_PROG_CC_C_O], |
3463 | +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
3464 | +AC_REQUIRE_AUX_FILE([compile])dnl |
3465 | +AC_LANG_PUSH([C])dnl |
3466 | +AC_CACHE_CHECK( |
3467 | + [whether $CC understands -c and -o together], |
3468 | + [am_cv_prog_cc_c_o], |
3469 | + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) |
3470 | + # Make sure it works both with $CC and with simple cc. |
3471 | + # Following AC_PROG_CC_C_O, we do the test twice because some |
3472 | + # compilers refuse to overwrite an existing .o file with -o, |
3473 | + # though they will create one. |
3474 | + am_cv_prog_cc_c_o=yes |
3475 | + for am_i in 1 2; do |
3476 | + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ |
3477 | + && test -f conftest2.$ac_objext; then |
3478 | + : OK |
3479 | + else |
3480 | + am_cv_prog_cc_c_o=no |
3481 | + break |
3482 | + fi |
3483 | + done |
3484 | + rm -f core conftest* |
3485 | + unset am_i]) |
3486 | +if test "$am_cv_prog_cc_c_o" != yes; then |
3487 | + # Losing compiler, so override with the script. |
3488 | + # FIXME: It is wrong to rewrite CC. |
3489 | + # But if we don't then we get into trouble of one sort or another. |
3490 | + # A longer-term fix would be to have automake use am__CC in this case, |
3491 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
3492 | + CC="$am_aux_dir/compile $CC" |
3493 | +fi |
3494 | +AC_LANG_POP([C])]) |
3495 | + |
3496 | +# For backward compatibility. |
3497 | +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
3498 | + |
3499 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
3500 | +# |
3501 | +# This file is free software; the Free Software Foundation |
3502 | +# gives unlimited permission to copy and/or distribute it, |
3503 | +# with or without modifications, as long as this notice is preserved. |
3504 | + |
3505 | +# AM_RUN_LOG(COMMAND) |
3506 | +# ------------------- |
3507 | +# Run COMMAND, save the exit status in ac_status, and log it. |
3508 | +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) |
3509 | +AC_DEFUN([AM_RUN_LOG], |
3510 | +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD |
3511 | + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD |
3512 | + ac_status=$? |
3513 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
3514 | + (exit $ac_status); }]) |
3515 | + |
3516 | +# Check to make sure that the build environment is sane. -*- Autoconf -*- |
3517 | + |
3518 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
3519 | +# |
3520 | +# This file is free software; the Free Software Foundation |
3521 | +# gives unlimited permission to copy and/or distribute it, |
3522 | +# with or without modifications, as long as this notice is preserved. |
3523 | + |
3524 | +# AM_SANITY_CHECK |
3525 | +# --------------- |
3526 | +AC_DEFUN([AM_SANITY_CHECK], |
3527 | +[AC_MSG_CHECKING([whether build environment is sane]) |
3528 | +# Reject unsafe characters in $srcdir or the absolute working directory |
3529 | +# name. Accept space and tab only in the latter. |
3530 | +am_lf=' |
3531 | +' |
3532 | +case `pwd` in |
3533 | + *[[\\\"\#\$\&\'\`$am_lf]]*) |
3534 | + AC_MSG_ERROR([unsafe absolute working directory name]);; |
3535 | +esac |
3536 | +case $srcdir in |
3537 | + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) |
3538 | + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; |
3539 | +esac |
3540 | + |
3541 | +# Do 'set' in a subshell so we don't clobber the current shell's |
3542 | +# arguments. Must try -L first in case configure is actually a |
3543 | +# symlink; some systems play weird games with the mod time of symlinks |
3544 | +# (eg FreeBSD returns the mod time of the symlink's containing |
3545 | +# directory). |
3546 | +if ( |
3547 | + am_has_slept=no |
3548 | + for am_try in 1 2; do |
3549 | + echo "timestamp, slept: $am_has_slept" > conftest.file |
3550 | + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
3551 | + if test "$[*]" = "X"; then |
3552 | + # -L didn't work. |
3553 | + set X `ls -t "$srcdir/configure" conftest.file` |
3554 | + fi |
3555 | + if test "$[*]" != "X $srcdir/configure conftest.file" \ |
3556 | + && test "$[*]" != "X conftest.file $srcdir/configure"; then |
3557 | + |
3558 | + # If neither matched, then we have a broken ls. This can happen |
3559 | + # if, for instance, CONFIG_SHELL is bash and it inherits a |
3560 | + # broken ls alias from the environment. This has actually |
3561 | + # happened. Such a system could not be considered "sane". |
3562 | + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken |
3563 | + alias in your environment]) |
3564 | + fi |
3565 | + if test "$[2]" = conftest.file || test $am_try -eq 2; then |
3566 | + break |
3567 | + fi |
3568 | + # Just in case. |
3569 | + sleep 1 |
3570 | + am_has_slept=yes |
3571 | + done |
3572 | + test "$[2]" = conftest.file |
3573 | + ) |
3574 | +then |
3575 | + # Ok. |
3576 | + : |
3577 | +else |
3578 | + AC_MSG_ERROR([newly created file is older than distributed files! |
3579 | +Check your system clock]) |
3580 | +fi |
3581 | +AC_MSG_RESULT([yes]) |
3582 | +# If we didn't sleep, we still need to ensure time stamps of config.status and |
3583 | +# generated files are strictly newer. |
3584 | +am_sleep_pid= |
3585 | +if grep 'slept: no' conftest.file >/dev/null 2>&1; then |
3586 | + ( sleep 1 ) & |
3587 | + am_sleep_pid=$! |
3588 | +fi |
3589 | +AC_CONFIG_COMMANDS_PRE( |
3590 | + [AC_MSG_CHECKING([that generated files are newer than configure]) |
3591 | + if test -n "$am_sleep_pid"; then |
3592 | + # Hide warnings about reused PIDs. |
3593 | + wait $am_sleep_pid 2>/dev/null |
3594 | + fi |
3595 | + AC_MSG_RESULT([done])]) |
3596 | +rm -f conftest.file |
3597 | +]) |
3598 | + |
3599 | +# Copyright (C) 2009-2013 Free Software Foundation, Inc. |
3600 | +# |
3601 | +# This file is free software; the Free Software Foundation |
3602 | +# gives unlimited permission to copy and/or distribute it, |
3603 | +# with or without modifications, as long as this notice is preserved. |
3604 | + |
3605 | +# AM_SILENT_RULES([DEFAULT]) |
3606 | +# -------------------------- |
3607 | +# Enable less verbose build rules; with the default set to DEFAULT |
3608 | +# ("yes" being less verbose, "no" or empty being verbose). |
3609 | +AC_DEFUN([AM_SILENT_RULES], |
3610 | +[AC_ARG_ENABLE([silent-rules], [dnl |
3611 | +AS_HELP_STRING( |
3612 | + [--enable-silent-rules], |
3613 | + [less verbose build output (undo: "make V=1")]) |
3614 | +AS_HELP_STRING( |
3615 | + [--disable-silent-rules], |
3616 | + [verbose build output (undo: "make V=0")])dnl |
3617 | +]) |
3618 | +case $enable_silent_rules in @%:@ ((( |
3619 | + yes) AM_DEFAULT_VERBOSITY=0;; |
3620 | + no) AM_DEFAULT_VERBOSITY=1;; |
3621 | + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
3622 | +esac |
3623 | +dnl |
3624 | +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) |
3625 | +dnl do not support nested variable expansions. |
3626 | +dnl See automake bug#9928 and bug#10237. |
3627 | +am_make=${MAKE-make} |
3628 | +AC_CACHE_CHECK([whether $am_make supports nested variables], |
3629 | + [am_cv_make_support_nested_variables], |
3630 | + [if AS_ECHO([['TRUE=$(BAR$(V)) |
3631 | +BAR0=false |
3632 | +BAR1=true |
3633 | +V=1 |
3634 | +am__doit: |
3635 | + @$(TRUE) |
3636 | +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then |
3637 | + am_cv_make_support_nested_variables=yes |
3638 | +else |
3639 | + am_cv_make_support_nested_variables=no |
3640 | +fi]) |
3641 | +if test $am_cv_make_support_nested_variables = yes; then |
3642 | + dnl Using '$V' instead of '$(V)' breaks IRIX make. |
3643 | + AM_V='$(V)' |
3644 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
3645 | +else |
3646 | + AM_V=$AM_DEFAULT_VERBOSITY |
3647 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
3648 | +fi |
3649 | +AC_SUBST([AM_V])dnl |
3650 | +AM_SUBST_NOTMAKE([AM_V])dnl |
3651 | +AC_SUBST([AM_DEFAULT_V])dnl |
3652 | +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl |
3653 | +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl |
3654 | +AM_BACKSLASH='\' |
3655 | +AC_SUBST([AM_BACKSLASH])dnl |
3656 | +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
3657 | +]) |
3658 | + |
3659 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
3660 | +# |
3661 | +# This file is free software; the Free Software Foundation |
3662 | +# gives unlimited permission to copy and/or distribute it, |
3663 | +# with or without modifications, as long as this notice is preserved. |
3664 | + |
3665 | +# AM_PROG_INSTALL_STRIP |
3666 | +# --------------------- |
3667 | +# One issue with vendor 'install' (even GNU) is that you can't |
3668 | +# specify the program used to strip binaries. This is especially |
3669 | +# annoying in cross-compiling environments, where the build's strip |
3670 | +# is unlikely to handle the host's binaries. |
3671 | +# Fortunately install-sh will honor a STRIPPROG variable, so we |
3672 | +# always use install-sh in "make install-strip", and initialize |
3673 | +# STRIPPROG with the value of the STRIP variable (set by the user). |
3674 | +AC_DEFUN([AM_PROG_INSTALL_STRIP], |
3675 | +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
3676 | +# Installed binaries are usually stripped using 'strip' when the user |
3677 | +# run "make install-strip". However 'strip' might not be the right |
3678 | +# tool to use in cross-compilation environments, therefore Automake |
3679 | +# will honor the 'STRIP' environment variable to overrule this program. |
3680 | +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. |
3681 | +if test "$cross_compiling" != no; then |
3682 | + AC_CHECK_TOOL([STRIP], [strip], :) |
3683 | +fi |
3684 | +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
3685 | +AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
3686 | + |
3687 | +# Copyright (C) 2006-2013 Free Software Foundation, Inc. |
3688 | +# |
3689 | +# This file is free software; the Free Software Foundation |
3690 | +# gives unlimited permission to copy and/or distribute it, |
3691 | +# with or without modifications, as long as this notice is preserved. |
3692 | + |
3693 | +# _AM_SUBST_NOTMAKE(VARIABLE) |
3694 | +# --------------------------- |
3695 | +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
3696 | +# This macro is traced by Automake. |
3697 | +AC_DEFUN([_AM_SUBST_NOTMAKE]) |
3698 | + |
3699 | +# AM_SUBST_NOTMAKE(VARIABLE) |
3700 | +# -------------------------- |
3701 | +# Public sister of _AM_SUBST_NOTMAKE. |
3702 | +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
3703 | + |
3704 | +# Check how to create a tarball. -*- Autoconf -*- |
3705 | + |
3706 | +# Copyright (C) 2004-2013 Free Software Foundation, Inc. |
3707 | +# |
3708 | +# This file is free software; the Free Software Foundation |
3709 | +# gives unlimited permission to copy and/or distribute it, |
3710 | +# with or without modifications, as long as this notice is preserved. |
3711 | + |
3712 | +# _AM_PROG_TAR(FORMAT) |
3713 | +# -------------------- |
3714 | +# Check how to create a tarball in format FORMAT. |
3715 | +# FORMAT should be one of 'v7', 'ustar', or 'pax'. |
3716 | +# |
3717 | +# Substitute a variable $(am__tar) that is a command |
3718 | +# writing to stdout a FORMAT-tarball containing the directory |
3719 | +# $tardir. |
3720 | +# tardir=directory && $(am__tar) > result.tar |
3721 | +# |
3722 | +# Substitute a variable $(am__untar) that extract such |
3723 | +# a tarball read from stdin. |
3724 | +# $(am__untar) < result.tar |
3725 | +# |
3726 | +AC_DEFUN([_AM_PROG_TAR], |
3727 | +[# Always define AMTAR for backward compatibility. Yes, it's still used |
3728 | +# in the wild :-( We should find a proper way to deprecate it ... |
3729 | +AC_SUBST([AMTAR], ['$${TAR-tar}']) |
3730 | + |
3731 | +# We'll loop over all known methods to create a tar archive until one works. |
3732 | +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
3733 | + |
3734 | +m4_if([$1], [v7], |
3735 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
3736 | + |
3737 | + [m4_case([$1], |
3738 | + [ustar], |
3739 | + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. |
3740 | + # There is notably a 21 bits limit for the UID and the GID. In fact, |
3741 | + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 |
3742 | + # and bug#13588). |
3743 | + am_max_uid=2097151 # 2^21 - 1 |
3744 | + am_max_gid=$am_max_uid |
3745 | + # The $UID and $GID variables are not portable, so we need to resort |
3746 | + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls |
3747 | + # below are definitely unexpected, so allow the users to see them |
3748 | + # (that is, avoid stderr redirection). |
3749 | + am_uid=`id -u || echo unknown` |
3750 | + am_gid=`id -g || echo unknown` |
3751 | + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) |
3752 | + if test $am_uid -le $am_max_uid; then |
3753 | + AC_MSG_RESULT([yes]) |
3754 | + else |
3755 | + AC_MSG_RESULT([no]) |
3756 | + _am_tools=none |
3757 | + fi |
3758 | + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) |
3759 | + if test $am_gid -le $am_max_gid; then |
3760 | + AC_MSG_RESULT([yes]) |
3761 | + else |
3762 | + AC_MSG_RESULT([no]) |
3763 | + _am_tools=none |
3764 | + fi], |
3765 | + |
3766 | + [pax], |
3767 | + [], |
3768 | + |
3769 | + [m4_fatal([Unknown tar format])]) |
3770 | + |
3771 | + AC_MSG_CHECKING([how to create a $1 tar archive]) |
3772 | + |
3773 | + # Go ahead even if we have the value already cached. We do so because we |
3774 | + # need to set the values for the 'am__tar' and 'am__untar' variables. |
3775 | + _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
3776 | + |
3777 | + for _am_tool in $_am_tools; do |
3778 | + case $_am_tool in |
3779 | + gnutar) |
3780 | + for _am_tar in tar gnutar gtar; do |
3781 | + AM_RUN_LOG([$_am_tar --version]) && break |
3782 | + done |
3783 | + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
3784 | + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
3785 | + am__untar="$_am_tar -xf -" |
3786 | + ;; |
3787 | + plaintar) |
3788 | + # Must skip GNU tar: if it does not support --format= it doesn't create |
3789 | + # ustar tarball either. |
3790 | + (tar --version) >/dev/null 2>&1 && continue |
3791 | + am__tar='tar chf - "$$tardir"' |
3792 | + am__tar_='tar chf - "$tardir"' |
3793 | + am__untar='tar xf -' |
3794 | + ;; |
3795 | + pax) |
3796 | + am__tar='pax -L -x $1 -w "$$tardir"' |
3797 | + am__tar_='pax -L -x $1 -w "$tardir"' |
3798 | + am__untar='pax -r' |
3799 | + ;; |
3800 | + cpio) |
3801 | + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
3802 | + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
3803 | + am__untar='cpio -i -H $1 -d' |
3804 | + ;; |
3805 | + none) |
3806 | + am__tar=false |
3807 | + am__tar_=false |
3808 | + am__untar=false |
3809 | + ;; |
3810 | + esac |
3811 | + |
3812 | + # If the value was cached, stop now. We just wanted to have am__tar |
3813 | + # and am__untar set. |
3814 | + test -n "${am_cv_prog_tar_$1}" && break |
3815 | + |
3816 | + # tar/untar a dummy directory, and stop if the command works. |
3817 | + rm -rf conftest.dir |
3818 | + mkdir conftest.dir |
3819 | + echo GrepMe > conftest.dir/file |
3820 | + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
3821 | + rm -rf conftest.dir |
3822 | + if test -s conftest.tar; then |
3823 | + AM_RUN_LOG([$am__untar <conftest.tar]) |
3824 | + AM_RUN_LOG([cat conftest.dir/file]) |
3825 | + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
3826 | + fi |
3827 | + done |
3828 | + rm -rf conftest.dir |
3829 | + |
3830 | + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
3831 | + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
3832 | + |
3833 | +AC_SUBST([am__tar]) |
3834 | +AC_SUBST([am__untar]) |
3835 | +]) # _AM_PROG_TAR |
3836 | + |
3837 | |
3838 | === modified file 'config.guess' |
3839 | --- config.guess 2014-11-07 11:33:39 +0000 |
3840 | +++ config.guess 2014-11-15 21:17:54 +0000 |
3841 | @@ -1,8 +1,8 @@ |
3842 | #! /bin/sh |
3843 | # Attempt to guess a canonical system name. |
3844 | -# Copyright 1992-2013 Free Software Foundation, Inc. |
3845 | +# Copyright 1992-2014 Free Software Foundation, Inc. |
3846 | |
3847 | -timestamp='2013-11-29' |
3848 | +timestamp='2014-03-23' |
3849 | |
3850 | # This file is free software; you can redistribute it and/or modify it |
3851 | # under the terms of the GNU General Public License as published by |
3852 | @@ -50,7 +50,7 @@ |
3853 | GNU config.guess ($timestamp) |
3854 | |
3855 | Originally written by Per Bothner. |
3856 | -Copyright 1992-2013 Free Software Foundation, Inc. |
3857 | +Copyright 1992-2014 Free Software Foundation, Inc. |
3858 | |
3859 | This is free software; see the source for copying conditions. There is NO |
3860 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
3861 | @@ -149,7 +149,7 @@ |
3862 | LIBC=gnu |
3863 | #endif |
3864 | EOF |
3865 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
3866 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` |
3867 | ;; |
3868 | esac |
3869 | |
3870 | @@ -826,7 +826,7 @@ |
3871 | *:MINGW*:*) |
3872 | echo ${UNAME_MACHINE}-pc-mingw32 |
3873 | exit ;; |
3874 | - i*:MSYS*:*) |
3875 | + *:MSYS*:*) |
3876 | echo ${UNAME_MACHINE}-pc-msys |
3877 | exit ;; |
3878 | i*:windows32*:*) |
3879 | @@ -969,10 +969,10 @@ |
3880 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
3881 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
3882 | ;; |
3883 | - or1k:Linux:*:*) |
3884 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3885 | + openrisc*:Linux:*:*) |
3886 | + echo or1k-unknown-linux-${LIBC} |
3887 | exit ;; |
3888 | - or32:Linux:*:*) |
3889 | + or32:Linux:*:* | or1k*:Linux:*:*) |
3890 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3891 | exit ;; |
3892 | padre:Linux:*:*) |
3893 | @@ -1371,154 +1371,6 @@ |
3894 | exit ;; |
3895 | esac |
3896 | |
3897 | -eval $set_cc_for_build |
3898 | -cat >$dummy.c <<EOF |
3899 | -#ifdef _SEQUENT_ |
3900 | -# include <sys/types.h> |
3901 | -# include <sys/utsname.h> |
3902 | -#endif |
3903 | -main () |
3904 | -{ |
3905 | -#if defined (sony) |
3906 | -#if defined (MIPSEB) |
3907 | - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, |
3908 | - I don't know.... */ |
3909 | - printf ("mips-sony-bsd\n"); exit (0); |
3910 | -#else |
3911 | -#include <sys/param.h> |
3912 | - printf ("m68k-sony-newsos%s\n", |
3913 | -#ifdef NEWSOS4 |
3914 | - "4" |
3915 | -#else |
3916 | - "" |
3917 | -#endif |
3918 | - ); exit (0); |
3919 | -#endif |
3920 | -#endif |
3921 | - |
3922 | -#if defined (__arm) && defined (__acorn) && defined (__unix) |
3923 | - printf ("arm-acorn-riscix\n"); exit (0); |
3924 | -#endif |
3925 | - |
3926 | -#if defined (hp300) && !defined (hpux) |
3927 | - printf ("m68k-hp-bsd\n"); exit (0); |
3928 | -#endif |
3929 | - |
3930 | -#if defined (NeXT) |
3931 | -#if !defined (__ARCHITECTURE__) |
3932 | -#define __ARCHITECTURE__ "m68k" |
3933 | -#endif |
3934 | - int version; |
3935 | - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; |
3936 | - if (version < 4) |
3937 | - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); |
3938 | - else |
3939 | - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); |
3940 | - exit (0); |
3941 | -#endif |
3942 | - |
3943 | -#if defined (MULTIMAX) || defined (n16) |
3944 | -#if defined (UMAXV) |
3945 | - printf ("ns32k-encore-sysv\n"); exit (0); |
3946 | -#else |
3947 | -#if defined (CMU) |
3948 | - printf ("ns32k-encore-mach\n"); exit (0); |
3949 | -#else |
3950 | - printf ("ns32k-encore-bsd\n"); exit (0); |
3951 | -#endif |
3952 | -#endif |
3953 | -#endif |
3954 | - |
3955 | -#if defined (__386BSD__) |
3956 | - printf ("i386-pc-bsd\n"); exit (0); |
3957 | -#endif |
3958 | - |
3959 | -#if defined (sequent) |
3960 | -#if defined (i386) |
3961 | - printf ("i386-sequent-dynix\n"); exit (0); |
3962 | -#endif |
3963 | -#if defined (ns32000) |
3964 | - printf ("ns32k-sequent-dynix\n"); exit (0); |
3965 | -#endif |
3966 | -#endif |
3967 | - |
3968 | -#if defined (_SEQUENT_) |
3969 | - struct utsname un; |
3970 | - |
3971 | - uname(&un); |
3972 | - |
3973 | - if (strncmp(un.version, "V2", 2) == 0) { |
3974 | - printf ("i386-sequent-ptx2\n"); exit (0); |
3975 | - } |
3976 | - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ |
3977 | - printf ("i386-sequent-ptx1\n"); exit (0); |
3978 | - } |
3979 | - printf ("i386-sequent-ptx\n"); exit (0); |
3980 | - |
3981 | -#endif |
3982 | - |
3983 | -#if defined (vax) |
3984 | -# if !defined (ultrix) |
3985 | -# include <sys/param.h> |
3986 | -# if defined (BSD) |
3987 | -# if BSD == 43 |
3988 | - printf ("vax-dec-bsd4.3\n"); exit (0); |
3989 | -# else |
3990 | -# if BSD == 199006 |
3991 | - printf ("vax-dec-bsd4.3reno\n"); exit (0); |
3992 | -# else |
3993 | - printf ("vax-dec-bsd\n"); exit (0); |
3994 | -# endif |
3995 | -# endif |
3996 | -# else |
3997 | - printf ("vax-dec-bsd\n"); exit (0); |
3998 | -# endif |
3999 | -# else |
4000 | - printf ("vax-dec-ultrix\n"); exit (0); |
4001 | -# endif |
4002 | -#endif |
4003 | - |
4004 | -#if defined (alliant) && defined (i860) |
4005 | - printf ("i860-alliant-bsd\n"); exit (0); |
4006 | -#endif |
4007 | - |
4008 | - exit (1); |
4009 | -} |
4010 | -EOF |
4011 | - |
4012 | -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && |
4013 | - { echo "$SYSTEM_NAME"; exit; } |
4014 | - |
4015 | -# Apollos put the system type in the environment. |
4016 | - |
4017 | -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } |
4018 | - |
4019 | -# Convex versions that predate uname can use getsysinfo(1) |
4020 | - |
4021 | -if [ -x /usr/convex/getsysinfo ] |
4022 | -then |
4023 | - case `getsysinfo -f cpu_type` in |
4024 | - c1*) |
4025 | - echo c1-convex-bsd |
4026 | - exit ;; |
4027 | - c2*) |
4028 | - if getsysinfo -f scalar_acc |
4029 | - then echo c32-convex-bsd |
4030 | - else echo c2-convex-bsd |
4031 | - fi |
4032 | - exit ;; |
4033 | - c34*) |
4034 | - echo c34-convex-bsd |
4035 | - exit ;; |
4036 | - c38*) |
4037 | - echo c38-convex-bsd |
4038 | - exit ;; |
4039 | - c4*) |
4040 | - echo c4-convex-bsd |
4041 | - exit ;; |
4042 | - esac |
4043 | -fi |
4044 | - |
4045 | cat >&2 <<EOF |
4046 | $0: unable to guess system type |
4047 | |
4048 | |
4049 | === modified file 'config.sub' |
4050 | --- config.sub 2014-11-07 11:33:39 +0000 |
4051 | +++ config.sub 2014-11-15 21:17:54 +0000 |
4052 | @@ -1,8 +1,8 @@ |
4053 | #! /bin/sh |
4054 | # Configuration validation subroutine script. |
4055 | -# Copyright 1992-2013 Free Software Foundation, Inc. |
4056 | +# Copyright 1992-2014 Free Software Foundation, Inc. |
4057 | |
4058 | -timestamp='2013-10-01' |
4059 | +timestamp='2014-09-11' |
4060 | |
4061 | # This file is free software; you can redistribute it and/or modify it |
4062 | # under the terms of the GNU General Public License as published by |
4063 | @@ -68,7 +68,7 @@ |
4064 | version="\ |
4065 | GNU config.sub ($timestamp) |
4066 | |
4067 | -Copyright 1992-2013 Free Software Foundation, Inc. |
4068 | +Copyright 1992-2014 Free Software Foundation, Inc. |
4069 | |
4070 | This is free software; see the source for copying conditions. There is NO |
4071 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4072 | @@ -283,8 +283,10 @@ |
4073 | | mips64vr5900 | mips64vr5900el \ |
4074 | | mipsisa32 | mipsisa32el \ |
4075 | | mipsisa32r2 | mipsisa32r2el \ |
4076 | + | mipsisa32r6 | mipsisa32r6el \ |
4077 | | mipsisa64 | mipsisa64el \ |
4078 | | mipsisa64r2 | mipsisa64r2el \ |
4079 | + | mipsisa64r6 | mipsisa64r6el \ |
4080 | | mipsisa64sb1 | mipsisa64sb1el \ |
4081 | | mipsisa64sr71k | mipsisa64sr71kel \ |
4082 | | mipsr5900 | mipsr5900el \ |
4083 | @@ -296,11 +298,11 @@ |
4084 | | nds32 | nds32le | nds32be \ |
4085 | | nios | nios2 | nios2eb | nios2el \ |
4086 | | ns16k | ns32k \ |
4087 | - | open8 \ |
4088 | - | or1k | or32 \ |
4089 | + | open8 | or1k | or1knd | or32 \ |
4090 | | pdp10 | pdp11 | pj | pjl \ |
4091 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
4092 | | pyramid \ |
4093 | + | riscv32 | riscv64 \ |
4094 | | rl78 | rx \ |
4095 | | score \ |
4096 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
4097 | @@ -402,8 +404,10 @@ |
4098 | | mips64vr5900-* | mips64vr5900el-* \ |
4099 | | mipsisa32-* | mipsisa32el-* \ |
4100 | | mipsisa32r2-* | mipsisa32r2el-* \ |
4101 | + | mipsisa32r6-* | mipsisa32r6el-* \ |
4102 | | mipsisa64-* | mipsisa64el-* \ |
4103 | | mipsisa64r2-* | mipsisa64r2el-* \ |
4104 | + | mipsisa64r6-* | mipsisa64r6el-* \ |
4105 | | mipsisa64sb1-* | mipsisa64sb1el-* \ |
4106 | | mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
4107 | | mipsr5900-* | mipsr5900el-* \ |
4108 | @@ -415,6 +419,7 @@ |
4109 | | nios-* | nios2-* | nios2eb-* | nios2el-* \ |
4110 | | none-* | np1-* | ns16k-* | ns32k-* \ |
4111 | | open8-* \ |
4112 | + | or1k*-* \ |
4113 | | orion-* \ |
4114 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
4115 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
4116 | @@ -824,6 +829,10 @@ |
4117 | basic_machine=powerpc-unknown |
4118 | os=-morphos |
4119 | ;; |
4120 | + moxiebox) |
4121 | + basic_machine=moxie-unknown |
4122 | + os=-moxiebox |
4123 | + ;; |
4124 | msdos) |
4125 | basic_machine=i386-pc |
4126 | os=-msdos |
4127 | @@ -1008,7 +1017,7 @@ |
4128 | ;; |
4129 | ppc64) basic_machine=powerpc64-unknown |
4130 | ;; |
4131 | - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
4132 | + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
4133 | ;; |
4134 | ppc64le | powerpc64little | ppc64-le | powerpc64-little) |
4135 | basic_machine=powerpc64le-unknown |
4136 | @@ -1369,14 +1378,14 @@ |
4137 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
4138 | | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
4139 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
4140 | - | -uxpv* | -beos* | -mpeix* | -udk* \ |
4141 | + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ |
4142 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
4143 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
4144 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
4145 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
4146 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
4147 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
4148 | - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
4149 | + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) |
4150 | # Remember, each alternative MUST END IN *, to match a version number. |
4151 | ;; |
4152 | -qnx*) |
4153 | @@ -1594,9 +1603,6 @@ |
4154 | mips*-*) |
4155 | os=-elf |
4156 | ;; |
4157 | - or1k-*) |
4158 | - os=-elf |
4159 | - ;; |
4160 | or32-*) |
4161 | os=-coff |
4162 | ;; |
4163 | |
4164 | === modified file 'configure' |
4165 | --- configure 2014-11-07 11:33:39 +0000 |
4166 | +++ configure 2014-11-15 21:17:54 +0000 |
4167 | @@ -1,6 +1,6 @@ |
4168 | #! /bin/sh |
4169 | # Guess values for system-dependent variables and create Makefiles. |
4170 | -# Generated by GNU Autoconf 2.69 for brasero 3.11.4. |
4171 | +# Generated by GNU Autoconf 2.69 for brasero 3.12.0. |
4172 | # |
4173 | # |
4174 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
4175 | @@ -587,8 +587,8 @@ |
4176 | # Identity of this package. |
4177 | PACKAGE_NAME='brasero' |
4178 | PACKAGE_TARNAME='brasero' |
4179 | -PACKAGE_VERSION='3.11.4' |
4180 | -PACKAGE_STRING='brasero 3.11.4' |
4181 | +PACKAGE_VERSION='3.12.0' |
4182 | +PACKAGE_STRING='brasero 3.12.0' |
4183 | PACKAGE_BUGREPORT='' |
4184 | PACKAGE_URL='' |
4185 | |
4186 | @@ -1546,7 +1546,7 @@ |
4187 | # Omit some internal or obsolete options to make the list less imposing. |
4188 | # This message is too long to be a string in the A/UX 3.1 sh. |
4189 | cat <<_ACEOF |
4190 | -\`configure' configures brasero 3.11.4 to adapt to many kinds of systems. |
4191 | +\`configure' configures brasero 3.12.0 to adapt to many kinds of systems. |
4192 | |
4193 | Usage: $0 [OPTION]... [VAR=VALUE]... |
4194 | |
4195 | @@ -1616,7 +1616,7 @@ |
4196 | |
4197 | if test -n "$ac_init_help"; then |
4198 | case $ac_init_help in |
4199 | - short | recursive ) echo "Configuration of brasero 3.11.4:";; |
4200 | + short | recursive ) echo "Configuration of brasero 3.12.0:";; |
4201 | esac |
4202 | cat <<\_ACEOF |
4203 | |
4204 | @@ -1836,7 +1836,7 @@ |
4205 | test -n "$ac_init_help" && exit $ac_status |
4206 | if $ac_init_version; then |
4207 | cat <<\_ACEOF |
4208 | -brasero configure 3.11.4 |
4209 | +brasero configure 3.12.0 |
4210 | generated by GNU Autoconf 2.69 |
4211 | |
4212 | Copyright (C) 2012 Free Software Foundation, Inc. |
4213 | @@ -2255,7 +2255,7 @@ |
4214 | This file contains any messages produced by compilers while |
4215 | running configure, to aid debugging if configure makes a mistake. |
4216 | |
4217 | -It was created by brasero $as_me 3.11.4, which was |
4218 | +It was created by brasero $as_me 3.12.0, which was |
4219 | generated by GNU Autoconf 2.69. Invocation command line was |
4220 | |
4221 | $ $0 $@ |
4222 | @@ -2606,8 +2606,8 @@ |
4223 | |
4224 | |
4225 | BRASERO_MAJOR_VERSION=3 |
4226 | -BRASERO_MINOR_VERSION=11 |
4227 | -BRASERO_SUB=4 |
4228 | +BRASERO_MINOR_VERSION=12 |
4229 | +BRASERO_SUB=0 |
4230 | BRASERO_VERSION=$BRASERO_MAJOR_VERSION.$BRASERO_MINOR_VERSION.$BRASERO_SUB |
4231 | |
4232 | |
4233 | @@ -2853,8 +2853,8 @@ |
4234 | ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' |
4235 | program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` |
4236 | |
4237 | -# expand $ac_aux_dir to an absolute path |
4238 | -am_aux_dir=`cd $ac_aux_dir && pwd` |
4239 | +# Expand $ac_aux_dir to an absolute path. |
4240 | +am_aux_dir=`cd "$ac_aux_dir" && pwd` |
4241 | |
4242 | if test x"${MISSING+set}" != xset; then |
4243 | case $am_aux_dir in |
4244 | @@ -3167,7 +3167,7 @@ |
4245 | |
4246 | # Define the identity of the package. |
4247 | PACKAGE='brasero' |
4248 | - VERSION='3.11.4' |
4249 | + VERSION='3.12.0' |
4250 | |
4251 | |
4252 | cat >>confdefs.h <<_ACEOF |
4253 | @@ -3260,6 +3260,7 @@ |
4254 | fi |
4255 | fi |
4256 | |
4257 | + |
4258 | # Check whether --enable-silent-rules was given. |
4259 | if test "${enable_silent_rules+set}" = set; then : |
4260 | enableval=$enable_silent_rules; |
4261 | @@ -5258,7 +5259,8 @@ |
4262 | ;; |
4263 | *) |
4264 | lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` |
4265 | - if test -n "$lt_cv_sys_max_cmd_len"; then |
4266 | + if test -n "$lt_cv_sys_max_cmd_len" && \ |
4267 | + test undefined != "$lt_cv_sys_max_cmd_len"; then |
4268 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
4269 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
4270 | else |
4271 | @@ -5659,10 +5661,6 @@ |
4272 | fi |
4273 | ;; |
4274 | |
4275 | -gnu*) |
4276 | - lt_cv_deplibs_check_method=pass_all |
4277 | - ;; |
4278 | - |
4279 | haiku*) |
4280 | lt_cv_deplibs_check_method=pass_all |
4281 | ;; |
4282 | @@ -5701,11 +5699,11 @@ |
4283 | ;; |
4284 | |
4285 | # This must be glibc/ELF. |
4286 | -linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4287 | +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
4288 | lt_cv_deplibs_check_method=pass_all |
4289 | ;; |
4290 | |
4291 | -netbsd*) |
4292 | +netbsd* | netbsdelf*-gnu) |
4293 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
4294 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
4295 | else |
4296 | @@ -6799,12 +6797,19 @@ |
4297 | LD="${LD-ld} -m elf_i386_fbsd" |
4298 | ;; |
4299 | x86_64-*linux*) |
4300 | - LD="${LD-ld} -m elf_i386" |
4301 | + case `/usr/bin/file conftest.o` in |
4302 | + *x86-64*) |
4303 | + LD="${LD-ld} -m elf32_x86_64" |
4304 | + ;; |
4305 | + *) |
4306 | + LD="${LD-ld} -m elf_i386" |
4307 | + ;; |
4308 | + esac |
4309 | ;; |
4310 | - powerpc64le-*linux*) |
4311 | + powerpc64le-*) |
4312 | LD="${LD-ld} -m elf32lppclinux" |
4313 | ;; |
4314 | - powerpc64-*linux*) |
4315 | + powerpc64-*) |
4316 | LD="${LD-ld} -m elf32ppclinux" |
4317 | ;; |
4318 | s390x-*linux*) |
4319 | @@ -6823,10 +6828,10 @@ |
4320 | x86_64-*linux*) |
4321 | LD="${LD-ld} -m elf_x86_64" |
4322 | ;; |
4323 | - powerpcle-*linux*) |
4324 | + powerpcle-*) |
4325 | LD="${LD-ld} -m elf64lppc" |
4326 | ;; |
4327 | - powerpc-*linux*) |
4328 | + powerpc-*) |
4329 | LD="${LD-ld} -m elf64ppc" |
4330 | ;; |
4331 | s390*-*linux*|s390*-*tpf*) |
4332 | @@ -8600,7 +8605,7 @@ |
4333 | lt_prog_compiler_static='-non_shared' |
4334 | ;; |
4335 | |
4336 | - linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4337 | + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
4338 | case $cc_basename in |
4339 | # old Intel for x86_64 which still supported -KPIC. |
4340 | ecc*) |
4341 | @@ -9078,6 +9083,9 @@ |
4342 | openbsd*) |
4343 | with_gnu_ld=no |
4344 | ;; |
4345 | + linux* | k*bsd*-gnu | gnu*) |
4346 | + link_all_deplibs=no |
4347 | + ;; |
4348 | esac |
4349 | |
4350 | ld_shlibs=yes |
4351 | @@ -9299,7 +9307,7 @@ |
4352 | fi |
4353 | ;; |
4354 | |
4355 | - netbsd*) |
4356 | + netbsd* | netbsdelf*-gnu) |
4357 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4358 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4359 | wlarc= |
4360 | @@ -9476,6 +9484,7 @@ |
4361 | if test "$aix_use_runtimelinking" = yes; then |
4362 | shared_flag="$shared_flag "'${wl}-G' |
4363 | fi |
4364 | + link_all_deplibs=no |
4365 | else |
4366 | # not using gcc |
4367 | if test "$host_cpu" = ia64; then |
4368 | @@ -9929,7 +9938,7 @@ |
4369 | link_all_deplibs=yes |
4370 | ;; |
4371 | |
4372 | - netbsd*) |
4373 | + netbsd* | netbsdelf*-gnu) |
4374 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4375 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
4376 | else |
4377 | @@ -10766,17 +10775,6 @@ |
4378 | esac |
4379 | ;; |
4380 | |
4381 | -gnu*) |
4382 | - version_type=linux # correct to gnu/linux during the next big refactor |
4383 | - need_lib_prefix=no |
4384 | - need_version=no |
4385 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
4386 | - soname_spec='${libname}${release}${shared_ext}$major' |
4387 | - shlibpath_var=LD_LIBRARY_PATH |
4388 | - shlibpath_overrides_runpath=no |
4389 | - hardcode_into_libs=yes |
4390 | - ;; |
4391 | - |
4392 | haiku*) |
4393 | version_type=linux # correct to gnu/linux during the next big refactor |
4394 | need_lib_prefix=no |
4395 | @@ -10893,7 +10891,7 @@ |
4396 | ;; |
4397 | |
4398 | # This must be glibc/ELF. |
4399 | -linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4400 | +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
4401 | version_type=linux # correct to gnu/linux during the next big refactor |
4402 | need_lib_prefix=no |
4403 | need_version=no |
4404 | @@ -10942,14 +10940,10 @@ |
4405 | # before this can be enabled. |
4406 | hardcode_into_libs=yes |
4407 | |
4408 | - # Add ABI-specific directories to the system library path. |
4409 | - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" |
4410 | - |
4411 | # Append ld.so.conf contents to the search path |
4412 | if test -f /etc/ld.so.conf; then |
4413 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` |
4414 | - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" |
4415 | - |
4416 | + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
4417 | fi |
4418 | |
4419 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
4420 | @@ -10961,6 +10955,18 @@ |
4421 | dynamic_linker='GNU/Linux ld.so' |
4422 | ;; |
4423 | |
4424 | +netbsdelf*-gnu) |
4425 | + version_type=linux |
4426 | + need_lib_prefix=no |
4427 | + need_version=no |
4428 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
4429 | + soname_spec='${libname}${release}${shared_ext}$major' |
4430 | + shlibpath_var=LD_LIBRARY_PATH |
4431 | + shlibpath_overrides_runpath=no |
4432 | + hardcode_into_libs=yes |
4433 | + dynamic_linker='NetBSD ld.elf_so' |
4434 | + ;; |
4435 | + |
4436 | netbsd*) |
4437 | version_type=sunos |
4438 | need_lib_prefix=no |
4439 | @@ -14066,7 +14072,7 @@ |
4440 | We can't simply define LARGE_OFF_T to be 9223372036854775807, |
4441 | since some C++ compilers masquerading as C compilers |
4442 | incorrectly reject 9223372036854775807. */ |
4443 | -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) |
4444 | +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) |
4445 | int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 |
4446 | && LARGE_OFF_T % 2147483647 == 1) |
4447 | ? 1 : -1]; |
4448 | @@ -14112,7 +14118,7 @@ |
4449 | We can't simply define LARGE_OFF_T to be 9223372036854775807, |
4450 | since some C++ compilers masquerading as C compilers |
4451 | incorrectly reject 9223372036854775807. */ |
4452 | -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) |
4453 | +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) |
4454 | int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 |
4455 | && LARGE_OFF_T % 2147483647 == 1) |
4456 | ? 1 : -1]; |
4457 | @@ -14136,7 +14142,7 @@ |
4458 | We can't simply define LARGE_OFF_T to be 9223372036854775807, |
4459 | since some C++ compilers masquerading as C compilers |
4460 | incorrectly reject 9223372036854775807. */ |
4461 | -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) |
4462 | +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) |
4463 | int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 |
4464 | && LARGE_OFF_T % 2147483647 == 1) |
4465 | ? 1 : -1]; |
4466 | @@ -14181,7 +14187,7 @@ |
4467 | We can't simply define LARGE_OFF_T to be 9223372036854775807, |
4468 | since some C++ compilers masquerading as C compilers |
4469 | incorrectly reject 9223372036854775807. */ |
4470 | -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) |
4471 | +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) |
4472 | int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 |
4473 | && LARGE_OFF_T % 2147483647 == 1) |
4474 | ? 1 : -1]; |
4475 | @@ -14205,7 +14211,7 @@ |
4476 | We can't simply define LARGE_OFF_T to be 9223372036854775807, |
4477 | since some C++ compilers masquerading as C compilers |
4478 | incorrectly reject 9223372036854775807. */ |
4479 | -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) |
4480 | +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) |
4481 | int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 |
4482 | && LARGE_OFF_T % 2147483647 == 1) |
4483 | ? 1 : -1]; |
4484 | @@ -19165,7 +19171,7 @@ |
4485 | # report actual input values of CONFIG_FILES etc. instead of their |
4486 | # values after options handling. |
4487 | ac_log=" |
4488 | -This file was extended by brasero $as_me 3.11.4, which was |
4489 | +This file was extended by brasero $as_me 3.12.0, which was |
4490 | generated by GNU Autoconf 2.69. Invocation command line was |
4491 | |
4492 | CONFIG_FILES = $CONFIG_FILES |
4493 | @@ -19231,7 +19237,7 @@ |
4494 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4495 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4496 | ac_cs_version="\\ |
4497 | -brasero config.status 3.11.4 |
4498 | +brasero config.status 3.12.0 |
4499 | configured by $0, generated by GNU Autoconf 2.69, |
4500 | with options \\"\$ac_cs_config\\" |
4501 | |
4502 | |
4503 | === modified file 'configure.ac' |
4504 | --- configure.ac 2014-11-07 11:33:39 +0000 |
4505 | +++ configure.ac 2014-11-15 21:17:54 +0000 |
4506 | @@ -1,10 +1,10 @@ |
4507 | dnl Process this file with autoconf to produce a configure script. |
4508 | -AC_INIT([brasero],[3.11.4]) |
4509 | +AC_INIT([brasero],[3.12.0]) |
4510 | AC_CONFIG_SRCDIR(src/main.c) |
4511 | |
4512 | BRASERO_MAJOR_VERSION=3 |
4513 | -BRASERO_MINOR_VERSION=11 |
4514 | -BRASERO_SUB=4 |
4515 | +BRASERO_MINOR_VERSION=12 |
4516 | +BRASERO_SUB=0 |
4517 | BRASERO_VERSION=$BRASERO_MAJOR_VERSION.$BRASERO_MINOR_VERSION.$BRASERO_SUB |
4518 | |
4519 | AC_SUBST(BRASERO_MAJOR_VERSION) |
4520 | |
4521 | === modified file 'data/brasero.desktop.in' |
4522 | --- data/brasero.desktop.in 2014-11-07 11:33:39 +0000 |
4523 | +++ data/brasero.desktop.in 2014-11-15 21:17:54 +0000 |
4524 | @@ -14,7 +14,7 @@ |
4525 | X-GNOME-Bugzilla-Bugzilla=GNOME |
4526 | X-GNOME-Bugzilla-Product=brasero |
4527 | X-GNOME-Bugzilla-Component=general |
4528 | -X-GNOME-Bugzilla-Version=3.11.4 |
4529 | +X-GNOME-Bugzilla-Version=3.12.0 |
4530 | X-GNOME-UsesNotifications=true |
4531 | Actions=Window;Image;Disc;Audio;Video; |
4532 | |
4533 | |
4534 | === modified file 'debian/changelog' |
4535 | --- debian/changelog 2014-11-07 11:33:39 +0000 |
4536 | +++ debian/changelog 2014-11-15 21:17:54 +0000 |
4537 | @@ -1,3 +1,10 @@ |
4538 | +brasero (3.12.0-0ubuntu1) vivid; urgency=medium |
4539 | + |
4540 | + * New upstream release. |
4541 | + * Drop 01_fix-plugin-dialog-segfault.patch, fixed upstream |
4542 | + |
4543 | + -- Jackson Doak <noskcaj@ubuntu.com> Sun, 16 Nov 2014 08:07:57 +1100 |
4544 | + |
4545 | brasero (3.11.4-1ubuntu1) vivid; urgency=low |
4546 | |
4547 | * Merge from Debian unstable. Remaining changes: |
4548 | |
4549 | === removed file 'debian/patches/01_fix-plugin-dialog-segfault.patch' |
4550 | --- debian/patches/01_fix-plugin-dialog-segfault.patch 2014-10-04 15:48:52 +0000 |
4551 | +++ debian/patches/01_fix-plugin-dialog-segfault.patch 1970-01-01 00:00:00 +0000 |
4552 | @@ -1,46 +0,0 @@ |
4553 | -From 492d99443a76e02ff16d128779fefc8083eb82ab Mon Sep 17 00:00:00 2001 |
4554 | -From: Laurent Bigonville <bigon@bigon.be> |
4555 | -Date: Sat, 4 Oct 2014 15:31:19 +0200 |
4556 | -Subject: [PATCH] Fix segfault when displaying the plugin dialog |
4557 | - |
4558 | -This partially revert changes from |
4559 | -426841b445f8f62191f2b0569088e0da15c42068 |
4560 | - |
4561 | -https://bugzilla.gnome.org/show_bug.cgi?id=728376 |
4562 | ---- |
4563 | - src/brasero-plugin-manager-ui.c | 6 +----- |
4564 | - 1 file changed, 1 insertion(+), 5 deletions(-) |
4565 | - |
4566 | -diff --git a/src/brasero-plugin-manager-ui.c b/src/brasero-plugin-manager-ui.c |
4567 | -index bca5fd4..9fde757 100644 |
4568 | ---- a/src/brasero-plugin-manager-ui.c |
4569 | -+++ b/src/brasero-plugin-manager-ui.c |
4570 | -@@ -241,16 +241,12 @@ plugin_manager_ui_view_icon_cell_cb (GtkTreeViewColumn *tree_column, |
4571 | - GtkTreeIter *iter, |
4572 | - gpointer data) |
4573 | - { |
4574 | -- BraseroPlugin *plugin; |
4575 | - |
4576 | - g_return_if_fail (tree_model != NULL); |
4577 | - g_return_if_fail (tree_column != NULL); |
4578 | - |
4579 | -- gtk_tree_model_get (tree_model, iter, PLUGIN_COLUMN, &plugin, -1); |
4580 | -- |
4581 | - g_object_set (G_OBJECT (cell), |
4582 | - "visible", FALSE, |
4583 | -- "sensitive", brasero_plugin_get_gtype (plugin) != G_TYPE_NONE && !brasero_plugin_get_compulsory (plugin), |
4584 | - NULL); |
4585 | - return; |
4586 | - /* |
4587 | -@@ -271,7 +267,7 @@ plugin_manager_ui_view_icon_cell_cb (GtkTreeViewColumn *tree_column, |
4588 | - "icon-name", |
4589 | - brasero_plugin_get_icon_name (plugin), |
4590 | - "sensitive", |
4591 | -- brasero_plugin_get_gtype (plugin) != G_TYPE_NONE, |
4592 | -+ brasero_plugin_get_gtype (plugin) != G_TYPE_NONE && !brasero_plugin_get_compulsory (plugin), |
4593 | - NULL); |
4594 | - */ |
4595 | - } |
4596 | --- |
4597 | -2.1.1 |
4598 | - |
4599 | |
4600 | === modified file 'debian/patches/series' |
4601 | --- debian/patches/series 2014-11-07 11:33:39 +0000 |
4602 | +++ debian/patches/series 2014-11-15 21:17:54 +0000 |
4603 | @@ -1,3 +1,2 @@ |
4604 | 012_appindicator.patch |
4605 | 013_unity_launcher_progress.patch |
4606 | -01_fix-plugin-dialog-segfault.patch |
4607 | |
4608 | === modified file 'docs/reference/libbrasero-burn/html/libbrasero-burn-BraseroBurnDialog.html' |
4609 | --- docs/reference/libbrasero-burn/html/libbrasero-burn-BraseroBurnDialog.html 2014-11-07 11:33:39 +0000 |
4610 | +++ docs/reference/libbrasero-burn/html/libbrasero-burn-BraseroBurnDialog.html 2014-11-15 21:17:54 +0000 |
4611 | @@ -41,7 +41,7 @@ |
4612 | <tbody> |
4613 | <tr> |
4614 | <td class="function_type"> |
4615 | -<a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a>Â * |
4616 | +<span class="returnvalue">GtkWidget</span>Â * |
4617 | </td> |
4618 | <td class="function_name"> |
4619 | <a class="link" href="libbrasero-burn-BraseroBurnDialog.html#brasero-burn-dialog-new" title="brasero_burn_dialog_new ()">brasero_burn_dialog_new</a> <span class="c_punctuation">()</span> |
4620 | @@ -88,12 +88,12 @@ |
4621 | <a name="libbrasero-burn-BraseroBurnDialog.functions_details"></a><h2>Functions</h2> |
4622 | <div class="refsect2"> |
4623 | <a name="brasero-burn-dialog-new"></a><h3>brasero_burn_dialog_new ()</h3> |
4624 | -<pre class="programlisting"><a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a>Â * |
4625 | +<pre class="programlisting"><span class="returnvalue">GtkWidget</span>Â * |
4626 | brasero_burn_dialog_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> |
4627 | <p>Creates a new <a class="link" href="libbrasero-burn-BraseroBurnDialog.html#BraseroBurnDialog" title="BraseroBurnDialog"><span class="type">BraseroBurnDialog</span></a> object</p> |
4628 | <div class="refsect3"> |
4629 | <a name="id-1.2.21.6.2.5"></a><h4>Returns</h4> |
4630 | -<p> a <a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="type">GtkWidget</span></a>. Unref when it is not needed anymore.</p> |
4631 | +<p> a <span class="type">GtkWidget</span>. Unref when it is not needed anymore.</p> |
4632 | <p></p> |
4633 | </div> |
4634 | </div> |
4635 | |
4636 | === modified file 'docs/reference/libbrasero-burn/html/libbrasero-burn-BraseroBurnOptions.html' |
4637 | --- docs/reference/libbrasero-burn/html/libbrasero-burn-BraseroBurnOptions.html 2014-11-07 11:33:39 +0000 |
4638 | +++ docs/reference/libbrasero-burn/html/libbrasero-burn-BraseroBurnOptions.html 2014-11-15 21:17:54 +0000 |
4639 | @@ -41,7 +41,7 @@ |
4640 | <tbody> |
4641 | <tr> |
4642 | <td class="function_type"> |
4643 | -<a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a>Â * |
4644 | +<span class="returnvalue">GtkWidget</span>Â * |
4645 | </td> |
4646 | <td class="function_name"> |
4647 | <a class="link" href="libbrasero-burn-BraseroBurnOptions.html#brasero-burn-options-new" title="brasero_burn_options_new ()">brasero_burn_options_new</a> <span class="c_punctuation">()</span> |
4648 | @@ -80,7 +80,7 @@ |
4649 | <a name="libbrasero-burn-BraseroBurnOptions.functions_details"></a><h2>Functions</h2> |
4650 | <div class="refsect2"> |
4651 | <a name="brasero-burn-options-new"></a><h3>brasero_burn_options_new ()</h3> |
4652 | -<pre class="programlisting"><a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a>Â * |
4653 | +<pre class="programlisting"><span class="returnvalue">GtkWidget</span>Â * |
4654 | brasero_burn_options_new (<em class="parameter"><code><a class="link" href="libbrasero-burn-BraseroSessionCfg.html#BraseroSessionCfg" title="struct BraseroSessionCfg"><span class="type">BraseroSessionCfg</span></a> *session</code></em>);</pre> |
4655 | <p>Creates a new <a class="link" href="libbrasero-burn-BraseroBurnOptions.html#BraseroBurnOptions" title="struct BraseroBurnOptions"><span class="type">BraseroBurnOptions</span></a> object.</p> |
4656 | <div class="refsect3"> |
4657 | @@ -100,7 +100,7 @@ |
4658 | </div> |
4659 | <div class="refsect3"> |
4660 | <a name="id-1.2.19.6.2.6"></a><h4>Returns</h4> |
4661 | -<p> a <a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="type">GtkWidget</span></a> object.</p> |
4662 | +<p> a <span class="type">GtkWidget</span> object.</p> |
4663 | <p></p> |
4664 | </div> |
4665 | </div> |
4666 | @@ -109,7 +109,7 @@ |
4667 | <a name="brasero-burn-options-add-options"></a><h3>brasero_burn_options_add_options ()</h3> |
4668 | <pre class="programlisting"><span class="returnvalue">void</span> |
4669 | brasero_burn_options_add_options (<em class="parameter"><code><a class="link" href="libbrasero-burn-BraseroBurnOptions.html#BraseroBurnOptions" title="struct BraseroBurnOptions"><span class="type">BraseroBurnOptions</span></a> *dialog</code></em>, |
4670 | - <em class="parameter"><code><a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="type">GtkWidget</span></a> *options</code></em>);</pre> |
4671 | + <em class="parameter"><code><span class="type">GtkWidget</span> *options</code></em>);</pre> |
4672 | <p>Adds some new options to be displayed in the dialog.</p> |
4673 | <div class="refsect3"> |
4674 | <a name="id-1.2.19.6.3.5"></a><h4>Parameters</h4> |
4675 | @@ -127,7 +127,7 @@ |
4676 | </tr> |
4677 | <tr> |
4678 | <td class="parameter_name"><p>options</p></td> |
4679 | -<td class="parameter_description"><p>a <a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="type">GtkWidget</span></a></p></td> |
4680 | +<td class="parameter_description"><p>a <span class="type">GtkWidget</span></p></td> |
4681 | <td class="parameter_annotations">Â </td> |
4682 | </tr> |
4683 | </tbody> |
4684 | |
4685 | === modified file 'docs/reference/libbrasero-burn/html/libbrasero-burn-brasero-track-data-cfg.html' |
4686 | --- docs/reference/libbrasero-burn/html/libbrasero-burn-brasero-track-data-cfg.html 2014-11-07 11:33:39 +0000 |
4687 | +++ docs/reference/libbrasero-burn/html/libbrasero-burn-brasero-track-data-cfg.html 2014-11-15 21:17:54 +0000 |
4688 | @@ -57,7 +57,7 @@ |
4689 | </tr> |
4690 | <tr> |
4691 | <td class="function_type"> |
4692 | -<a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="returnvalue">GtkTreePath</span></a>Â * |
4693 | +<span class="returnvalue">GtkTreePath</span>Â * |
4694 | </td> |
4695 | <td class="function_name"> |
4696 | <a class="link" href="libbrasero-burn-brasero-track-data-cfg.html#brasero-track-data-cfg-add-empty-directory" title="brasero_track_data_cfg_add_empty_directory ()">brasero_track_data_cfg_add_empty_directory</a> <span class="c_punctuation">()</span> |
4697 | @@ -145,7 +145,7 @@ |
4698 | </tr> |
4699 | <tr> |
4700 | <td class="function_type"> |
4701 | -<a href="http://developer.gnome.org/gtk2/GtkTreeModel.html"><span class="returnvalue">GtkTreeModel</span></a>Â * |
4702 | +<span class="returnvalue">GtkTreeModel</span>Â * |
4703 | </td> |
4704 | <td class="function_name"> |
4705 | <a class="link" href="libbrasero-burn-brasero-track-data-cfg.html#brasero-track-data-cfg-get-filtered-model" title="brasero_track_data_cfg_get_filtered_model ()">brasero_track_data_cfg_get_filtered_model</a> <span class="c_punctuation">()</span> |
4706 | @@ -257,7 +257,7 @@ |
4707 | <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> |
4708 | brasero_track_data_cfg_add (<em class="parameter"><code><a class="link" href="libbrasero-burn-brasero-track-data-cfg.html#BraseroTrackDataCfg" title="struct BraseroTrackDataCfg"><span class="type">BraseroTrackDataCfg</span></a> *track</code></em>, |
4709 | <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uri</code></em>, |
4710 | - <em class="parameter"><code><a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="type">GtkTreePath</span></a> *parent</code></em>);</pre> |
4711 | + <em class="parameter"><code><span class="type">GtkTreePath</span> *parent</code></em>);</pre> |
4712 | <p>Add a new file (with <em class="parameter"><code>uri</code></em> |
4713 | as URI) under a directory (<em class="parameter"><code>parent</code></em> |
4714 | ). |
4715 | @@ -287,7 +287,7 @@ |
4716 | </tr> |
4717 | <tr> |
4718 | <td class="parameter_name"><p>parent</p></td> |
4719 | -<td class="parameter_description"><p>a <a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="type">GtkTreePath</span></a> or NULL</p></td> |
4720 | +<td class="parameter_description"><p>a <span class="type">GtkTreePath</span> or NULL</p></td> |
4721 | <td class="parameter_annotations">Â </td> |
4722 | </tr> |
4723 | </tbody> |
4724 | @@ -302,11 +302,11 @@ |
4725 | <hr> |
4726 | <div class="refsect2"> |
4727 | <a name="brasero-track-data-cfg-add-empty-directory"></a><h3>brasero_track_data_cfg_add_empty_directory ()</h3> |
4728 | -<pre class="programlisting"><a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="returnvalue">GtkTreePath</span></a>Â * |
4729 | +<pre class="programlisting"><span class="returnvalue">GtkTreePath</span>Â * |
4730 | brasero_track_data_cfg_add_empty_directory |
4731 | (<em class="parameter"><code><a class="link" href="libbrasero-burn-brasero-track-data-cfg.html#BraseroTrackDataCfg" title="struct BraseroTrackDataCfg"><span class="type">BraseroTrackDataCfg</span></a> *track</code></em>, |
4732 | <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>, |
4733 | - <em class="parameter"><code><a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="type">GtkTreePath</span></a> *parent</code></em>);</pre> |
4734 | + <em class="parameter"><code><span class="type">GtkTreePath</span> *parent</code></em>);</pre> |
4735 | <p>Add a new empty directory (with <em class="parameter"><code>name</code></em> |
4736 | as name) under another directory (<em class="parameter"><code>parent</code></em> |
4737 | ). |
4738 | @@ -333,7 +333,7 @@ |
4739 | </tr> |
4740 | <tr> |
4741 | <td class="parameter_name"><p>parent</p></td> |
4742 | -<td class="parameter_description"><p>a <a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="type">GtkTreePath</span></a> or NULL</p></td> |
4743 | +<td class="parameter_description"><p>a <span class="type">GtkTreePath</span> or NULL</p></td> |
4744 | <td class="parameter_annotations">Â </td> |
4745 | </tr> |
4746 | </tbody> |
4747 | @@ -341,7 +341,7 @@ |
4748 | </div> |
4749 | <div class="refsect3"> |
4750 | <a name="id-1.2.11.6.4.6"></a><h4>Returns</h4> |
4751 | -<p> a <a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="type">GtkTreePath</span></a> which should be destroyed when not needed; NULL if the operation was not successful.</p> |
4752 | +<p> a <span class="type">GtkTreePath</span> which should be destroyed when not needed; NULL if the operation was not successful.</p> |
4753 | <p></p> |
4754 | </div> |
4755 | </div> |
4756 | @@ -350,7 +350,7 @@ |
4757 | <a name="brasero-track-data-cfg-remove"></a><h3>brasero_track_data_cfg_remove ()</h3> |
4758 | <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> |
4759 | brasero_track_data_cfg_remove (<em class="parameter"><code><a class="link" href="libbrasero-burn-brasero-track-data-cfg.html#BraseroTrackDataCfg" title="struct BraseroTrackDataCfg"><span class="type">BraseroTrackDataCfg</span></a> *track</code></em>, |
4760 | - <em class="parameter"><code><a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="type">GtkTreePath</span></a> *treepath</code></em>);</pre> |
4761 | + <em class="parameter"><code><span class="type">GtkTreePath</span> *treepath</code></em>);</pre> |
4762 | <p>Removes a file or a directory (as well as its children) from the tree. |
4763 | NOTE: some files cannot be removed like files from an imported session.</p> |
4764 | <div class="refsect3"> |
4765 | @@ -369,7 +369,7 @@ |
4766 | </tr> |
4767 | <tr> |
4768 | <td class="parameter_name"><p>treepath</p></td> |
4769 | -<td class="parameter_description"><p>a <a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="type">GtkTreePath</span></a></p></td> |
4770 | +<td class="parameter_description"><p>a <span class="type">GtkTreePath</span></p></td> |
4771 | <td class="parameter_annotations">Â </td> |
4772 | </tr> |
4773 | </tbody> |
4774 | @@ -387,7 +387,7 @@ |
4775 | <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> |
4776 | brasero_track_data_cfg_rename (<em class="parameter"><code><a class="link" href="libbrasero-burn-brasero-track-data-cfg.html#BraseroTrackDataCfg" title="struct BraseroTrackDataCfg"><span class="type">BraseroTrackDataCfg</span></a> *track</code></em>, |
4777 | <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *newname</code></em>, |
4778 | - <em class="parameter"><code><a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="type">GtkTreePath</span></a> *treepath</code></em>);</pre> |
4779 | + <em class="parameter"><code><span class="type">GtkTreePath</span> *treepath</code></em>);</pre> |
4780 | <p>Renames the file in the tree pointed by <em class="parameter"><code>treepath</code></em> |
4781 | .</p> |
4782 | <div class="refsect3"> |
4783 | @@ -411,7 +411,7 @@ |
4784 | </tr> |
4785 | <tr> |
4786 | <td class="parameter_name"><p>treepath</p></td> |
4787 | -<td class="parameter_description"><p>a <a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="type">GtkTreePath</span></a></p></td> |
4788 | +<td class="parameter_description"><p>a <span class="type">GtkTreePath</span></p></td> |
4789 | <td class="parameter_annotations">Â </td> |
4790 | </tr> |
4791 | </tbody> |
4792 | @@ -643,11 +643,11 @@ |
4793 | <a name="brasero-track-data-cfg-restore"></a><h3>brasero_track_data_cfg_restore ()</h3> |
4794 | <pre class="programlisting"><span class="returnvalue">void</span> |
4795 | brasero_track_data_cfg_restore (<em class="parameter"><code><a class="link" href="libbrasero-burn-brasero-track-data-cfg.html#BraseroTrackDataCfg" title="struct BraseroTrackDataCfg"><span class="type">BraseroTrackDataCfg</span></a> *track</code></em>, |
4796 | - <em class="parameter"><code><a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="type">GtkTreePath</span></a> *treepath</code></em>);</pre> |
4797 | + <em class="parameter"><code><span class="type">GtkTreePath</span> *treepath</code></em>);</pre> |
4798 | <p>Removes a file from the filtered file list (see <a class="link" href="libbrasero-burn-brasero-track-data-cfg.html#brasero-track-data-cfg-get-filtered-model" title="brasero_track_data_cfg_get_filtered_model ()"><code class="function">brasero_track_data_cfg_get_filtered_model()</code></a>) |
4799 | and re-adds it wherever it should be in the tree. |
4800 | <em class="parameter"><code>treepath</code></em> |
4801 | - is a <a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="type">GtkTreePath</span></a> associated with the <a href="http://developer.gnome.org/gtk2/GtkTreeModel.html"><span class="type">GtkTreeModel</span></a> which holds the |
4802 | + is a <span class="type">GtkTreePath</span> associated with the <span class="type">GtkTreeModel</span> which holds the |
4803 | filtered files not the main tree.</p> |
4804 | <div class="refsect3"> |
4805 | <a name="id-1.2.11.6.14.5"></a><h4>Parameters</h4> |
4806 | @@ -665,7 +665,7 @@ |
4807 | </tr> |
4808 | <tr> |
4809 | <td class="parameter_name"><p>treepath</p></td> |
4810 | -<td class="parameter_description"><p>a <a href="http://developer.gnome.org/gtk2/GtkTreeModel.html#GtkTreePath"><span class="type">GtkTreePath</span></a></p></td> |
4811 | +<td class="parameter_description"><p>a <span class="type">GtkTreePath</span></p></td> |
4812 | <td class="parameter_annotations">Â </td> |
4813 | </tr> |
4814 | </tbody> |
4815 | @@ -675,7 +675,7 @@ |
4816 | <hr> |
4817 | <div class="refsect2"> |
4818 | <a name="brasero-track-data-cfg-get-filtered-model"></a><h3>brasero_track_data_cfg_get_filtered_model ()</h3> |
4819 | -<pre class="programlisting"><a href="http://developer.gnome.org/gtk2/GtkTreeModel.html"><span class="returnvalue">GtkTreeModel</span></a>Â * |
4820 | +<pre class="programlisting"><span class="returnvalue">GtkTreeModel</span>Â * |
4821 | brasero_track_data_cfg_get_filtered_model |
4822 | (<em class="parameter"><code><a class="link" href="libbrasero-burn-brasero-track-data-cfg.html#BraseroTrackDataCfg" title="struct BraseroTrackDataCfg"><span class="type">BraseroTrackDataCfg</span></a> *track</code></em>);</pre> |
4823 | <p>Gets a GtkTreeModel which contains all the files that were |
4824 | @@ -697,7 +697,7 @@ |
4825 | </div> |
4826 | <div class="refsect3"> |
4827 | <a name="id-1.2.11.6.15.6"></a><h4>Returns</h4> |
4828 | -<p> a <a href="http://developer.gnome.org/gtk2/GtkTreeModel.html"><span class="type">GtkTreeModel</span></a>. Unref when not needed.</p> |
4829 | +<p> a <span class="type">GtkTreeModel</span>. Unref when not needed.</p> |
4830 | <p></p> |
4831 | </div> |
4832 | </div> |
4833 | |
4834 | === modified file 'docs/reference/libbrasero-burn/version.xml' |
4835 | --- docs/reference/libbrasero-burn/version.xml 2014-11-07 11:33:39 +0000 |
4836 | +++ docs/reference/libbrasero-burn/version.xml 2014-11-15 21:17:54 +0000 |
4837 | @@ -1,1 +1,1 @@ |
4838 | -3.11.4 |
4839 | +3.12.0 |
4840 | |
4841 | === modified file 'docs/reference/libbrasero-media/html/libbrasero-media-BraseroDriveSelection.html' |
4842 | --- docs/reference/libbrasero-media/html/libbrasero-media-BraseroDriveSelection.html 2014-11-07 11:33:39 +0000 |
4843 | +++ docs/reference/libbrasero-media/html/libbrasero-media-BraseroDriveSelection.html 2014-11-15 21:17:54 +0000 |
4844 | @@ -41,7 +41,7 @@ |
4845 | <tbody> |
4846 | <tr> |
4847 | <td class="function_type"> |
4848 | -<a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a>Â * |
4849 | +<span class="returnvalue">GtkWidget</span>Â * |
4850 | </td> |
4851 | <td class="function_name"> |
4852 | <a class="link" href="libbrasero-media-BraseroDriveSelection.html#brasero-drive-selection-new" title="brasero_drive_selection_new ()">brasero_drive_selection_new</a> <span class="c_punctuation">()</span> |
4853 | @@ -96,12 +96,12 @@ |
4854 | <a name="libbrasero-media-BraseroDriveSelection.functions_details"></a><h2>Functions</h2> |
4855 | <div class="refsect2"> |
4856 | <a name="brasero-drive-selection-new"></a><h3>brasero_drive_selection_new ()</h3> |
4857 | -<pre class="programlisting"><a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a>Â * |
4858 | +<pre class="programlisting"><span class="returnvalue">GtkWidget</span>Â * |
4859 | brasero_drive_selection_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> |
4860 | <p>Creates a new <a class="link" href="libbrasero-media-BraseroDriveSelection.html#BraseroDriveSelection" title="struct BraseroDriveSelection"><span class="type">BraseroDriveSelection</span></a> object</p> |
4861 | <div class="refsect3"> |
4862 | <a name="id-1.2.9.6.2.5"></a><h4>Returns</h4> |
4863 | -<p> a <a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="type">GtkWidget</span></a>. Unref when it is not needed anymore.</p> |
4864 | +<p> a <span class="type">GtkWidget</span>. Unref when it is not needed anymore.</p> |
4865 | <p></p> |
4866 | </div> |
4867 | </div> |
4868 | |
4869 | === modified file 'docs/reference/libbrasero-media/html/libbrasero-media-BraseroMediumSelection.html' |
4870 | --- docs/reference/libbrasero-media/html/libbrasero-media-BraseroMediumSelection.html 2014-11-07 11:33:39 +0000 |
4871 | +++ docs/reference/libbrasero-media/html/libbrasero-media-BraseroMediumSelection.html 2014-11-15 21:17:54 +0000 |
4872 | @@ -41,7 +41,7 @@ |
4873 | <tbody> |
4874 | <tr> |
4875 | <td class="function_type"> |
4876 | -<a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a>Â * |
4877 | +<span class="returnvalue">GtkWidget</span>Â * |
4878 | </td> |
4879 | <td class="function_name"> |
4880 | <a class="link" href="libbrasero-media-BraseroMediumSelection.html#brasero-medium-selection-new" title="brasero_medium_selection_new ()">brasero_medium_selection_new</a> <span class="c_punctuation">()</span> |
4881 | @@ -96,12 +96,12 @@ |
4882 | <a name="libbrasero-media-BraseroMediumSelection.functions_details"></a><h2>Functions</h2> |
4883 | <div class="refsect2"> |
4884 | <a name="brasero-medium-selection-new"></a><h3>brasero_medium_selection_new ()</h3> |
4885 | -<pre class="programlisting"><a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a>Â * |
4886 | +<pre class="programlisting"><span class="returnvalue">GtkWidget</span>Â * |
4887 | brasero_medium_selection_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> |
4888 | <p>Creates a new <a class="link" href="libbrasero-media-BraseroMediumSelection.html#BraseroMediumSelection" title="struct BraseroMediumSelection"><span class="type">BraseroMediumSelection</span></a> object</p> |
4889 | <div class="refsect3"> |
4890 | <a name="id-1.2.8.6.2.5"></a><h4>Returns</h4> |
4891 | -<p> a <a href="http://developer.gnome.org/gtk2/GtkWidget.html"><span class="type">GtkWidget</span></a>. Unref when it is not needed anymore.</p> |
4892 | +<p> a <span class="type">GtkWidget</span>. Unref when it is not needed anymore.</p> |
4893 | <p></p> |
4894 | </div> |
4895 | </div> |
4896 | |
4897 | === modified file 'docs/reference/libbrasero-media/html/libbrasero-media-BraseroVolume.html' |
4898 | --- docs/reference/libbrasero-media/html/libbrasero-media-BraseroVolume.html 2014-11-07 11:33:39 +0000 |
4899 | +++ docs/reference/libbrasero-media/html/libbrasero-media-BraseroVolume.html 2014-11-15 21:17:54 +0000 |
4900 | @@ -318,7 +318,7 @@ |
4901 | <a name="brasero-volume-mount"></a><h3>brasero_volume_mount ()</h3> |
4902 | <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> |
4903 | brasero_volume_mount (<em class="parameter"><code><a class="link" href="libbrasero-media-BraseroVolume.html#BraseroVolume" title="struct BraseroVolume"><span class="type">BraseroVolume</span></a> *volume</code></em>, |
4904 | - <em class="parameter"><code><a href="http://developer.gnome.org/gtk2/GtkWindow.html"><span class="type">GtkWindow</span></a> *parent_window</code></em>, |
4905 | + <em class="parameter"><code><span class="type">GtkWindow</span> *parent_window</code></em>, |
4906 | <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> wait</code></em>, |
4907 | <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre> |
4908 | <p>Mount <em class="parameter"><code>volume</code></em> |
4909 | @@ -343,7 +343,7 @@ |
4910 | </tr> |
4911 | <tr> |
4912 | <td class="parameter_name"><p>parent_window</p></td> |
4913 | -<td class="parameter_description"><p><a href="http://developer.gnome.org/gtk2/GtkWindow.html"><span class="type">GtkWindow</span></a> *</p></td> |
4914 | +<td class="parameter_description"><p><span class="type">GtkWindow</span> *</p></td> |
4915 | <td class="parameter_annotations">Â </td> |
4916 | </tr> |
4917 | <tr> |
4918 | |
4919 | === modified file 'docs/reference/libbrasero-media/version.xml' |
4920 | --- docs/reference/libbrasero-media/version.xml 2014-11-07 11:33:39 +0000 |
4921 | +++ docs/reference/libbrasero-media/version.xml 2014-11-15 21:17:54 +0000 |
4922 | @@ -1,1 +1,1 @@ |
4923 | -3.11.4 |
4924 | +3.12.0 |
4925 | |
4926 | === modified file 'help/id/create-cover.page' |
4927 | --- help/id/create-cover.page 2014-10-04 15:48:52 +0000 |
4928 | +++ help/id/create-cover.page 2014-11-15 21:17:54 +0000 |
4929 | @@ -15,7 +15,7 @@ |
4930 | <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> |
4931 | <mal:name>Andika Triwidada</mal:name> |
4932 | <mal:email>andika@gmail.com</mal:email> |
4933 | - <mal:years>2013</mal:years> |
4934 | + <mal:years>2013, 2014</mal:years> |
4935 | </mal:credit> |
4936 | </info> |
4937 | |
4938 | |
4939 | === modified file 'help/id/id.po' |
4940 | --- help/id/id.po 2014-10-04 15:48:52 +0000 |
4941 | +++ help/id/id.po 2014-11-15 21:17:54 +0000 |
4942 | @@ -6,76 +6,45 @@ |
4943 | msgid "" |
4944 | msgstr "" |
4945 | "Project-Id-Version: brasero master\n" |
4946 | -"POT-Creation-Date: 2013-11-22 12:29+0000\n" |
4947 | -"PO-Revision-Date: 2013-11-24 12:49+0700\n" |
4948 | +"POT-Creation-Date: 2014-09-17 02:59+0000\n" |
4949 | +"PO-Revision-Date: 2014-09-17 20:23+0700\n" |
4950 | "Last-Translator: Andika Triwidada <andika@gmail.com>\n" |
4951 | "Language-Team: Indonesian <gnome@i15n.org>\n" |
4952 | "Language: id\n" |
4953 | "MIME-Version: 1.0\n" |
4954 | "Content-Type: text/plain; charset=UTF-8\n" |
4955 | "Content-Transfer-Encoding: 8bit\n" |
4956 | -"X-Generator: Poedit 1.5.7\n" |
4957 | +"X-Generator: Poedit 1.6.9\n" |
4958 | |
4959 | #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 |
4960 | msgctxt "_" |
4961 | msgid "translator-credits" |
4962 | -msgstr "Andika Triwidada <andika@gmail.com>, 2013" |
4963 | +msgstr "Andika Triwidada <andika@gmail.com>, 2013, 2014" |
4964 | |
4965 | -#. (itstool) path: media |
4966 | -#. This is a reference to an external file such as an image or video. When |
4967 | -#. the file changes, the md5 hash will change to let you know you need to |
4968 | -#. update your localized copy. The msgstr is not used at all. Set it to |
4969 | -#. whatever you like once you have updated your copy of the file. |
4970 | -#: C/index.page:15 |
4971 | -msgctxt "_" |
4972 | -msgid "" |
4973 | -"external ref='figures/logo32.png' md5='ac8e1998759033606b201ccfe6458d17'" |
4974 | -msgstr "-" |
4975 | +#. (itstool) path: info/desc |
4976 | +#: C/create-cover.page:7 |
4977 | +msgid "Create an inlay for a jewel case." |
4978 | +msgstr "Buat sampul dalam bagi kotak CD." |
4979 | |
4980 | #. (itstool) path: credit/name |
4981 | -#: C/index.page:7 C/create-cover.page:9 C/introduction.page:9 |
4982 | -#: C/prob-cd.page:11 C/prob-dvd.page:11 C/project-audio.page:9 |
4983 | -#: C/project-data.page:9 C/project-disc-copy.page:9 |
4984 | -#: C/project-image-burn.page:17 C/project-save.page:12 C/project-video.page:12 |
4985 | -#: C/split-track.page:11 C/tools-blank.page:9 C/tools-check-integrity.page:13 |
4986 | +#: C/create-cover.page:9 C/introduction.page:9 C/prob-cd.page:11 |
4987 | +#: C/prob-dvd.page:11 C/project-audio.page:9 C/project-data.page:9 |
4988 | +#: C/project-disc-copy.page:9 C/project-image-burn.page:17 |
4989 | +#: C/project-save.page:12 C/project-video.page:12 C/split-track.page:11 |
4990 | +#: C/tools-blank.page:9 C/tools-check-integrity.page:13 |
4991 | msgid "Ekaterina Gerasimova" |
4992 | msgstr "Ekaterina Gerasimova" |
4993 | |
4994 | #. (itstool) path: license/p |
4995 | -#: C/index.page:11 C/create-cover.page:13 C/introduction.page:13 |
4996 | -#: C/prob-cd.page:15 C/prob-dvd.page:15 C/project-audio.page:13 |
4997 | -#: C/project-data.page:13 C/project-disc-copy.page:13 |
4998 | -#: C/project-image-burn.page:21 C/project-save.page:16 C/project-video.page:16 |
4999 | -#: C/split-track.page:15 C/tools-blank.page:13 C/tools-check-integrity.page:17 |
5000 | +#: C/create-cover.page:13 C/introduction.page:13 C/prob-cd.page:15 |
The diff has been truncated for viewing.
thanks