=== removed file '.pc/applied-patches' --- .pc/applied-patches 2013-05-25 21:41:44 +0000 +++ .pc/applied-patches 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -migrate-xfcerc-xfconf.patch === removed directory '.pc/migrate-xfcerc-xfconf.patch' === removed directory '.pc/migrate-xfcerc-xfconf.patch/panel-plugin' === removed file '.pc/migrate-xfcerc-xfconf.patch/panel-plugin/indicator.c' --- .pc/migrate-xfcerc-xfconf.patch/panel-plugin/indicator.c 2012-05-23 21:20:49 +0000 +++ .pc/migrate-xfcerc-xfconf.patch/panel-plugin/indicator.c 1970-01-01 00:00:00 +0000 @@ -1,413 +0,0 @@ -/* Copyright (c) 2009 Mark Trompell - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif -#ifdef HAVE_STRING_H -#include -#endif - -#include -#include -#include -#include -#include - -#include "indicator.h" -#include "indicator-box.h" -#include "indicator-button.h" - -#define DEFAULT_EXCLUDED_MODULES NULL - -#ifdef LIBXFCE4PANEL_CHECK_VERSION -#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0) -#define HAS_PANEL_49 -#endif -#endif - -/* prototypes */ -static void -indicator_construct (XfcePanelPlugin *plugin); - -static gboolean -load_module (const gchar * name, IndicatorPlugin * indicator); - -static gboolean -indicator_size_changed (XfcePanelPlugin *plugin, gint size, IndicatorPlugin *indicator); - -#ifdef HAS_PANEL_49 -static void -indicator_mode_changed (XfcePanelPlugin *plugin, XfcePanelPluginMode mode, IndicatorPlugin *indicator); -#else -static void -indicator_orientation_changed (XfcePanelPlugin *plugin, GtkOrientation orientation, IndicatorPlugin *indicator); -#endif - - -/* register the plugin */ -XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (indicator_construct); - -#if 0 -void -indicator_save (XfcePanelPlugin *plugin, - IndicatorPlugin *indicator) -{ - XfceRc *rc; - gchar *file; - - /* get the config file location */ - file = xfce_panel_plugin_save_location (plugin, TRUE); - - if (G_UNLIKELY (file == NULL)) - { - DBG ("Failed to open config file"); - return; - } - - /* open the config file, read/write */ - rc = xfce_rc_simple_open (file, FALSE); - g_free (file); - - if (G_LIKELY (rc != NULL)) - { - /* save the settings */ - DBG("."); - if (indicator->excluded_modules) - xfce_rc_write_list_entry (rc, "Exclude", - indicator->excluded_modules, NULL); - - /* close the rc file */ - xfce_rc_close (rc); - } -} -#endif - - -static void -indicator_read (IndicatorPlugin *indicator) -{ - XfconfChannel * channel = xfconf_channel_get ("xfce4-panel"); - gchar * property = g_strconcat (xfce_panel_plugin_get_property_base(indicator->plugin),"/blacklist",NULL); - indicator->excluded_modules = xfconf_channel_get_string_list(channel, property); - g_free (property); - property = g_strconcat (xfce_panel_plugin_get_property_base(indicator->plugin),"/icon-size-max",NULL); - xfconf_g_property_bind (channel, property, G_TYPE_INT, indicator->buttonbox, "icon-size-max"); - g_free (property); - /* something went wrong, apply default values */ - /* - DBG ("Applying default settings"); - indicator->excluded_modules = DEFAULT_EXCLUDED_MODULES; - */ -} - -static IndicatorPlugin * -indicator_new (XfcePanelPlugin *plugin) -{ - IndicatorPlugin *indicator; - GtkOrientation orientation; - gint indicators_loaded = 0; - - /* allocate memory for the plugin structure */ - indicator = panel_slice_new0 (IndicatorPlugin); - - /* pointer to plugin */ - indicator->plugin = plugin; - - /* get the current orientation */ - orientation = xfce_panel_plugin_get_orientation (plugin); - - /* Init some theme/icon stuff */ - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), - INDICATOR_ICONS_DIR); - /*gtk_widget_set_name(GTK_WIDGET (indicator->plugin), "indicator-plugin");*/ - - indicator->buttonbox = xfce_indicator_box_new ();; - /* initialize xfconf */ - if (xfconf_init(NULL)){ - /* get the list of excluded modules */ - indicator_read (indicator); - } - /* load 'em */ - if (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) { - GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL); - - const gchar * name; - guint i, length; - gboolean match = FALSE; - - length = (indicator->excluded_modules != NULL) ? g_strv_length (indicator->excluded_modules) : 0; - while ((name = g_dir_read_name(dir)) != NULL) { - for (i = 0; i < length; ++i) { - if (match = (g_strcmp0 (name, indicator->excluded_modules[i]) == 0)) - break; - } - - if (G_UNLIKELY (match)) { - g_debug ("Excluding module: %s", name); - continue; - } - - if (load_module(name, indicator)) - indicators_loaded++; - } - g_dir_close (dir); - } - - if (indicators_loaded == 0) { - /* A label to allow for click through */ - indicator->item = xfce_indicator_button_new(NULL, NULL); - xfce_indicator_button_set_label(XFCE_INDICATOR_BUTTON(indicator->item), - GTK_LABEL (gtk_label_new(_("No Indicators")))); - gtk_container_add (GTK_CONTAINER (plugin), indicator->item); - gtk_widget_show(indicator->item); - /* show the panel's right-click menu on this menu */ - xfce_panel_plugin_add_action_widget (plugin, indicator->item); - } else { - indicator->ebox = gtk_event_box_new(); - gtk_widget_set_can_focus(GTK_WIDGET(indicator->ebox), TRUE); - gtk_container_add (GTK_CONTAINER (indicator->ebox), GTK_WIDGET(indicator->buttonbox)); - gtk_container_add (GTK_CONTAINER (plugin), GTK_WIDGET(indicator->ebox)); - gtk_widget_show(GTK_WIDGET(indicator->buttonbox)); - gtk_widget_show(GTK_WIDGET(indicator->ebox)); - /* show the panel's right-click menu on this menu */ - xfce_panel_plugin_add_action_widget (plugin, indicator->ebox); - } - return indicator; -} - - - -static void -indicator_free (XfcePanelPlugin *plugin, - IndicatorPlugin *indicator) -{ - GtkWidget *dialog; - - /* check if the dialog is still open. if so, destroy it */ - dialog = g_object_get_data (G_OBJECT (plugin), "dialog"); - if (G_UNLIKELY (dialog != NULL)) - gtk_widget_destroy (dialog); - xfconf_shutdown(); - /* free the plugin structure */ - panel_slice_free (IndicatorPlugin, indicator); -} - - - -#ifdef HAS_PANEL_49 -static void -indicator_mode_changed (XfcePanelPlugin *plugin, - XfcePanelPluginMode mode, - IndicatorPlugin *indicator) -{ - GtkOrientation orientation; - GtkOrientation panel_orientation = xfce_panel_plugin_get_orientation (plugin); - - orientation = (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ? - GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL; - - xfce_indicator_box_set_orientation (XFCE_INDICATOR_BOX (indicator->buttonbox), panel_orientation, orientation); - - indicator_size_changed (plugin, xfce_panel_plugin_get_size (plugin), indicator); -} - - - -#else -static void -indicator_orientation_changed (XfcePanelPlugin *plugin, - GtkOrientation orientation, - IndicatorPlugin *indicator) -{ - xfce_indicator_box_set_orientation (XFCE_INDICATOR_BOX (indicator->buttonbox), orientation, GTK_ORIENTATION_HORIZONTAL); - - indicator_size_changed (plugin, xfce_panel_plugin_get_size (plugin), indicator); -} -#endif - - -static gboolean -indicator_size_changed (XfcePanelPlugin *plugin, - gint size, - IndicatorPlugin *indicator) -{ -#ifdef HAS_PANEL_49 - xfce_indicator_box_set_size (XFCE_INDICATOR_BOX (indicator->buttonbox), - size, xfce_panel_plugin_get_nrows (plugin)); -#else - xfce_indicator_box_set_size (XFCE_INDICATOR_BOX (indicator->buttonbox), - size, 1); -#endif - - return TRUE; -} - - - -static gboolean -on_button_press (GtkWidget *widget, GdkEventButton *event, IndicatorPlugin *indicator) -{ - if (indicator != NULL) - { - if( event->button == 1) /* left click only */ - { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),TRUE); - gtk_menu_popup (xfce_indicator_button_get_menu (XFCE_INDICATOR_BUTTON(widget)), NULL, NULL, - xfce_panel_plugin_position_menu, - indicator->plugin, 1, gtk_get_current_event_time ()); - - return TRUE; - } - /* event doesn't make it to the ebox, so I just push it. */ - gtk_widget_event (indicator->ebox, (GdkEvent*)event); - } - return FALSE; -} - -static void -menu_deactivate (GtkMenu *menu, - gpointer user_data) -{ - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_menu_get_attach_widget (menu)), FALSE); -} - -static void -indicator_construct (XfcePanelPlugin *plugin) -{ - IndicatorPlugin *indicator; - - /* setup transation domain */ - xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); - - /* create the plugin */ - indicator = indicator_new (plugin); - - /* connect plugin signals */ - g_signal_connect (G_OBJECT (plugin), "free-data", - G_CALLBACK (indicator_free), indicator); - - g_signal_connect (G_OBJECT (plugin), "size-changed", - G_CALLBACK (indicator_size_changed), indicator); - -#ifdef HAS_PANEL_49 - g_signal_connect (G_OBJECT (plugin), "mode-changed", - G_CALLBACK (indicator_mode_changed), indicator); -#else - g_signal_connect (G_OBJECT (plugin), "orientation-changed", - G_CALLBACK (indicator_orientation_changed), indicator); -#endif -} - - -static gboolean -entry_scrolled (GtkWidget *menuitem, GdkEventScroll *event, IndicatorPlugin *indicator) -{ - IndicatorObject *io = xfce_indicator_button_get_io (XFCE_INDICATOR_BUTTON (menuitem)); - IndicatorObjectEntry *entry = xfce_indicator_button_get_entry (XFCE_INDICATOR_BUTTON (menuitem)); - - g_return_val_if_fail(INDICATOR_IS_OBJECT(io), FALSE); - g_return_val_if_fail(indicator != NULL, FALSE); - - g_signal_emit_by_name (io, INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, entry, 1, event->direction); - - return TRUE; -} - - -static void -entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data) -{ - XfcePanelPlugin *plugin = ((IndicatorPlugin *) user_data)->plugin; - GtkWidget * button = xfce_indicator_button_new (io, entry); - gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); - gtk_button_set_use_underline(GTK_BUTTON (button),TRUE); - gtk_widget_set_name(GTK_WIDGET (button), "indicator-button"); - - if (entry->image != NULL) - xfce_indicator_button_set_image(XFCE_INDICATOR_BUTTON(button), entry->image); - - if (entry->label != NULL) - xfce_indicator_button_set_label(XFCE_INDICATOR_BUTTON(button), entry->label); - - if (entry->menu != NULL) - { - xfce_indicator_button_set_menu (XFCE_INDICATOR_BUTTON(button), entry->menu); - g_signal_connect(G_OBJECT(entry->menu), "deactivate", G_CALLBACK(menu_deactivate),NULL); - } - - g_signal_connect(button, "button-press-event", G_CALLBACK(on_button_press), - user_data); - g_signal_connect(button, "scroll-event", G_CALLBACK(entry_scrolled), - user_data); - - gtk_container_add(GTK_CONTAINER (((IndicatorPlugin *)user_data)->buttonbox), button); - gtk_widget_show(button); -} - - -static void -entry_removed_cb (GtkWidget * widget, gpointer userdata) -{ - gpointer data = (gpointer) xfce_indicator_button_get_entry (XFCE_INDICATOR_BUTTON (widget)); - - if (data != userdata) - return; - - gtk_widget_destroy(widget); -} - - -static void -entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data) -{ - gtk_container_foreach(GTK_CONTAINER(user_data), entry_removed_cb, entry); -} - - -static gboolean -load_module (const gchar * name, IndicatorPlugin * indicator) -{ - g_debug("Looking at Module: %s", name); - g_return_val_if_fail(name != NULL, FALSE); - - if (!g_str_has_suffix(name,G_MODULE_SUFFIX)) - return FALSE; - - g_debug("Loading Module: %s", name); - - gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL); - IndicatorObject * io = indicator_object_new_from_file(fullpath); - g_free(fullpath); - - g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, - G_CALLBACK(entry_added), indicator); - g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, - G_CALLBACK(entry_removed), indicator->buttonbox); - - GList * entries = indicator_object_get_entries(io); - GList * entry = NULL; - - for (entry = entries; entry != NULL; entry = g_list_next(entry)) { - IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data; - entry_added(io, entrydata, indicator); - } - - g_list_free(entries); - - return TRUE; -} === modified file 'ChangeLog' --- ChangeLog 2012-05-05 15:54:41 +0000 +++ ChangeLog 2013-08-14 19:58:39 +0000 @@ -1,8 +1,83 @@ -# created with git log --pretty=format:"%ad %h %s %aN <%aE>" --no-merges --date=short +2013-06-04 e123b2c make distcheck fixes Andrzej +2013-04-22 69afae1 l10n: Updated German (de) translation to 100% Mark Trompell +2013-04-20 a2fd886 tweak de.po Mark Trompell +2013-04-19 f21ae5d l10n: Updated German (de) translation to 16% Johannes Lips +2013-04-19 4f4eeaa l10n: Updated German (de) translation to 6% Mark Trompell +2013-04-19 ed8ae14 l10n: Updated German (de) translation to 22% Mark Trompell +2013-04-19 0a33510 merge {es,hu,nl}.po from master Mark Trompell +2013-04-19 16240fe l10n: Updated Russian (ru) translation to 100% Sergey Alyoshin +2013-04-18 ec06937 l10n: Updated Russian (ru) translation to 100% Sergey Alyoshin +2013-04-16 8d4f20d l10n: Updated Romanian (ro) translation to 100% Mișu Moldovan +2013-04-14 4b937fb l10n: Updated Polish (pl) translation to 45% Piotr Sokół +2013-04-14 835ad78 l10n: Updated Polish (pl) translation to 38% Piotr Sokół +2013-04-13 5306a03 l10n: Updated Japanese (ja) translation to 100% Masato Hashimoto +2013-04-12 5a76c65 Add column titles to translation Sergey Alyoshin +2013-04-13 fc0900b Revert "make column titles translatable" Mark Trompell +2013-04-13 d02f804 make column titles translatable Mark Trompell +2013-04-13 4855405 rename to .ac.in, avoid obsolete Macro Mark Trompell +2013-04-13 4030e77 l10n: Add ja translation Masato Hashimoto +2013-04-12 4bf324e l10n: Updated German (de) translation to 17% Mark Trompell +2013-04-12 4b2b5fd l10n: Updated Russian (ru) translation to 100% Sergey Alyoshin +2013-04-12 2ba29dd l10n: Updated Korean (ko) translation to 100% Seong-ho Cho +2013-04-10 92c8dc0 l10n: Updated Portuguese (pt) translation to 92% Sergio Marques +2013-04-07 c441817 l10n: Updated Ukrainian (uk) translation to 100% Yarema aka Knedlyk +2013-04-07 2644dde l10n: Updated Ukrainian (uk) translation to 100% Yarema aka Knedlyk +2013-04-07 da4ebab l10n: Updated Ukrainian (uk) translation to 78% Yarema aka Knedlyk +2013-04-07 d35c618 l10n: Updated Dutch (Flemish) (nl) translation to 100% Pjotr vertaalt +2013-04-07 1ec1610 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% Rafael Ferreira +2013-04-07 d819238 l10n: Updated Italian (it) translation to 100% Cristian Marchi +2013-04-06 29fd8d2 l10n: Updated Italian (it) translation to 89% Cristian Marchi +2013-04-06 8c52a5e l10n: Updated Croatian (hr) translation to 25% Ivica Kolić +2013-04-06 bc19ca1 l10n: Updated French (fr) translation to 100% jc jc1 +2013-04-06 aceff8c l10n: Updated French (fr) translation to 89% jc jc1 +2013-04-06 b9c02bb l10n: Updated French (fr) translation to 57% jc jc1 +2013-04-05 c47509d l10n: Updated Serbian (sr) translation to 100% Саша Петровић +2013-04-05 7f332e0 Updated list of files for translation Andrzej +2013-04-05 a7ae93a button: Compilation fix. Andrzej +2013-04-03 f60f6d5 Fixed #9040. Andrzej +2013-04-02 985d349 indicator-button: minor fix to gtk_menu_popup call Andrzej +2013-03-22 23dfad6 Reworked indicator entry sorting Andrzej +2013-03-22 8c1c944 Using 22px icon size by default. Andrzej +2013-03-22 dd4f96d Added an About dialog. Andrzej +2013-03-22 bc0abf0 Fixed crash on Xfce 4.8 (no xfce_dialog_show_help) Andrzej +2013-03-14 8eb3053 Fixed a regression, inconsistent border sizes. Andrzej +2013-03-14 81c7851 Force a configuration-changed signal at start-up. Andrzej +2013-03-13 346cfe1 Hiding one of "hidden"/"visible" columns to minimize confusion. Andrzej +2013-03-13 b552265 Added "pretty names" and indicators for known indicators. Andrzej +2013-03-12 33d3eb3 Sort indicator entries by location. Andrzej +2013-03-12 290c5f4 Properly connecting indicator-list-changed signal. Andrzej +2013-03-12 0db001b Added support for indicator reordering. Andrzej +2013-03-11 86c62c4 Configuration system rework. Andrzej +2012-12-25 94c371f Plugged a memory leak. Andrzej +2012-12-09 1c76403 Fixed menu positioning. Andrzej +2012-12-02 707ad09 Worked around crashes when plugin is loaded as an external plugin. Andrzej +2012-11-17 00633e1 Removed unneeded event box causing issues with transparent panels. Andrzej +2012-11-01 54fde86 l10n: Serbian translation Саша Петровић +2012-10-25 56a10c5 l10n: Updated Uyghur (ug) translation to 100% Gheyret Kenji +2012-07-25 aaa1b5f Make sure the menu is closed when the button is removed. Andrzej +2012-06-04 6e234ad l10n: Updated Uyghur (ug) translation to 100% Gheyret Kenji +2012-05-10 24788ad Fixed compilation warnings Andrzej +2012-05-04 3930157 l10n: Added Galician translation Leandro Regueiro +2012-04-29 c40c282 Fixed missing placeholder label (regression) Andrzej +2012-04-28 2cb73e6 Moved button-related event handlers to buttons Andrzej +2012-04-28 c9785b9 Refactored XfceIndicatorButton class Andrzej +2012-04-28 8af1dff compilation error fix Andrzej +2012-04-27 fb8b0c8 Added "align-left" property Andrzej +2012-04-23 9715e41 back to normal Mark Trompell +2012-04-23 ea26211 get ready for a release Mark Trompell 2012-04-08 828eb61 Cleaning some runtime GObject assert violations Andrzej 2012-04-02 33611c0 bugfix: fixed label orientation. Andrzej 2012-04-20 7ce7f33 l10n: Updated Chinese (China) (zh_CN) translation to 100% Chipong Luo 2012-04-12 33a3472 l10n: Initial Finnish translation Jari Rahkonen +2012-04-08 57b1394 Fixed panel 4.9 assert (widget not constructed) Andrzej +2012-04-08 d0bef06 Cleaning some runtime GObject assert violations Andrzej +2012-04-02 81aecb3 bugfix: fixed label orientation. Andrzej +2012-04-01 c90af56 Reworked dialog UI. Andrzej +2012-04-01 e79f2b3 Added comments. Andrzej +2012-04-01 44ef2fa Experiment with preferences dialog. Andrzej +2012-03-31 02a4e03 Reverted glade related change - not ready yet. Andrzej +2012-03-31 f84d012 Making the plugin a library and a subclass of XfcePanelPlugin Andrzej +2012-03-29 d59fbfc Reworked entry_removed handler Andrzej 2012-03-23 2bf70a1 bind icon-size-max to xfconf Andrzej 2012-03-22 969fe20 Replaced "nrows-min" with "icon-size-max" Andrzej 2012-03-21 517416a brain dead port to xfconf Mark Trompell === modified file 'INSTALL' --- INSTALL 2011-02-19 11:59:37 +0000 +++ INSTALL 2013-08-14 19:58:39 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended === modified file 'Makefile.am' --- Makefile.am 2010-06-13 17:14:30 +0000 +++ Makefile.am 2013-08-14 19:58:39 +0000 @@ -6,6 +6,9 @@ distclean-local: rm -rf *.cache *~ +distuninstallcheck_listfiles = \ + find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache + rpm: dist rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz @rm -f $(PACKAGE)-$(VERSION).tar.gz === modified file 'Makefile.in' --- Makefile.in 2012-05-05 15:54:41 +0000 +++ Makefile.in 2013-08-14 19:58:39 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -41,7 +58,7 @@ INSTALL NEWS THANKS TODO config.guess config.sub depcomp \ install-sh ltmain.sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -50,6 +67,12 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -59,6 +82,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -71,9 +99,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -101,11 +131,13 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -160,6 +192,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -172,6 +208,10 @@ LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@ LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@ LIBXFCE4PANEL_VERSION = @LIBXFCE4PANEL_VERSION@ +LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@ +LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@ +LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@ +LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@ LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ @@ -262,6 +302,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -290,6 +332,9 @@ panel-plugin \ po +distuninstallcheck_listfiles = \ + find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache + EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ @@ -304,7 +349,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -340,10 +385,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -534,13 +577,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -571,7 +611,11 @@ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir @@ -579,7 +623,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -597,7 +641,7 @@ dist dist-all: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -611,6 +655,8 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -620,7 +666,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -630,6 +676,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -658,8 +705,16 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -690,10 +745,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -782,8 +842,8 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ + dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ + dist-zip distcheck distclean distclean-generic distclean-hdr \ distclean-libtool distclean-local distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-data \ === modified file 'aclocal.m4' --- aclocal.m4 2012-05-05 15:54:41 +0000 +++ aclocal.m4 2013-08-14 19:58:39 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -260,6 +261,10 @@ [CATOBJEXT=.mo DATADIRNAME=lib]) ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -454,7 +459,7 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL +# serial 42 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -467,13 +472,11 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) @@ -486,25 +489,48 @@ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' _IT_SUBST(INTLTOOL_DESKTOP_RULE) _IT_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -550,7 +576,7 @@ if test $? -ne 0; then AC_MSG_ERROR([perl 5.8.1 is required for intltool]) else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then @@ -649,8 +675,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -659,8 +685,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -794,6 +820,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -1279,7 +1307,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -1443,6 +1471,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -1464,6 +1493,29 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -1494,6 +1546,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -1596,7 +1652,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1604,6 +1666,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -1615,6 +1678,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -1632,7 +1696,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1677,8 +1743,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1689,6 +1755,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1972,14 +2040,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -2056,13 +2137,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -2242,6 +2323,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -2281,7 +2367,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2827,7 +2913,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2836,7 +2922,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2901,7 +2987,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -3040,7 +3126,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -3048,10 +3134,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -3059,7 +3141,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -3077,7 +3159,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -3097,17 +3179,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -3168,7 +3251,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -3184,7 +3267,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -3221,9 +3304,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3252,14 +3335,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then 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' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -3271,6 +3350,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3290,7 +3381,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3359,7 +3450,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3384,7 +3475,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3408,7 +3499,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -3439,7 +3530,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3449,7 +3540,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3871,12 +3962,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4291,6 +4382,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4687,7 +4779,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4875,7 +4967,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4967,18 +5061,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -5138,13 +5247,18 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -5163,7 +5277,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5208,6 +5321,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5414,8 +5530,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5430,7 +5545,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5607,6 +5722,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5710,6 +5826,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5756,10 +5873,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5772,7 +5885,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5811,7 +5924,6 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5915,7 +6027,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6253,9 +6365,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -6409,7 +6518,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6779,7 +6887,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -7540,12 +7648,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7742,7 +7856,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7875,7 +7988,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -8058,6 +8170,73 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -8127,6 +8306,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -8791,9 +8977,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) @@ -8965,15 +9166,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) @@ -9077,8 +9278,9 @@ m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9096,17 +9298,17 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- @@ -9137,7 +9339,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -9183,7 +9386,8 @@ pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -9231,9 +9435,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -9246,7 +9450,7 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT]) +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -9257,7 +9461,7 @@ _PKG_TEXT -To get pkg-config, see .]) +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -9267,12 +9471,15 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -9282,7 +9489,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9298,19 +9505,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -9392,14 +9601,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -9439,6 +9648,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -9503,7 +9713,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -9568,10 +9778,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -9654,18 +9867,6 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -9805,12 +10006,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -9850,8 +10054,8 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +# 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9871,7 +10075,7 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -9982,12 +10186,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -10010,13 +10217,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -10024,13 +10232,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -10041,12 +10249,14 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. @@ -10123,11 +10333,70 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using `$V' instead of `$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 1 # AM_PROG_INSTALL_STRIP # --------------------- @@ -10151,13 +10420,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -10166,13 +10435,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10194,10 +10463,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) === modified file 'config.guess' --- config.guess 2011-02-19 11:59:37 +0000 +++ config.guess 2013-08-14 19:58:39 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -56,8 +54,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -144,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +179,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -223,7 +222,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +268,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,7 +297,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -394,23 +396,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +482,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +496,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +553,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +596,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +732,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +771,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -803,15 +804,18 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -857,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -866,7 +877,7 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -878,20 +889,29 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -933,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -959,7 +979,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -967,14 +987,17 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1006,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1042,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1070,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1111,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1155,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1184,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1230,6 +1253,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1275,13 +1301,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1299,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1321,11 +1350,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif === modified file 'config.h.in' --- config.h.in 2011-02-19 11:59:37 +0000 +++ config.h.in 2013-08-14 19:58:39 +0000 @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define for debugging support */ #undef DEBUG === modified file 'config.sub' --- config.sub 2011-02-19 11:59:37 +0000 +++ config.sub 2013-08-14 19:58:39 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -75,8 +73,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,13 +122,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -156,8 +160,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +177,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -221,6 +225,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -245,17 +255,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -281,29 +296,39 @@ | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +338,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -327,21 +367,25 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -367,25 +411,29 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +458,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +528,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +573,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +731,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,7 +788,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -771,10 +827,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +903,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +991,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1017,6 +1088,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1147,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1218,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1318,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1293,8 +1358,9 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1407,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1456,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1435,6 +1501,8 @@ -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1525,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1540,20 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1573,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1527,7 +1604,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) === modified file 'configure' --- configure 2012-05-05 15:54:41 +0000 +++ configure 2013-08-14 19:58:39 +0000 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in 828eb61. +# From configure.ac 69afae1. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for xfce4-indicator-plugin 0.5.0. +# Generated by GNU Autoconf 2.69 for xfce4-indicator-plugin 1.0.0. # # Report bugs to . # @@ -9,9 +9,7 @@ # The Xfce development team. All rights reserved. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -140,6 +138,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -173,7 +196,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -226,21 +250,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -343,6 +371,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -464,6 +500,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -498,16 +538,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -519,28 +559,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -574,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='xfce4-indicator-plugin' PACKAGE_TARNAME='xfce4-indicator-plugin' -PACKAGE_VERSION='0.5.0' -PACKAGE_STRING='xfce4-indicator-plugin 0.5.0' +PACKAGE_VERSION='1.0.0' +PACKAGE_STRING='xfce4-indicator-plugin 1.0.0' PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' PACKAGE_URL='' @@ -636,6 +656,10 @@ LIBXFCE4PANEL_LIBS LIBXFCE4PANEL_CFLAGS LIBXFCE4PANEL_VERSION +LIBXFCE4UI_REQUIRED_VERSION +LIBXFCE4UI_LIBS +LIBXFCE4UI_CFLAGS +LIBXFCE4UI_VERSION LIBXFCE4UTIL_REQUIRED_VERSION LIBXFCE4UTIL_LIBS LIBXFCE4UTIL_CFLAGS @@ -715,6 +739,12 @@ INTLTOOL_KEYS_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_DESKTOP_RULE +intltool__v_merge_options_0 +intltool__v_merge_options_ +INTLTOOL_V_MERGE_OPTIONS +INTLTOOL__v_MERGE_0 +INTLTOOL__v_MERGE_ +INTLTOOL_V_MERGE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE @@ -727,6 +757,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -740,6 +771,10 @@ LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -820,6 +855,7 @@ ac_user_opts=' enable_option_checking enable_maintainer_mode +enable_silent_rules enable_dependency_tracking with_gnu_ld enable_nls @@ -1301,8 +1337,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1388,7 +1422,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xfce4-indicator-plugin 0.5.0 to adapt to many kinds of systems. +\`configure' configures xfce4-indicator-plugin 1.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1464,7 +1498,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfce4-indicator-plugin 0.5.0:";; + short | recursive ) echo "Configuration of xfce4-indicator-plugin 1.0.0:";; esac cat <<\_ACEOF @@ -1474,6 +1508,8 @@ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer + --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0') --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-nls do not use Native Language Support @@ -1490,7 +1526,7 @@ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). @@ -1581,10 +1617,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xfce4-indicator-plugin configure 0.5.0 -generated by GNU Autoconf 2.68 +xfce4-indicator-plugin configure 1.0.0 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -1663,7 +1699,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1953,8 +1989,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xfce4-indicator-plugin $as_me 0.5.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by xfce4-indicator-plugin $as_me 1.0.0, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2482,7 +2518,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2651,7 +2687,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2691,7 +2727,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2742,7 +2778,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2795,7 +2831,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2881,7 +2917,7 @@ # Define the identity of the package. PACKAGE='xfce4-indicator-plugin' - VERSION='0.5.0' + VERSION='1.0.0' cat >>confdefs.h <<_ACEOF @@ -2911,9 +2947,9 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 @@ -3027,6 +3063,45 @@ MAINT=$MAINTAINER_MODE_TRUE +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=0;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3050,7 +3125,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3090,7 +3165,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3143,7 +3218,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3184,7 +3259,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3242,7 +3317,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3286,7 +3361,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3732,8 +3807,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3869,6 +3943,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3893,6 +3968,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3952,7 +4028,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -4029,7 +4105,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4105,7 +4181,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4171,7 +4247,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4238,7 +4314,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -4495,14 +4571,12 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n ""; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5 $as_echo_n "checking for intltool >= ... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || @@ -4527,7 +4601,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4567,7 +4641,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4607,7 +4681,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4633,25 +4707,48 @@ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -4768,7 +4865,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4808,7 +4905,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4848,7 +4945,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4888,7 +4985,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4939,7 +5036,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4970,7 +5067,7 @@ if test $? -ne 0; then as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi @@ -5038,8 +5135,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -5149,7 +5246,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5193,7 +5290,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5351,6 +5448,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5390,7 +5492,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -5612,7 +5714,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5652,7 +5754,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5819,12 +5921,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -5958,7 +6060,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5998,7 +6100,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6101,7 +6203,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6145,7 +6247,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6270,7 +6372,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6310,7 +6412,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6369,7 +6471,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6409,7 +6511,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6459,13 +6561,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -6612,6 +6714,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -7000,7 +7103,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -7011,7 +7114,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7044,7 +7160,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7084,7 +7200,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7164,7 +7280,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7204,7 +7320,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7256,7 +7372,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7296,7 +7412,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7348,7 +7464,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7388,7 +7504,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7440,7 +7556,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7480,7 +7596,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7532,7 +7648,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7572,7 +7688,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7651,7 +7767,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7662,6 +7784,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -7694,6 +7817,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -7715,7 +7839,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8119,7 +8245,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8197,6 +8338,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -8652,7 +8797,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -8743,18 +8890,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -9116,7 +9278,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9160,6 +9321,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -9366,8 +9530,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -9382,7 +9545,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -9559,6 +9722,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -9746,6 +9910,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -9791,6 +9956,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -9819,10 +9985,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -9835,7 +9997,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -9874,7 +10036,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10015,7 +10176,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10498,11 +10659,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10592,7 +10748,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10601,7 +10757,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10666,7 +10822,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -10805,7 +10961,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10813,10 +10969,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -10824,7 +10976,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10842,7 +10994,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10862,17 +11014,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -10933,7 +11086,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -10949,7 +11102,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -10986,9 +11139,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11036,14 +11189,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then 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' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11055,6 +11204,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -11074,7 +11235,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11143,7 +11304,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11168,7 +11329,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11192,7 +11353,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11223,7 +11384,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11233,7 +11394,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -12015,6 +12176,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -12024,6 +12187,9 @@ + + + for ac_header in math.h memory.h stdlib.h string.h sys/stat.h \ sys/time.h time.h do : @@ -12061,7 +12227,7 @@ - ALL_LINGUAS="ar bg ca cs da de es eu fi fr hr hu id it ko lt nl pl pt_BR pt ro ru sk tr ug uk zh_CN zh_TW " + ALL_LINGUAS="ar bg ca cs da de es eu fi fr gl hr hu id it ja ko lt nl pl pt_BR pt ro ru sk sr tr ug uk zh_CN zh_TW " for ac_header in locale.h do : @@ -12560,7 +12726,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12647,6 +12813,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -13573,6 +13743,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -13593,7 +13764,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13636,7 +13807,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13767,6 +13938,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -13787,7 +13959,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13830,7 +14002,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13961,6 +14133,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -13981,7 +14154,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14024,7 +14197,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14155,70 +14328,266 @@ -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-1 >= 4.8.0" >&5 +$as_echo_n "checking for libxfce4ui-1 >= 4.8.0... " >&6; } + if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4ui-1" >/dev/null 2>&1; then + LIBXFCE4UI_VERSION=`$PKG_CONFIG --modversion "libxfce4ui-1"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_VERSION" >&5 +$as_echo "$LIBXFCE4UI_VERSION" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_CFLAGS" >&5 +$as_echo_n "checking LIBXFCE4UI_CFLAGS... " >&6; } + LIBXFCE4UI_CFLAGS=`$PKG_CONFIG --cflags "libxfce4ui-1"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_CFLAGS" >&5 +$as_echo "$LIBXFCE4UI_CFLAGS" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UI_LIBS" >&5 +$as_echo_n "checking LIBXFCE4UI_LIBS... " >&6; } + LIBXFCE4UI_LIBS=`$PKG_CONFIG --libs "libxfce4ui-1"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_LIBS" >&5 +$as_echo "$LIBXFCE4UI_LIBS" >&6; } + + LIBXFCE4UI_REQUIRED_VERSION=4.8.0 + + + + + + + + elif $PKG_CONFIG --exists "libxfce4ui-1" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4ui-1"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 +$as_echo "found, but $xdt_cv_version" >&6; } + + + echo "*** The required package libxfce4ui-1 was found on your system," + echo "*** but the installed version ($xdt_cv_version) is too old." + echo "*** Please upgrade libxfce4ui-1 to atleast version 4.8.0, or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you installed" + echo "*** the new version of the package in a nonstandard prefix so" + echo "*** pkg-config is able to find it." + exit 1 + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + + + echo "*** The required package libxfce4ui-1 was not found on your system." + echo "*** Please install libxfce4ui-1 (atleast version 4.8.0) or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you" + echo "*** installed the package in a nonstandard prefix so that" + echo "*** pkg-config is able to find it." + exit 1 + + fi + + + + # minimum supported version of pkg-config + xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 + + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14349,6 +14718,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -14369,7 +14739,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14412,7 +14782,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14543,6 +14913,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -14563,7 +14934,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14606,7 +14977,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14714,6 +15085,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -14734,7 +15106,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14777,7 +15149,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14912,6 +15284,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -14932,7 +15305,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14975,7 +15348,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15648,16 +16021,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -15717,28 +16090,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -15759,8 +16120,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xfce4-indicator-plugin $as_me 0.5.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by xfce4-indicator-plugin $as_me 1.0.0, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15825,11 +16186,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xfce4-indicator-plugin config.status 0.5.0 -configured by $0, generated by GNU Autoconf 2.68, +xfce4-indicator-plugin config.status 1.0.0 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -15920,7 +16281,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -15968,6 +16329,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -16044,7 +16406,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -16105,6 +16466,7 @@ SHELL \ ECHO \ LD \ +PATH_SEPARATOR \ NM \ LN_S \ lt_SP2NL \ @@ -16150,7 +16512,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -16954,8 +17315,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -17024,6 +17385,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -17310,10 +17674,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator === added file 'configure.ac' --- configure.ac 1970-01-01 00:00:00 +0000 +++ configure.ac 2013-08-14 19:58:39 +0000 @@ -0,0 +1,131 @@ +dnl +dnl This file was autogenerated from "configure.ac.in". +dnl Edit that file instead! +dnl + +dnl xfce4-indicator-plugin - A indicator plugin for the Xfce panel +dnl +dnl 2009 Mark Trompell +dnl + +dnl *************************** +dnl *** Version information *** +dnl *************************** +m4_define([indicator_version_major], [1]) +m4_define([indicator_version_minor], [0]) +m4_define([indicator_version_micro], [0]) +m4_define([indicator_version_nano], []) dnl leave this empty to have no nano version +m4_define([indicator_version_build], [69afae1]) +m4_define([indicator_version_tag], []) +m4_define([indicator_version], [indicator_version_major().indicator_version_minor().indicator_version_micro()ifelse(indicator_version_nano(), [], [], [.indicator_version_nano()])ifelse(indicator_version_tag(), [git], [indicator_version_tag()-indicator_version_build()], [indicator_version_tag()])]) + +dnl *************************** +dnl *** Initialize autoconf *** +dnl *************************** +AC_COPYRIGHT([Copyright (c) 2006-2007 + The Xfce development team. All rights reserved.]) +AC_INIT([xfce4-indicator-plugin], [indicator_version], [http://bugzilla.xfce.org/], [xfce4-indicator-plugin]) +AC_PREREQ([2.50]) +AC_CANONICAL_TARGET() +AC_REVISION([69afae1]) + +dnl *************************** +dnl *** Initialize automake *** +dnl *************************** +AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) +AC_CONFIG_HEADERS([config.h]) +AM_MAINTAINER_MODE() +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +dnl ******************************** +dnl *** Check for basic programs *** +dnl ******************************** +AC_PROG_CC() +AC_PROG_LD() +AC_PROG_INSTALL() +AC_PROG_INTLTOOL() +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) + +dnl ************************** +dnl *** Initialize libtool *** +dnl ************************** +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) + +dnl ********************************** +dnl *** Check for standard headers *** +dnl ********************************** +AC_CHECK_HEADERS([math.h memory.h stdlib.h string.h sys/stat.h \ + sys/time.h time.h]) + +dnl ************************************ +dnl *** Check for standard functions *** +dnl ************************************ +AC_CHECK_FUNCS([]) + +dnl ****************************** +dnl *** Check for i18n support *** +dnl ****************************** +XDT_I18N([ar bg ca cs da de es eu fi fr gl hr hu id it ja ko lt nl pl pt_BR pt ro ru sk sr tr ug uk zh_CN zh_TW ]) + +dnl ******************************* +dnl *** Check for X11 installed *** +dnl ******************************* +XDT_CHECK_LIBX11_REQUIRE() + +dnl *********************************** +dnl *** Check for required packages *** +dnl *********************************** +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) +XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.2]) +XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0]) +XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.3.0], [indicator_pkgname=indicator], [XDT_CHECK_PACKAGE([INDICATOR], [indicator-0.4], [0.3.90], [indicator_pkgname=indicator-0.4], [])]) + +dnl *********************************** +dnl *** Check for debugging support *** +dnl *********************************** +XDT_FEATURE_DEBUG() + +dnl *********************** +dnl *** Indicator info *** +dnl *********************** +INDICATORDIR=`$PKG_CONFIG --variable=indicatordir $indicator_pkgname` +INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir $indicator_pkgname` + +AC_SUBST(INDICATORDIR) +AC_SUBST(INDICATORICONSDIR) + +dnl ********************************* +dnl *** Substitute platform flags *** +dnl ********************************* +AC_MSG_CHECKING([PLATFORM_CPPFLAGS]) +AC_MSG_RESULT([$PLATFORM_CPPFLAGS]) +AC_SUBST([PLATFORM_CPPFLAGS]) +AC_MSG_CHECKING([PLATFORM_CFLAGS]) +AC_MSG_RESULT([$PLATFORM_CFLAGS]) +AC_SUBST([PLATFORM_CFLAGS]) +AC_MSG_CHECKING([PLATFORM_LDFLAGS]) +AC_MSG_RESULT([$PLATFORM_LDFLAGS]) +AC_SUBST([PLATFORM_LDFLAGS]) + +AC_OUTPUT([ +Makefile +icons/Makefile +icons/48x48/Makefile +icons/scalable/Makefile +panel-plugin/Makefile +po/Makefile.in +]) + +dnl *************************** +dnl *** Print configuration *** +dnl *************************** +echo +echo "Build Configuration:" +echo +echo "* Debug Support: $enable_debug" +echo === removed file 'configure.in' --- configure.in 2012-05-05 15:54:41 +0000 +++ configure.in 1970-01-01 00:00:00 +0000 @@ -1,123 +0,0 @@ -dnl -dnl This file was autogenerated from "configure.in.in". -dnl Edit that file instead! -dnl - -dnl xfce4-indicator-plugin - A indicator plugin for the Xfce panel -dnl -dnl 2009 Mark Trompell -dnl - -dnl *************************** -dnl *** Version information *** -dnl *************************** -m4_define([indicator_version_major], [0]) -m4_define([indicator_version_minor], [5]) -m4_define([indicator_version_micro], [0]) -m4_define([indicator_version_nano], []) dnl leave this empty to have no nano version -m4_define([indicator_version_build], [828eb61]) -m4_define([indicator_version_tag], []) -m4_define([indicator_version], [indicator_version_major().indicator_version_minor().indicator_version_micro()ifelse(indicator_version_nano(), [], [], [.indicator_version_nano()])ifelse(indicator_version_tag(), [git], [indicator_version_tag()-indicator_version_build()], [indicator_version_tag()])]) - -dnl *************************** -dnl *** Initialize autoconf *** -dnl *************************** -AC_COPYRIGHT([Copyright (c) 2006-2007 - The Xfce development team. All rights reserved.]) -AC_INIT([xfce4-indicator-plugin], [indicator_version], [http://bugzilla.xfce.org/], [xfce4-indicator-plugin]) -AC_PREREQ([2.50]) -AC_CANONICAL_TARGET() -AC_REVISION([828eb61]) - -dnl *************************** -dnl *** Initialize automake *** -dnl *************************** -AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) -AM_CONFIG_HEADER([config.h]) -AM_MAINTAINER_MODE() - -dnl ******************************** -dnl *** Check for basic programs *** -dnl ******************************** -AC_PROG_CC() -AC_PROG_LD() -AC_PROG_INSTALL() -AC_PROG_INTLTOOL() -LT_PREREQ([2.2.6]) -LT_INIT([disable-static]) - -dnl ********************************** -dnl *** Check for standard headers *** -dnl ********************************** -AC_CHECK_HEADERS([math.h memory.h stdlib.h string.h sys/stat.h \ - sys/time.h time.h]) - -dnl ************************************ -dnl *** Check for standard functions *** -dnl ************************************ -AC_CHECK_FUNCS([]) - -dnl ****************************** -dnl *** Check for i18n support *** -dnl ****************************** -XDT_I18N([ar bg ca cs da de es eu fi fr hr hu id it ko lt nl pl pt_BR pt ro ru sk tr ug uk zh_CN zh_TW ]) - -dnl ******************************* -dnl *** Check for X11 installed *** -dnl ******************************* -XDT_CHECK_LIBX11_REQUIRE() - -dnl *********************************** -dnl *** Check for required packages *** -dnl *********************************** -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) -XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2]) -XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.2]) -XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0]) -XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.3.0], [indicator_pkgname=indicator], [XDT_CHECK_PACKAGE([INDICATOR], [indicator-0.4], [0.3.90], [indicator_pkgname=indicator-0.4], [])]) - -dnl *********************************** -dnl *** Check for debugging support *** -dnl *********************************** -XDT_FEATURE_DEBUG() - -dnl *********************** -dnl *** Indicator info *** -dnl *********************** -INDICATORDIR=`$PKG_CONFIG --variable=indicatordir $indicator_pkgname` -INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir $indicator_pkgname` - -AC_SUBST(INDICATORDIR) -AC_SUBST(INDICATORICONSDIR) - -dnl ********************************* -dnl *** Substitute platform flags *** -dnl ********************************* -AC_MSG_CHECKING([PLATFORM_CPPFLAGS]) -AC_MSG_RESULT([$PLATFORM_CPPFLAGS]) -AC_SUBST([PLATFORM_CPPFLAGS]) -AC_MSG_CHECKING([PLATFORM_CFLAGS]) -AC_MSG_RESULT([$PLATFORM_CFLAGS]) -AC_SUBST([PLATFORM_CFLAGS]) -AC_MSG_CHECKING([PLATFORM_LDFLAGS]) -AC_MSG_RESULT([$PLATFORM_LDFLAGS]) -AC_SUBST([PLATFORM_LDFLAGS]) - -AC_OUTPUT([ -Makefile -icons/Makefile -icons/48x48/Makefile -icons/scalable/Makefile -panel-plugin/Makefile -po/Makefile.in -]) - -dnl *************************** -dnl *** Print configuration *** -dnl *************************** -echo -echo "Build Configuration:" -echo -echo "* Debug Support: $enable_debug" -echo === modified file 'debian/changelog' --- debian/changelog 2013-05-25 21:41:44 +0000 +++ debian/changelog 2013-08-14 19:58:39 +0000 @@ -1,3 +1,27 @@ +xfce4-indicator-plugin (1.0.0-1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: Drop recommends on indicator-messages-gtk2, as it + was removed from the archive. + * Drop debian/patches/migrate-xfcerc-xfconf.patch, it no longer applies. + + -- Jackson Doak Thu, 15 Aug 2013 05:40:56 +1000 + +xfce4-indicator-plugin (1.0.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - add build-dep on libxfce4ui-1-dev. + * debian/rules: + - don't ship .la files. + - ignore plugin for dh_makeshlibs, since it's a plugin. + - use autotools-dev addon to update config.{guess,sub}. + * debian/control: + - add build-dep on dpkg-dev for including pkg-info.mk. + - add build-dep on autotools-dev + + -- Yves-Alexis Perez Mon, 10 Jun 2013 22:22:42 +0200 + xfce4-indicator-plugin (0.5.0-2ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: === modified file 'debian/control' --- debian/control 2013-05-25 21:41:44 +0000 +++ debian/control 2013-08-14 19:58:39 +0000 @@ -6,7 +6,8 @@ Uploaders: Yves-Alexis Perez , Evgeni Golov , Lionel Le Folgoc Build-Depends: debhelper (>= 9), xfce4-panel-dev, libindicator-dev, intltool, - libexo-1-dev, libxfconf-0-dev + libexo-1-dev, libxfconf-0-dev, libxfce4ui-1-dev, dpkg-dev (>= 1.16.1~), + autotools-dev Standards-Version: 3.9.4 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin/ Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/ === modified file 'debian/patches/series' --- debian/patches/series 2012-05-23 21:20:49 +0000 +++ debian/patches/series 2013-08-14 19:58:39 +0000 @@ -1,1 +1,1 @@ -migrate-xfcerc-xfconf.patch +#migrate-xfcerc-xfconf.patch === modified file 'debian/rules' --- debian/rules 2013-05-25 21:41:44 +0000 +++ debian/rules 2013-08-14 19:58:39 +0000 @@ -1,7 +1,17 @@ #!/usr/bin/make -f +include /usr/share/dpkg/pkg-info.mk +include /usr/share/dpkg/architecture.mk + export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 export DEB_BUILD_MAINT_OPTIONS=hardening=+all +override_dh_auto_install: + dh_auto_install + find debian/$(DEB_SOURCE)/ -name '*.la' -delete + +override_dh_makeshlibs: + dh_makeshlibs -X debian/$(DEB_SOURCE)/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/lib*-plugin.so + %: - dh $@ --parallel + dh $@ --parallel --with autotools-dev === modified file 'depcomp' --- depcomp 2011-02-19 11:59:37 +0000 +++ depcomp 2013-08-14 19:58:39 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-03-27.16; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,11 +40,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +57,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -90,10 +96,24 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -148,20 +168,21 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -193,18 +214,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -216,10 +234,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -249,12 +274,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -265,23 +289,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -290,15 +317,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -334,7 +367,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -349,9 +382,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -397,14 +430,59 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -422,7 +500,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,15 +520,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -503,9 +580,10 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -525,7 +603,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -594,8 +672,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; === modified file 'icons/48x48/Makefile.in' --- icons/48x48/Makefile.in 2012-05-05 15:54:41 +0000 +++ icons/48x48/Makefile.in 2013-08-14 19:58:39 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +18,23 @@ # $Id: Makefile.am 2257 2006-12-19 19:49:00Z nick $ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -40,15 +57,26 @@ subdir = icons/48x48 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -70,12 +98,19 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -130,6 +165,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -142,6 +181,10 @@ LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@ LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@ LIBXFCE4PANEL_VERSION = @LIBXFCE4PANEL_VERSION@ +LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@ +LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@ +LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@ +LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@ LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ @@ -232,6 +275,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -303,8 +348,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -318,9 +366,7 @@ @$(NORMAL_UNINSTALL) @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(iconsdir)" && rm -f $$files + dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -375,10 +421,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: === modified file 'icons/Makefile.in' --- icons/Makefile.in 2012-05-05 15:54:41 +0000 +++ icons/Makefile.in 2013-08-14 19:58:39 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +17,23 @@ # $Id: Makefile.am 2257 2006-12-19 19:49:00Z nick $ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,13 +56,19 @@ subdir = icons DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -55,6 +78,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -92,6 +120,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -146,6 +175,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -158,6 +191,10 @@ LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@ LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@ LIBXFCE4PANEL_VERSION = @LIBXFCE4PANEL_VERSION@ +LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@ +LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@ +LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@ +LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@ LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ @@ -248,6 +285,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -483,13 +522,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -524,10 +560,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: === modified file 'icons/scalable/Makefile.in' --- icons/scalable/Makefile.in 2012-05-05 15:54:41 +0000 +++ icons/scalable/Makefile.in 2013-08-14 19:58:39 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +18,23 @@ # $Id: Makefile.am 2257 2006-12-19 19:49:00Z nick $ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -40,15 +57,26 @@ subdir = icons/scalable DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -70,12 +98,19 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -130,6 +165,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -142,6 +181,10 @@ LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@ LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@ LIBXFCE4PANEL_VERSION = @LIBXFCE4PANEL_VERSION@ +LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@ +LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@ +LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@ +LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@ LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ @@ -232,6 +275,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -303,8 +348,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -318,9 +366,7 @@ @$(NORMAL_UNINSTALL) @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(iconsdir)" && rm -f $$files + dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -375,10 +421,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: === modified file 'install-sh' --- install-sh 2011-02-19 11:59:37 +0000 +++ install-sh 2013-08-14 19:58:39 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then === modified file 'ltmain.sh' (properties changed: +x to -x) --- ltmain.sh 2011-07-15 15:27:20 +0000 +++ ltmain.sh 2013-08-14 19:58:39 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION="2.4.2 Debian-2.4.2-1ubuntu2" TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6111,7 +6124,10 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6147,7 +6163,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6430,19 +6447,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -6831,7 +6848,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7333,7 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7334,6 +7352,9 @@ revision="$number_minor" lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; esac ;; no) @@ -7432,7 +7453,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8041,11 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8050,7 +8076,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8058,11 +8084,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9174,8 @@ esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9285,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" === modified file 'missing' --- missing 2011-02-19 11:59:37 +0000 +++ missing 2013-08-14 19:58:39 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. === modified file 'panel-plugin/Makefile.am' --- panel-plugin/Makefile.am 2012-05-05 15:54:41 +0000 +++ panel-plugin/Makefile.am 2013-08-14 19:58:39 +0000 @@ -1,30 +1,40 @@ + INCLUDES = \ -I$(top_srcdir) \ - -DG_LOG_DOMAIN=\"xfce4-indicator-plugin\" \ + -DG_LOG_DOMAIN=\"libindicator-plugin\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ $(PLATFORM_CPPFLAGS) # # Indicator plugin # -plugin_PROGRAMS = \ - xfce4-indicator-plugin - -plugindir = \ - $(libexecdir)/xfce4/panel-plugins - -xfce4_indicator_plugin_SOURCES = \ +plugindir = \ + $(libdir)/xfce4/panel/plugins + +plugin_LTLIBRARIES = \ + libindicator-plugin.la + +libindicator_built_sources = \ + indicator-dialog_ui.h + +libindicator_plugin_la_SOURCES = \ + $(libindicator_built_sources) \ + indicator-config.c \ + indicator-config.h \ indicator-button.c \ indicator-button.h \ indicator-box.c \ indicator-box.h \ + indicator-dialog.c \ + indicator-dialog.h \ indicator.c \ indicator.h -xfce4_indicator_plugin_CFLAGS = \ +libindicator_plugin_la_CFLAGS = \ $(GTK_CFLAGS) \ $(EXO_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ $(LIBXFCE4PANEL_CFLAGS) \ $(XFCONF_CFLAGS) \ $(INDICATOR_CFLAGS) \ @@ -33,11 +43,18 @@ -DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \ -DINDICATOR_DIR=\""$(INDICATORDIR)"\" +libindicator_plugin_la_LDFLAGS = \ + -avoid-version \ + -module \ + -no-undefined \ + -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \ + $(PLATFORM_LDFLAGS) -xfce4_indicator_plugin_LDADD = \ +libindicator_plugin_la_LIBADD = \ $(GTK_LIBS) \ $(EXO_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ + $(LIBXFCE4UI_LIBS) \ $(LIBXFCE4PANEL_LIBS) \ $(XFCONF_LIBS) \ $(INDICATOR_LIBS) @@ -46,16 +63,10 @@ # Desktop file # desktopdir = \ - $(datadir)/xfce4/panel-plugins - -desktop_in_in_files = \ - indicator.desktop.in.in - -desktop_in_files = \ - $(desktop_in_in_files:.desktop.in.in=.desktop.in) - -%.desktop.in: %.desktop.in.in - sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@ + $(datadir)/xfce4/panel/plugins + +desktop_in_files = \ + indicator.desktop.in desktop_DATA = \ $(desktop_in_files:.desktop.in=.desktop) @@ -63,10 +74,21 @@ @INTLTOOL_DESKTOP_RULE@ EXTRA_DIST = \ - $(desktop_in_in_files) + indicator-dialog.glade \ + $(desktop_in_files) -CLEANFILES = \ - $(desktop_in_files) \ +DISTCLEANFILES = \ $(desktop_DATA) +if MAINTAINER_MODE +BUILT_SOURCES = \ + $(libindicator_built_sources) + +DISTCLEANFILES += \ + $(libindicator_built_sources) + +indicator-dialog_ui.h: indicator-dialog.glade + $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=indicator_dialog_ui $< >$@ +endif + # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: === modified file 'panel-plugin/Makefile.in' --- panel-plugin/Makefile.in 2012-05-05 15:54:41 +0000 +++ panel-plugin/Makefile.in 2013-08-14 19:58:39 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,48 +53,19 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -plugin_PROGRAMS = xfce4-indicator-plugin$(EXEEXT) +@MAINTAINER_MODE_TRUE@am__append_1 = \ +@MAINTAINER_MODE_TRUE@ $(libindicator_built_sources) + subdir = panel-plugin DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(desktopdir)" -PROGRAMS = $(plugin_PROGRAMS) -am_xfce4_indicator_plugin_OBJECTS = \ - xfce4_indicator_plugin-indicator-button.$(OBJEXT) \ - xfce4_indicator_plugin-indicator-box.$(OBJEXT) \ - xfce4_indicator_plugin-indicator.$(OBJEXT) -xfce4_indicator_plugin_OBJECTS = $(am_xfce4_indicator_plugin_OBJECTS) -am__DEPENDENCIES_1 = -xfce4_indicator_plugin_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -xfce4_indicator_plugin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(xfce4_indicator_plugin_SOURCES) -DIST_SOURCES = $(xfce4_indicator_plugin_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -99,6 +87,67 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(desktopdir)" +LTLIBRARIES = $(plugin_LTLIBRARIES) +am__DEPENDENCIES_1 = +libindicator_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am__objects_1 = +am_libindicator_plugin_la_OBJECTS = $(am__objects_1) \ + libindicator_plugin_la-indicator-config.lo \ + libindicator_plugin_la-indicator-button.lo \ + libindicator_plugin_la-indicator-box.lo \ + libindicator_plugin_la-indicator-dialog.lo \ + libindicator_plugin_la-indicator.lo +libindicator_plugin_la_OBJECTS = $(am_libindicator_plugin_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +libindicator_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libindicator_plugin_la_CFLAGS) $(CFLAGS) \ + $(libindicator_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(libindicator_plugin_la_SOURCES) +DIST_SOURCES = $(libindicator_plugin_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(desktop_DATA) ETAGS = etags CTAGS = ctags @@ -106,6 +155,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -160,6 +210,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -172,6 +226,10 @@ LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@ LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@ LIBXFCE4PANEL_VERSION = @LIBXFCE4PANEL_VERSION@ +LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@ +LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@ +LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@ +LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@ LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ @@ -262,6 +320,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -287,25 +347,41 @@ top_srcdir = @top_srcdir@ INCLUDES = \ -I$(top_srcdir) \ - -DG_LOG_DOMAIN=\"xfce4-indicator-plugin\" \ + -DG_LOG_DOMAIN=\"libindicator-plugin\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ $(PLATFORM_CPPFLAGS) + +# +# Indicator plugin +# plugindir = \ - $(libexecdir)/xfce4/panel-plugins - -xfce4_indicator_plugin_SOURCES = \ + $(libdir)/xfce4/panel/plugins + +plugin_LTLIBRARIES = \ + libindicator-plugin.la + +libindicator_built_sources = \ + indicator-dialog_ui.h + +libindicator_plugin_la_SOURCES = \ + $(libindicator_built_sources) \ + indicator-config.c \ + indicator-config.h \ indicator-button.c \ indicator-button.h \ indicator-box.c \ indicator-box.h \ + indicator-dialog.c \ + indicator-dialog.h \ indicator.c \ indicator.h -xfce4_indicator_plugin_CFLAGS = \ +libindicator_plugin_la_CFLAGS = \ $(GTK_CFLAGS) \ $(EXO_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ $(LIBXFCE4PANEL_CFLAGS) \ $(XFCONF_CFLAGS) \ $(INDICATOR_CFLAGS) \ @@ -314,10 +390,18 @@ -DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \ -DINDICATOR_DIR=\""$(INDICATORDIR)"\" -xfce4_indicator_plugin_LDADD = \ +libindicator_plugin_la_LDFLAGS = \ + -avoid-version \ + -module \ + -no-undefined \ + -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \ + $(PLATFORM_LDFLAGS) + +libindicator_plugin_la_LIBADD = \ $(GTK_LIBS) \ $(EXO_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ + $(LIBXFCE4UI_LIBS) \ $(LIBXFCE4PANEL_LIBS) \ $(XFCONF_LIBS) \ $(INDICATOR_LIBS) @@ -327,25 +411,24 @@ # Desktop file # desktopdir = \ - $(datadir)/xfce4/panel-plugins - -desktop_in_in_files = \ - indicator.desktop.in.in + $(datadir)/xfce4/panel/plugins desktop_in_files = \ - $(desktop_in_in_files:.desktop.in.in=.desktop.in) + indicator.desktop.in desktop_DATA = \ $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ - $(desktop_in_in_files) - -CLEANFILES = \ - $(desktop_in_files) \ - $(desktop_DATA) - -all: all-am + indicator-dialog.glade \ + $(desktop_in_files) + +DISTCLEANFILES = $(desktop_DATA) $(am__append_1) +@MAINTAINER_MODE_TRUE@BUILT_SOURCES = \ +@MAINTAINER_MODE_TRUE@ $(libindicator_built_sources) + +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -379,52 +462,40 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-pluginPROGRAMS: $(plugin_PROGRAMS) +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" - @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ - } \ - ; done + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ + } -uninstall-pluginPROGRAMS: +uninstall-pluginLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(plugindir)" && rm -f $$files + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \ + done -clean-pluginPROGRAMS: - @list='$(plugin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -xfce4-indicator-plugin$(EXEEXT): $(xfce4_indicator_plugin_OBJECTS) $(xfce4_indicator_plugin_DEPENDENCIES) - @rm -f xfce4-indicator-plugin$(EXEEXT) - $(xfce4_indicator_plugin_LINK) $(xfce4_indicator_plugin_OBJECTS) $(xfce4_indicator_plugin_LDADD) $(LIBS) +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libindicator-plugin.la: $(libindicator_plugin_la_OBJECTS) $(libindicator_plugin_la_DEPENDENCIES) $(EXTRA_libindicator_plugin_la_DEPENDENCIES) + $(AM_V_CCLD)$(libindicator_plugin_la_LINK) -rpath $(plugindir) $(libindicator_plugin_la_OBJECTS) $(libindicator_plugin_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -432,72 +503,67 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_indicator_plugin-indicator-box.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_indicator_plugin-indicator-button.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_indicator_plugin-indicator.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_plugin_la-indicator-box.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_plugin_la-indicator-button.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_plugin_la-indicator-config.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_plugin_la-indicator-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_plugin_la-indicator.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -xfce4_indicator_plugin-indicator-button.o: indicator-button.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) -MT xfce4_indicator_plugin-indicator-button.o -MD -MP -MF $(DEPDIR)/xfce4_indicator_plugin-indicator-button.Tpo -c -o xfce4_indicator_plugin-indicator-button.o `test -f 'indicator-button.c' || echo '$(srcdir)/'`indicator-button.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xfce4_indicator_plugin-indicator-button.Tpo $(DEPDIR)/xfce4_indicator_plugin-indicator-button.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-button.c' object='xfce4_indicator_plugin-indicator-button.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_indicator_plugin-indicator-button.o `test -f 'indicator-button.c' || echo '$(srcdir)/'`indicator-button.c - -xfce4_indicator_plugin-indicator-button.obj: indicator-button.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) -MT xfce4_indicator_plugin-indicator-button.obj -MD -MP -MF $(DEPDIR)/xfce4_indicator_plugin-indicator-button.Tpo -c -o xfce4_indicator_plugin-indicator-button.obj `if test -f 'indicator-button.c'; then $(CYGPATH_W) 'indicator-button.c'; else $(CYGPATH_W) '$(srcdir)/indicator-button.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xfce4_indicator_plugin-indicator-button.Tpo $(DEPDIR)/xfce4_indicator_plugin-indicator-button.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-button.c' object='xfce4_indicator_plugin-indicator-button.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_indicator_plugin-indicator-button.obj `if test -f 'indicator-button.c'; then $(CYGPATH_W) 'indicator-button.c'; else $(CYGPATH_W) '$(srcdir)/indicator-button.c'; fi` - -xfce4_indicator_plugin-indicator-box.o: indicator-box.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) -MT xfce4_indicator_plugin-indicator-box.o -MD -MP -MF $(DEPDIR)/xfce4_indicator_plugin-indicator-box.Tpo -c -o xfce4_indicator_plugin-indicator-box.o `test -f 'indicator-box.c' || echo '$(srcdir)/'`indicator-box.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xfce4_indicator_plugin-indicator-box.Tpo $(DEPDIR)/xfce4_indicator_plugin-indicator-box.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-box.c' object='xfce4_indicator_plugin-indicator-box.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_indicator_plugin-indicator-box.o `test -f 'indicator-box.c' || echo '$(srcdir)/'`indicator-box.c - -xfce4_indicator_plugin-indicator-box.obj: indicator-box.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) -MT xfce4_indicator_plugin-indicator-box.obj -MD -MP -MF $(DEPDIR)/xfce4_indicator_plugin-indicator-box.Tpo -c -o xfce4_indicator_plugin-indicator-box.obj `if test -f 'indicator-box.c'; then $(CYGPATH_W) 'indicator-box.c'; else $(CYGPATH_W) '$(srcdir)/indicator-box.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xfce4_indicator_plugin-indicator-box.Tpo $(DEPDIR)/xfce4_indicator_plugin-indicator-box.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator-box.c' object='xfce4_indicator_plugin-indicator-box.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_indicator_plugin-indicator-box.obj `if test -f 'indicator-box.c'; then $(CYGPATH_W) 'indicator-box.c'; else $(CYGPATH_W) '$(srcdir)/indicator-box.c'; fi` - -xfce4_indicator_plugin-indicator.o: indicator.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) -MT xfce4_indicator_plugin-indicator.o -MD -MP -MF $(DEPDIR)/xfce4_indicator_plugin-indicator.Tpo -c -o xfce4_indicator_plugin-indicator.o `test -f 'indicator.c' || echo '$(srcdir)/'`indicator.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xfce4_indicator_plugin-indicator.Tpo $(DEPDIR)/xfce4_indicator_plugin-indicator.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator.c' object='xfce4_indicator_plugin-indicator.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_indicator_plugin-indicator.o `test -f 'indicator.c' || echo '$(srcdir)/'`indicator.c - -xfce4_indicator_plugin-indicator.obj: indicator.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) -MT xfce4_indicator_plugin-indicator.obj -MD -MP -MF $(DEPDIR)/xfce4_indicator_plugin-indicator.Tpo -c -o xfce4_indicator_plugin-indicator.obj `if test -f 'indicator.c'; then $(CYGPATH_W) 'indicator.c'; else $(CYGPATH_W) '$(srcdir)/indicator.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xfce4_indicator_plugin-indicator.Tpo $(DEPDIR)/xfce4_indicator_plugin-indicator.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indicator.c' object='xfce4_indicator_plugin-indicator.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_indicator_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_indicator_plugin-indicator.obj `if test -f 'indicator.c'; then $(CYGPATH_W) 'indicator.c'; else $(CYGPATH_W) '$(srcdir)/indicator.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +libindicator_plugin_la-indicator-config.lo: indicator-config.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_plugin_la_CFLAGS) $(CFLAGS) -MT libindicator_plugin_la-indicator-config.lo -MD -MP -MF $(DEPDIR)/libindicator_plugin_la-indicator-config.Tpo -c -o libindicator_plugin_la-indicator-config.lo `test -f 'indicator-config.c' || echo '$(srcdir)/'`indicator-config.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_plugin_la-indicator-config.Tpo $(DEPDIR)/libindicator_plugin_la-indicator-config.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-config.c' object='libindicator_plugin_la-indicator-config.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_plugin_la_CFLAGS) $(CFLAGS) -c -o libindicator_plugin_la-indicator-config.lo `test -f 'indicator-config.c' || echo '$(srcdir)/'`indicator-config.c + +libindicator_plugin_la-indicator-button.lo: indicator-button.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_plugin_la_CFLAGS) $(CFLAGS) -MT libindicator_plugin_la-indicator-button.lo -MD -MP -MF $(DEPDIR)/libindicator_plugin_la-indicator-button.Tpo -c -o libindicator_plugin_la-indicator-button.lo `test -f 'indicator-button.c' || echo '$(srcdir)/'`indicator-button.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_plugin_la-indicator-button.Tpo $(DEPDIR)/libindicator_plugin_la-indicator-button.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-button.c' object='libindicator_plugin_la-indicator-button.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_plugin_la_CFLAGS) $(CFLAGS) -c -o libindicator_plugin_la-indicator-button.lo `test -f 'indicator-button.c' || echo '$(srcdir)/'`indicator-button.c + +libindicator_plugin_la-indicator-box.lo: indicator-box.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_plugin_la_CFLAGS) $(CFLAGS) -MT libindicator_plugin_la-indicator-box.lo -MD -MP -MF $(DEPDIR)/libindicator_plugin_la-indicator-box.Tpo -c -o libindicator_plugin_la-indicator-box.lo `test -f 'indicator-box.c' || echo '$(srcdir)/'`indicator-box.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_plugin_la-indicator-box.Tpo $(DEPDIR)/libindicator_plugin_la-indicator-box.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-box.c' object='libindicator_plugin_la-indicator-box.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_plugin_la_CFLAGS) $(CFLAGS) -c -o libindicator_plugin_la-indicator-box.lo `test -f 'indicator-box.c' || echo '$(srcdir)/'`indicator-box.c + +libindicator_plugin_la-indicator-dialog.lo: indicator-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_plugin_la_CFLAGS) $(CFLAGS) -MT libindicator_plugin_la-indicator-dialog.lo -MD -MP -MF $(DEPDIR)/libindicator_plugin_la-indicator-dialog.Tpo -c -o libindicator_plugin_la-indicator-dialog.lo `test -f 'indicator-dialog.c' || echo '$(srcdir)/'`indicator-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_plugin_la-indicator-dialog.Tpo $(DEPDIR)/libindicator_plugin_la-indicator-dialog.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator-dialog.c' object='libindicator_plugin_la-indicator-dialog.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_plugin_la_CFLAGS) $(CFLAGS) -c -o libindicator_plugin_la-indicator-dialog.lo `test -f 'indicator-dialog.c' || echo '$(srcdir)/'`indicator-dialog.c + +libindicator_plugin_la-indicator.lo: indicator.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_plugin_la_CFLAGS) $(CFLAGS) -MT libindicator_plugin_la-indicator.lo -MD -MP -MF $(DEPDIR)/libindicator_plugin_la-indicator.Tpo -c -o libindicator_plugin_la-indicator.lo `test -f 'indicator.c' || echo '$(srcdir)/'`indicator.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_plugin_la-indicator.Tpo $(DEPDIR)/libindicator_plugin_la-indicator.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indicator.c' object='libindicator_plugin_la-indicator.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_plugin_la_CFLAGS) $(CFLAGS) -c -o libindicator_plugin_la-indicator.lo `test -f 'indicator.c' || echo '$(srcdir)/'`indicator.c mostlyclean-libtool: -rm -f *.lo @@ -506,8 +572,11 @@ -rm -rf .libs _libs install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) - test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -521,9 +590,7 @@ @$(NORMAL_UNINSTALL) @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(desktopdir)" && rm -f $$files + dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -608,13 +675,15 @@ fi; \ done check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) $(DATA) +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(DATA) installdirs: for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(desktopdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -624,25 +693,31 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-generic clean-libtool clean-pluginPROGRAMS \ +clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -663,7 +738,7 @@ info-am: -install-data-am: install-desktopDATA install-pluginPROGRAMS +install-data-am: install-desktopDATA install-pluginLTLIBRARIES install-dvi: install-dvi-am @@ -709,31 +784,31 @@ ps-am: -uninstall-am: uninstall-desktopDATA uninstall-pluginPROGRAMS +uninstall-am: uninstall-desktopDATA uninstall-pluginLTLIBRARIES -.MAKE: install-am install-strip +.MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pluginPROGRAMS ctags distclean \ + clean-libtool clean-pluginLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ install-desktopDATA install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ - install-pluginPROGRAMS install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-desktopDATA \ - uninstall-pluginPROGRAMS - - -%.desktop.in: %.desktop.in.in - sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@ + install-pluginLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-desktopDATA uninstall-pluginLTLIBRARIES + @INTLTOOL_DESKTOP_RULE@ +@MAINTAINER_MODE_TRUE@indicator-dialog_ui.h: indicator-dialog.glade +@MAINTAINER_MODE_TRUE@ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=indicator_dialog_ui $< >$@ + # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: # Tell versions [3.59,3.63) of GNU make to not export all variables. === modified file 'panel-plugin/indicator-box.c' --- panel-plugin/indicator-box.c 2012-05-05 15:54:41 +0000 +++ panel-plugin/indicator-box.c 2013-08-14 19:58:39 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2012 Andrzej +/* Copyright (c) 2012-2013 Andrzej * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + +/* + * This file implements a container class for holding indicator buttons. + * + */ + + + #include #include #include @@ -25,14 +34,8 @@ #include "indicator-button.h" static void xfce_indicator_box_finalize (GObject *object); -static void xfce_indicator_box_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void xfce_indicator_box_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); +static void xfce_indicator_box_list_changed (XfceIndicatorBox *box, + IndicatorConfig *config); static void xfce_indicator_box_add (GtkContainer *container, GtkWidget *child); static void xfce_indicator_box_remove (GtkContainer *container, @@ -46,14 +49,34 @@ GtkRequisition *requisition); static void xfce_indicator_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -static gint xfce_indicator_box_get_row_size (XfceIndicatorBox *box); - - -enum -{ - PROP_0, - PROP_ICON_SIZE_MAX -}; + + +struct _XfceIndicatorBox +{ + GtkContainer __parent__; + + IndicatorConfig *config; + + GHashTable *children; + + gint panel_size; + gint nrows; + gint icon_size_max; + gboolean align_left; + + GtkOrientation panel_orientation; + GtkOrientation orientation; + + gulong indicator_list_changed_id; +}; + +struct _XfceIndicatorBoxClass +{ + GtkContainerClass __parent__; +}; + + + G_DEFINE_TYPE (XfceIndicatorBox, xfce_indicator_box, GTK_TYPE_CONTAINER) @@ -66,8 +89,6 @@ gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = xfce_indicator_box_finalize; - gobject_class->get_property = xfce_indicator_box_get_property; - gobject_class->set_property = xfce_indicator_box_set_property; gtkwidget_class = GTK_WIDGET_CLASS (klass); gtkwidget_class->size_request = xfce_indicator_box_size_request; @@ -78,15 +99,6 @@ gtkcontainer_class->remove = xfce_indicator_box_remove; gtkcontainer_class->forall = xfce_indicator_box_forall; gtkcontainer_class->child_type = xfce_indicator_box_child_type; - - g_object_class_install_property (gobject_class, - PROP_ICON_SIZE_MAX, - g_param_spec_uint ("icon-size-max", - NULL, NULL, - 1, - 128, - 24, - EXO_PARAM_READWRITE)); } @@ -99,13 +111,8 @@ gtk_widget_set_can_focus(GTK_WIDGET(box), TRUE); gtk_container_set_border_width(GTK_CONTAINER(box), 0); - box->children = NULL; - - box->nrows = 1; - box->icon_size_max = 24; - box->panel_size = 16; - box->panel_orientation = GTK_ORIENTATION_HORIZONTAL; - box->orientation = GTK_ORIENTATION_HORIZONTAL; + /* todo: no deallocation function for values */ + box->children = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); } @@ -115,181 +122,115 @@ { XfceIndicatorBox *box = XFCE_INDICATOR_BOX (object); - if (box->children != NULL) + if (box->indicator_list_changed_id != 0) { - g_slist_free (box->children); - g_debug ("Not all icons have been removed from the indicator icon box."); + g_signal_handler_disconnect (box->config, box->indicator_list_changed_id); + box->indicator_list_changed_id = 0; } + g_hash_table_destroy (box->children); + G_OBJECT_CLASS (xfce_indicator_box_parent_class)->finalize (object); } -static void -xfce_indicator_box_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - XfceIndicatorBox *box = XFCE_INDICATOR_BOX (object); - GPtrArray *array; - - switch (prop_id) - { - case PROP_ICON_SIZE_MAX: - g_value_set_uint (value, box->icon_size_max); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - - - -static void -xfce_indicator_box_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - XfceIndicatorBox *box = XFCE_INDICATOR_BOX (object); - gint val; - gint size; - XfceIndicatorButton *child; - GSList *li; - - switch (prop_id) - { - case PROP_ICON_SIZE_MAX: - val = g_value_get_uint (value); - if (box->icon_size_max != val) - { - box->icon_size_max = val; - size = xfce_indicator_box_get_row_size (box); - for (li = box->children; li != NULL; li = li->next) - { - child = XFCE_INDICATOR_BUTTON (li->data); - g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (child)); - xfce_indicator_button_set_size (child, box->panel_size, size); - } - gtk_widget_queue_resize (GTK_WIDGET (box)); - } - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - - - -void -xfce_indicator_box_set_orientation (XfceIndicatorBox *box, - GtkOrientation panel_orientation, - GtkOrientation orientation) -{ - gboolean needs_update = FALSE; - XfceIndicatorButton *child; - GSList *li; - - g_return_if_fail (XFCE_IS_INDICATOR_BOX (box)); - - if (box->orientation != orientation) - { - box->orientation = orientation; - needs_update = TRUE; - } - - if (box->panel_orientation != panel_orientation) - { - box->panel_orientation = panel_orientation; - needs_update = TRUE; - } - - if (needs_update) - { - for (li = box->children; li != NULL; li = li->next) - { - child = XFCE_INDICATOR_BUTTON (li->data); - g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (child)); - xfce_indicator_button_set_orientation (child, panel_orientation, orientation); - } - gtk_widget_queue_resize (GTK_WIDGET (box)); - } -} - - - -void -xfce_indicator_box_set_size (XfceIndicatorBox *box, - gint panel_size, - gint nrows) -{ - gboolean needs_update = FALSE; - XfceIndicatorButton *child; - GSList *li; - gint size; - - g_return_if_fail (XFCE_IS_INDICATOR_BOX (box)); - - if (box->nrows != nrows) - { - box->nrows = nrows; - needs_update = TRUE; - } - - if (box->panel_size != panel_size) - { - box->panel_size = panel_size; - needs_update = TRUE; - } - - if (needs_update) - { - size = xfce_indicator_box_get_row_size (box); - for (li = box->children; li != NULL; li = li->next) - { - child = XFCE_INDICATOR_BUTTON (li->data); - g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (child)); - xfce_indicator_button_set_size (child, panel_size, size); - } - gtk_widget_queue_resize (GTK_WIDGET (box)); - } -} - - - GtkWidget * -xfce_indicator_box_new () +xfce_indicator_box_new (IndicatorConfig *config) { XfceIndicatorBox *box = g_object_new (XFCE_TYPE_INDICATOR_BOX, NULL); + + box->config = config; + + box->indicator_list_changed_id = + g_signal_connect_swapped (G_OBJECT (box->config), "indicator-list-changed", + G_CALLBACK (xfce_indicator_box_list_changed), box); + return GTK_WIDGET (box); } static void +xfce_indicator_box_list_changed (XfceIndicatorBox *box, + IndicatorConfig *config) +{ + g_return_if_fail (XFCE_IS_INDICATOR_BOX (box)); + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (config)); + + gtk_widget_queue_resize (GTK_WIDGET (box)); +} + + + +static gint +xfce_indicator_box_sort_buttons (gconstpointer a, + gconstpointer b) +{ + XfceIndicatorButton *a0 = XFCE_INDICATOR_BUTTON (a); + XfceIndicatorButton *b0 = XFCE_INDICATOR_BUTTON (b); + guint a1, b1; + const gchar *a_io; + gint result = 0; + + a1 = xfce_indicator_button_get_pos (a0); + b1 = xfce_indicator_button_get_pos (b0); + + /* only need one */ + a_io = xfce_indicator_button_get_io_name (a0); + + // printf ("=== %s, %s; %s, %s; %d, %d", xfce_indicator_button_get_io_name (a0), xfce_indicator_button_get_io_name (b0), xfce_indicator_button_get_entry (a0)->name_hint, xfce_indicator_button_get_entry (b0)->name_hint, a1, b1); + + /* special case for Application indicators (unreliable ordering) */ + /* always compare by name and ignore location field */ + if (a_io != NULL && g_strcmp0 (a_io, "libapplication.so") == 0) + result = g_strcmp0 (xfce_indicator_button_get_entry(a0)->name_hint, + xfce_indicator_button_get_entry(b0)->name_hint); + + /* group all entries with location==0 at the beginning of the list + * but don't sort them (they may depend on insertion order) */ + + if (result == 0 && (a1 != 0 || b1 != 0)) + result = a1-b1; + + /* if there are two entries with the same non-zero location + * try to resolve their order by their name_hint */ + + if (result == 0) + result = g_strcmp0 (xfce_indicator_button_get_entry(a0)->name_hint, + xfce_indicator_button_get_entry(b0)->name_hint); + + // printf (" -> %d\n", result); + return result; +} + + + +static void xfce_indicator_box_add (GtkContainer *container, GtkWidget *child) { XfceIndicatorBox *box = XFCE_INDICATOR_BOX (container); XfceIndicatorButton *button = XFCE_INDICATOR_BUTTON (child); - gint size; + GList *li; + const gchar *io_name; g_return_if_fail (XFCE_IS_INDICATOR_BOX (box)); - g_return_if_fail (GTK_IS_WIDGET (child)); + g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (button)); g_return_if_fail (child->parent == NULL); - box->children = g_slist_append (box->children, child); + io_name = xfce_indicator_button_get_io_name (button); + li = g_hash_table_lookup (box->children, io_name); + // printf (" +++ %s %s\n", io_name, xfce_indicator_button_get_entry (button)->name_hint); + if (g_strcmp0 (io_name, "libapplication.so") != 0 && + xfce_indicator_button_get_pos (button) == 0) + li = g_list_append (li, button); + else + li = g_list_insert_sorted (li, button, xfce_indicator_box_sort_buttons); + + g_hash_table_replace (box->children, g_strdup (io_name), li); gtk_widget_set_parent (child, GTK_WIDGET (box)); - xfce_indicator_button_set_orientation (button, box->panel_orientation, box->orientation); - size = xfce_indicator_box_get_row_size (box); - xfce_indicator_button_set_size (button, box->panel_size, size); gtk_widget_queue_resize (GTK_WIDGET (container)); } @@ -300,17 +241,22 @@ xfce_indicator_box_remove (GtkContainer *container, GtkWidget *child) { - XfceIndicatorBox *box = XFCE_INDICATOR_BOX (container); - GSList *li; + XfceIndicatorBox *box = XFCE_INDICATOR_BOX (container); + XfceIndicatorButton *button = XFCE_INDICATOR_BUTTON (child); + GList *li, *li_tmp; + const gchar *io_name; /* search the child */ - li = g_slist_find (box->children, child); - if (G_LIKELY (li != NULL)) + io_name = xfce_indicator_button_get_io_name (button); + li = g_hash_table_lookup (box->children, io_name); + li_tmp = g_list_find (li, child); + if (G_LIKELY (li_tmp != NULL)) { - g_assert (GTK_WIDGET (li->data) == child); + g_assert (GTK_WIDGET (li_tmp->data) == child); /* unparent widget */ - box->children = g_slist_remove_link (box->children, li); + li = g_list_remove_link (li, li_tmp); + g_hash_table_replace (box->children, g_strdup (io_name), li); gtk_widget_unparent (child); /* resize, so we update has-hidden */ @@ -327,13 +273,23 @@ gpointer callback_data) { XfceIndicatorBox *box = XFCE_INDICATOR_BOX (container); - GSList *li, *lnext; + GList *known_indicators; + GList *li, *li_int, *li_tmp; /* run callback for all children */ - for (li = box->children; li != NULL; li = lnext) - { - lnext = li->next; - (*callback) (GTK_WIDGET (li->data), callback_data); + known_indicators = indicator_config_get_known_indicators (box->config); + for (li = known_indicators; li != NULL; li = li->next) + { + li_int = g_hash_table_lookup (box->children, li->data); + for (li_tmp = li_int; li_tmp != NULL; li_tmp = li_tmp->next) + { + (*callback) (GTK_WIDGET (li_tmp->data), callback_data); + } + } + li_int = g_hash_table_lookup (box->children, ""); + for (li_tmp = li_int; li_tmp != NULL; li_tmp = li_tmp->next) + { + (*callback) (GTK_WIDGET (li_tmp->data), callback_data); } } @@ -342,8 +298,28 @@ static GType xfce_indicator_box_child_type (GtkContainer *container) { - return GTK_TYPE_WIDGET; -} + return XFCE_TYPE_INDICATOR_BUTTON; +} + + + +static gint +xfce_indicator_box_get_row_size (XfceIndicatorBox *box) +{ + gint border_thickness; + GtkStyle *style; + + g_return_val_if_fail (XFCE_IS_INDICATOR_BOX (box), 24); + + style = gtk_widget_get_style (GTK_WIDGET (box)); + border_thickness = 2 * MAX (style->xthickness, style->ythickness) + 2; + + return MIN (indicator_config_get_panel_size (box->config) / + indicator_config_get_nrows (box->config), + indicator_config_get_icon_size_max (box->config) + border_thickness); +} + + @@ -351,59 +327,67 @@ xfce_indicator_box_size_request (GtkWidget *widget, GtkRequisition *requisition) { - XfceIndicatorBox *box = XFCE_INDICATOR_BOX (widget); - GtkWidget *child; - GtkRequisition child_req; - GSList *li; - gint panel_size; - gint length; - gint row; - gint nrows; - gint x; - gboolean has_label; + XfceIndicatorBox *box = XFCE_INDICATOR_BOX (widget); + XfceIndicatorButton *button; + GtkRequisition child_req; + GList *known_indicators, *li, *li_int, *li_tmp; + gint panel_size; + gint length; + gint row; + gint nrows; + gint x; + gboolean has_label, rectangular_icon; + GtkOrientation panel_orientation; - panel_size = box->panel_size; + panel_size = indicator_config_get_panel_size (box->config); + panel_orientation = indicator_config_get_panel_orientation (box->config); row = 0; length = 0; x = 0; - //nrows = MAX (box->nrows, - // box->panel_size / xfce_indicator_box_get_row_size (box)); - nrows = box->panel_size / xfce_indicator_box_get_row_size (box); + nrows = panel_size / xfce_indicator_box_get_row_size (box); - for (li = box->children; li != NULL; li = li->next) + if (g_hash_table_lookup (box->children, "") != NULL) + known_indicators = g_list_append (NULL, ""); + else + known_indicators = indicator_config_get_known_indicators (box->config); + for (li = known_indicators; li != NULL; li = li->next) { - child = GTK_WIDGET (li->data); - g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (child)); - - gtk_widget_size_request (child, &child_req); - has_label = (xfce_indicator_button_get_label (XFCE_INDICATOR_BUTTON (child)) != NULL); - - /* wrap rows if column is overflowing or a label is encountered */ - if (row > 0 && (has_label || row >= nrows)) - { - x += length; - row = 0; - length = 0; - } - - length = - MAX (length, (box->panel_orientation == GTK_ORIENTATION_HORIZONTAL) ? child_req.width :child_req.height); - - if (has_label || row >= nrows) - { - x += length; - row = 0; - length = 0; - } - else - { - row += 1; + li_int = g_hash_table_lookup (box->children, li->data); + for (li_tmp = li_int; li_tmp != NULL; li_tmp = li_tmp->next) + { + button = XFCE_INDICATOR_BUTTON (li_tmp->data); + + gtk_widget_size_request (GTK_WIDGET (button), &child_req); + has_label = (xfce_indicator_button_get_label (button) != NULL); + rectangular_icon = xfce_indicator_button_is_icon_rectangular (button); + + /* wrap rows if column is overflowing or a label is encountered */ + if (row > 0 && (has_label || row >= nrows || rectangular_icon)) + { + x += length; + row = 0; + length = 0; + } + + length = + MAX (length, (panel_orientation == GTK_ORIENTATION_HORIZONTAL) ? child_req.width :child_req.height); + + if (has_label || row >= nrows || rectangular_icon) + { + x += length; + row = 0; + length = 0; + } + else + { + row += 1; + } } } x += length; - if (box->panel_orientation == GTK_ORIENTATION_HORIZONTAL) + if (panel_orientation == GTK_ORIENTATION_HORIZONTAL) { requisition->width = x; requisition->height = panel_size; @@ -422,18 +406,19 @@ xfce_indicator_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { - XfceIndicatorBox *box = XFCE_INDICATOR_BOX (widget); - GtkWidget *child; - GtkAllocation child_alloc; - GtkRequisition child_req; - gint panel_size, size; - gint x, y; - gint x0, y0; - GSList *li; - gint length, width; - gint row; - gint nrows; - gboolean has_label; + XfceIndicatorBox *box = XFCE_INDICATOR_BOX (widget); + XfceIndicatorButton *button; + GtkAllocation child_alloc; + GtkRequisition child_req; + gint panel_size, size; + gint x, y; + gint x0, y0; + GList *known_indicators, *li, *li_int, *li_tmp; + gint length, width; + gint row; + gint nrows; + gboolean has_label, rectangular_icon; + GtkOrientation panel_orientation; row = 0; length = 0; @@ -442,80 +427,101 @@ x0 = allocation->x; y0 = allocation->y; - //nrows = MAX (box->nrows, box->panel_size / box->icon_size_max); - nrows = box->panel_size / xfce_indicator_box_get_row_size (box); - panel_size = box->panel_size; + panel_size = indicator_config_get_panel_size (box->config); + panel_orientation = indicator_config_get_panel_orientation (box->config); + nrows = panel_size / xfce_indicator_box_get_row_size (box); size = panel_size / nrows; - for (li = box->children; li != NULL; li = li->next) + if (g_hash_table_lookup (box->children, "") != NULL) + known_indicators = g_list_append (NULL, ""); + else + known_indicators = indicator_config_get_known_indicators (box->config); + for (li = known_indicators; li != NULL; li = li->next) { - child = GTK_WIDGET (li->data); - g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (child)); - - gtk_widget_get_child_requisition (child, &child_req); - - has_label = (xfce_indicator_button_get_label (XFCE_INDICATOR_BUTTON (child)) != NULL); - - /* wrap rows if column is overflowing or a label is encountered */ - if (row > 0 && (has_label || row >= nrows)) - { - x += length; - y = 0; - row = 0; - length = 0; - } - - width = (has_label) ? panel_size : size; - length = MAX (length, - (box->panel_orientation == GTK_ORIENTATION_HORIZONTAL) ? child_req.width :child_req.height); - - if (box->panel_orientation == GTK_ORIENTATION_HORIZONTAL) - { - child_alloc.x = x0 + x; - child_alloc.y = y0 + y; - child_alloc.width = length; - child_alloc.height = width; - } - else - { - child_alloc.x = x0 + y; - child_alloc.y = y0 + x; - child_alloc.width = width; - child_alloc.height = length; - } - - /* g_debug ("indicator-box size allocate: x=%d y=%d w=%d h=%d", */ - /* child_alloc.x, child_alloc.y, child_alloc.width, child_alloc.height); */ - - gtk_widget_size_allocate (child, &child_alloc); - - if (has_label || row >= nrows) - { - x += length; - y = 0; - row = 0; - length = 0; - } - else - { - row += 1; - y += size; + li_int = g_hash_table_lookup (box->children, li->data); + for (li_tmp = li_int; li_tmp != NULL; li_tmp = li_tmp->next) + { + button = XFCE_INDICATOR_BUTTON (li_tmp->data); + + gtk_widget_get_child_requisition (GTK_WIDGET (button), &child_req); + + has_label = (xfce_indicator_button_get_label (button) != NULL); + rectangular_icon = xfce_indicator_button_is_icon_rectangular (button); + + /* wrap rows if column is overflowing or a label is encountered */ + if (row > 0 && (has_label || row >= nrows || rectangular_icon)) + { + x += length; + y = 0; + row = 0; + length = 0; + } + + width = (has_label || rectangular_icon) ? panel_size : size; + length = MAX (length, + (panel_orientation == GTK_ORIENTATION_HORIZONTAL) ? child_req.width :child_req.height); + + if (panel_orientation == GTK_ORIENTATION_HORIZONTAL) + { + child_alloc.x = x0 + x; + child_alloc.y = y0 + y; + child_alloc.width = length; + child_alloc.height = width; + } + else + { + child_alloc.x = x0 + y; + child_alloc.y = y0 + x; + child_alloc.width = width; + child_alloc.height = length; + } + + /* g_debug ("indicator-box size allocate: x=%d y=%d w=%d h=%d", */ + /* child_alloc.x, child_alloc.y, child_alloc.width, child_alloc.height); */ + + gtk_widget_size_allocate (GTK_WIDGET (button), &child_alloc); + + if (has_label || row >= nrows || rectangular_icon) + { + x += length; + y = 0; + row = 0; + length = 0; + } + else + { + row += 1; + y += size; + } } } } -static gint -xfce_indicator_box_get_row_size (XfceIndicatorBox *box) +void +xfce_indicator_box_remove_entry (XfceIndicatorBox *box, + IndicatorObjectEntry *entry) { - gint border_thickness; - GtkStyle *style; - - g_return_val_if_fail (XFCE_IS_INDICATOR_BOX (box), 24); - - style = gtk_widget_get_style (GTK_WIDGET (box)); - border_thickness = 2 * MAX (style->xthickness, style->ythickness) + 2; - - return MIN (box->panel_size / box->nrows, box->icon_size_max + border_thickness); + GList *known_indicators, *li, *li_int, *li_tmp; + XfceIndicatorButton *button; + + g_return_if_fail (XFCE_IS_INDICATOR_BOX (box)); + + known_indicators = indicator_config_get_known_indicators (box->config); + for (li = known_indicators; li != NULL; li = li->next) + { + li_int = g_hash_table_lookup (box->children, li->data); + for (li_tmp = li_int; li_tmp != NULL; li_tmp = li_tmp->next) + { + button = XFCE_INDICATOR_BUTTON (li_tmp->data); + if (xfce_indicator_button_get_entry (button) == entry) + { + xfce_indicator_button_disconnect_signals (button); + gtk_widget_destroy (GTK_WIDGET (button)); + return; + } + } + } } + === modified file 'panel-plugin/indicator-box.h' --- panel-plugin/indicator-box.h 2012-05-05 15:54:41 +0000 +++ panel-plugin/indicator-box.h 2013-08-14 19:58:39 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2012 Andrzej +/* Copyright (c) 2012-2013 Andrzej * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,6 +18,12 @@ #ifndef __INDICATOR_BOX_H__ #define __INDICATOR_BOX_H__ +#include +#include +#include +#include +#include "indicator-config.h" + G_BEGIN_DECLS GType xfce_indicator_box_get_type (void); @@ -32,34 +38,10 @@ typedef struct _XfceIndicatorBox XfceIndicatorBox; typedef struct _XfceIndicatorBoxClass XfceIndicatorBoxClass; -struct _XfceIndicatorBox -{ - GtkContainer __parent__; - - GSList *children; - - gint panel_size; - gint nrows; - gint icon_size_max; - - GtkOrientation panel_orientation; - GtkOrientation orientation; -}; - -struct _XfceIndicatorBoxClass -{ - GtkContainerClass __parent__; -}; - -void xfce_indicator_box_set_orientation (XfceIndicatorBox *button, - GtkOrientation panel_orientation, - GtkOrientation orientation); - -void xfce_indicator_box_set_size (XfceIndicatorBox *button, - gint panel_size, - gint nrows); - -GtkWidget *xfce_indicator_box_new (); +void xfce_indicator_box_remove_entry (XfceIndicatorBox *box, + IndicatorObjectEntry *entry); + +GtkWidget *xfce_indicator_box_new (IndicatorConfig *config); G_END_DECLS === modified file 'panel-plugin/indicator-button.c' --- panel-plugin/indicator-button.c 2012-05-05 15:54:41 +0000 +++ panel-plugin/indicator-button.c 2013-08-14 19:58:39 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2012 Andrzej +/* Copyright (c) 2012-2013 Andrzej * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +15,16 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + +/* + * This file implements an indicator button class corresponding to + * a single indicator object entry. + * + */ + + + #include #include #include @@ -22,7 +32,53 @@ #include "indicator-button.h" -static void xfce_indicator_button_finalize (GObject *object); + +#include +//#ifndef INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED +//#define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED "scroll-entry" +//#endif + + +static void xfce_indicator_button_finalize (GObject *object); +static gint xfce_indicator_button_get_icon_size (XfceIndicatorButton *button); +static gboolean xfce_indicator_button_button_press (GtkWidget *widget, + GdkEventButton *event); +static gboolean xfce_indicator_button_scroll (GtkWidget *widget, + GdkEventScroll *event); +static void xfce_indicator_button_menu_deactivate (XfceIndicatorButton *button, + GtkMenu *menu); +static gint xfce_indicator_button_get_size (XfceIndicatorButton *button); + + + +struct _XfceIndicatorButton +{ + GtkToggleButton __parent__; + + IndicatorObject *io; + const gchar *io_name; + IndicatorObjectEntry *entry; + GtkMenu *menu; + XfcePanelPlugin *plugin; + IndicatorConfig *config; + + GtkWidget *align_box; + GtkWidget *box; + GtkWidget *label; + GtkWidget *icon; + GtkWidget *orig_icon; + gboolean rectangular_icon; + + gulong orig_icon_changed_id; + gulong configuration_changed_id; +}; + +struct _XfceIndicatorButtonClass +{ + GtkToggleButtonClass __parent__; +}; + + G_DEFINE_TYPE (XfceIndicatorButton, xfce_indicator_button, GTK_TYPE_TOGGLE_BUTTON) @@ -30,10 +86,16 @@ static void xfce_indicator_button_class_init (XfceIndicatorButtonClass *klass) { - GObjectClass *gobject_class; + GObjectClass *gobject_class; + GtkWidgetClass *widget_class; gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = xfce_indicator_button_finalize; + + widget_class = GTK_WIDGET_CLASS (klass); + widget_class->button_press_event = xfce_indicator_button_button_press; + widget_class->scroll_event = xfce_indicator_button_scroll; + } @@ -41,8 +103,6 @@ static void xfce_indicator_button_init (XfceIndicatorButton *button) { - GtkWidget *outer_container; - GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (button), GTK_CAN_DEFAULT | GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_button_set_use_underline (GTK_BUTTON (button),TRUE); @@ -51,27 +111,23 @@ button->io = NULL; button->entry = NULL; + button->plugin = NULL; + button->config = NULL; button->menu = NULL; button->label = NULL; button->orig_icon = NULL; button->icon = NULL; - button->orig_icon_handler = 0; - - button->size = 0; - button->panel_size = 0; - button->icon_size = 24; - button->panel_orientation = GTK_ORIENTATION_HORIZONTAL; - button->orientation = GTK_ORIENTATION_HORIZONTAL; - - outer_container = gtk_table_new (1, 1, FALSE); - gtk_container_add (GTK_CONTAINER (button), outer_container); - gtk_widget_show (outer_container); - - button->box = xfce_hvbox_new (button->orientation, FALSE, 1); - gtk_table_attach (GTK_TABLE (outer_container), button->box, - 0, 1, 0, 1, - GTK_EXPAND | GTK_SHRINK, GTK_EXPAND | GTK_SHRINK, 0, 0); + button->orig_icon_changed_id = 0; + button->configuration_changed_id = 0; + button->rectangular_icon = FALSE; + + button->align_box = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); + gtk_container_add (GTK_CONTAINER (button), button->align_box); + gtk_widget_show (button->align_box); + + button->box = xfce_hvbox_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 1); + gtk_container_add (GTK_CONTAINER (button->align_box), button->box); gtk_widget_show (button->box); } @@ -82,6 +138,8 @@ { XfceIndicatorButton *button = XFCE_INDICATOR_BUTTON (object); + xfce_indicator_button_disconnect_signals (button); + if (button->label != NULL) g_object_unref (G_OBJECT (button->label)); if (button->orig_icon != NULL) @@ -105,45 +163,78 @@ xfce_indicator_button_update_layout (XfceIndicatorButton *button) { GtkRequisition label_size; + gfloat align_x; g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (button)); - if (button->icon != NULL && button->size != 0) - { - if (button->label != NULL && - button->panel_orientation == GTK_ORIENTATION_VERTICAL && - button->orientation == GTK_ORIENTATION_HORIZONTAL) - { - gtk_widget_size_request (button->label, &label_size); - - /* put icon above the label if number of rows > 1 (they look better) - or if they don't fit when arranged horizontally */ - if (button->panel_size != button->size || - label_size.width > button->panel_size - button->size) - gtk_orientable_set_orientation (GTK_ORIENTABLE (button->box), GTK_ORIENTATION_VERTICAL); - else - gtk_orientable_set_orientation (GTK_ORIENTABLE (button->box), GTK_ORIENTATION_HORIZONTAL); - } - - xfce_panel_image_set_size (XFCE_PANEL_IMAGE (button->icon), button->icon_size); - } + if (button->label != NULL) + gtk_label_set_ellipsize (GTK_LABEL (button->label), PANGO_ELLIPSIZE_NONE); + + /* deskbar mode? */ + if (button->label != NULL && + indicator_config_get_panel_orientation (button->config) == GTK_ORIENTATION_VERTICAL && + indicator_config_get_orientation (button->config) == GTK_ORIENTATION_HORIZONTAL) + { + gtk_widget_size_request (button->label, &label_size); + + /* check if icon and label fit side by side */ + if (!indicator_config_get_align_left (button->config) + || (button->icon != NULL + && label_size.width > + indicator_config_get_panel_size (button->config) + - xfce_indicator_button_get_size (button))) + { + align_x = 0.5; + gtk_orientable_set_orientation (GTK_ORIENTABLE (button->box), GTK_ORIENTATION_VERTICAL); + } + else + { + align_x = 0.0; + gtk_orientable_set_orientation (GTK_ORIENTABLE (button->box), GTK_ORIENTATION_HORIZONTAL); + } + + /* check if label alone fits in the panel */ + if (label_size.width > indicator_config_get_panel_size (button->config) - 6) + { + gtk_alignment_set (GTK_ALIGNMENT (button->align_box), align_x, 0.5, 1.0, 0.0); + gtk_label_set_ellipsize (GTK_LABEL (button->label), PANGO_ELLIPSIZE_END); + } + else + { + gtk_alignment_set (GTK_ALIGNMENT (button->align_box), align_x, 0.5, 0.0, 0.0); + } + } + else + { + gtk_alignment_set (GTK_ALIGNMENT (button->align_box), 0.5, 0.5, 0.0, 0.0); + gtk_orientable_set_orientation (GTK_ORIENTABLE (button->box), + indicator_config_get_orientation (button->config)); + } + + + if (button->label != NULL) + gtk_label_set_angle (GTK_LABEL (button->label), + (indicator_config_get_orientation (button->config) == GTK_ORIENTATION_VERTICAL) + ? -90 : 0); } + static void xfce_indicator_button_update_icon (XfceIndicatorButton *button) { GdkPixbuf *pixbuf_s, *pixbuf_d; gdouble aspect; - gint size; + gint w, h, size; + gint border_thickness; + GtkStyle *style; g_return_if_fail (GTK_IS_IMAGE (button->orig_icon)); - g_return_if_fail (XFCE_IS_PANEL_IMAGE (button->icon)); - - size = button->icon_size; - - /* Copied from xfce_panel_image.c, try to snap to icon sizes, which minimize smoothing */ + g_return_if_fail (GTK_IS_IMAGE (button->icon)); + + size = xfce_indicator_button_get_icon_size (button); + #if 0 if (size > 16 && size < 22) size = 16; @@ -157,24 +248,44 @@ if (pixbuf_s != NULL) { - aspect = (gdouble) gdk_pixbuf_get_width (pixbuf_s) / - (gdouble) gdk_pixbuf_get_height (pixbuf_s); - if (aspect > 1.0) - pixbuf_d = gdk_pixbuf_scale_simple - (pixbuf_s, size, (gint) (size / aspect), - GDK_INTERP_BILINEAR); + w = gdk_pixbuf_get_width (pixbuf_s); + h = gdk_pixbuf_get_height (pixbuf_s); + aspect = (gdouble) w / (gdouble) h; + + button->rectangular_icon = (w != h); + + if (indicator_config_get_panel_orientation (button->config) == GTK_ORIENTATION_VERTICAL && + size * aspect > indicator_config_get_panel_size (button->config)) + { + style = gtk_widget_get_style (GTK_WIDGET (button->plugin)); + border_thickness = 2 * MAX (style->xthickness, style->ythickness); + w = indicator_config_get_panel_size (button->config) - border_thickness; + h = (gint) (w / aspect); + } else - pixbuf_d = gdk_pixbuf_scale_simple - (pixbuf_s, (gint) (size * aspect), size, - GDK_INTERP_BILINEAR); - xfce_panel_image_set_from_pixbuf (XFCE_PANEL_IMAGE (button->icon), pixbuf_d); + { + h = size; + w = (gint) (h * aspect); + } + pixbuf_d = gdk_pixbuf_scale_simple (pixbuf_s, w, h, GDK_INTERP_BILINEAR); + gtk_image_set_from_pixbuf (GTK_IMAGE (button->icon), pixbuf_d); + g_object_unref (G_OBJECT (pixbuf_d)); } else { - xfce_panel_image_set_from_source (XFCE_PANEL_IMAGE (button->icon), "image-missing"); + gtk_image_set_from_icon_name (GTK_IMAGE (button->icon), + "image-missing", GTK_ICON_SIZE_MENU); } - - xfce_panel_image_set_size (XFCE_PANEL_IMAGE (button->icon), button->icon_size); +} + + + +static void +xfce_indicator_button_label_changed (GtkLabel *label, + GParamSpec *pspec, + XfceIndicatorButton *button) +{ + xfce_indicator_button_update_layout (button); } @@ -196,9 +307,8 @@ button->label = GTK_WIDGET (label); g_object_ref (G_OBJECT (button->label)); - gtk_label_set_angle (GTK_LABEL (button->label), - (button->orientation == GTK_ORIENTATION_VERTICAL) ? -90 : 0); gtk_box_pack_end (GTK_BOX (button->box), button->label, TRUE, FALSE, 1); + g_signal_connect(G_OBJECT(button->label), "notify::label", G_CALLBACK(xfce_indicator_button_label_changed), button); } xfce_indicator_button_update_layout (button); } @@ -209,11 +319,9 @@ static void on_pixbuf_changed (GtkImage *image, GParamSpec *pspec, XfceIndicatorButton *button) { - GdkPixbuf *pixbuf; - g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (button)); g_return_if_fail (GTK_IS_IMAGE (image)); - g_return_if_fail (XFCE_IS_PANEL_IMAGE (button->icon)); + g_return_if_fail (GTK_IS_IMAGE (button->icon)); xfce_indicator_button_update_icon (button); } @@ -224,8 +332,6 @@ xfce_indicator_button_set_image (XfceIndicatorButton *button, GtkImage *image) { - GdkPixbuf *pixbuf; - g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (button)); g_return_if_fail (GTK_IS_IMAGE (image)); @@ -235,8 +341,11 @@ { if (button->orig_icon != NULL) { - g_signal_handler_disconnect - (G_OBJECT (button->orig_icon), button->orig_icon_handler); + if (button->orig_icon_changed_id != 0) + { + g_signal_handler_disconnect (G_OBJECT (button->orig_icon), button->orig_icon_changed_id); + button->orig_icon_changed_id = 0; + } g_object_unref (G_OBJECT (button->orig_icon)); } @@ -249,11 +358,10 @@ button->orig_icon = GTK_WIDGET (image); g_object_ref (G_OBJECT (button->orig_icon)); - button->orig_icon_handler = g_signal_connect + button->orig_icon_changed_id = g_signal_connect (G_OBJECT (image), "notify::pixbuf", G_CALLBACK (on_pixbuf_changed), button); - - button->icon = xfce_panel_image_new (); + button->icon = gtk_image_new (); xfce_indicator_button_update_icon (button); gtk_box_pack_start (GTK_BOX (button->box), button->icon, TRUE, FALSE, 1); @@ -278,6 +386,8 @@ g_object_unref (G_OBJECT (button->menu)); button->menu = menu; g_object_ref (G_OBJECT (button->menu)); + g_signal_connect_swapped (G_OBJECT (button->menu), "deactivate", + G_CALLBACK (xfce_indicator_button_menu_deactivate), button); gtk_menu_attach_to_widget(menu, GTK_WIDGET (button), NULL); } } @@ -324,6 +434,30 @@ +const gchar * +xfce_indicator_button_get_io_name (XfceIndicatorButton *button) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_BUTTON (button), NULL); + + return button->io_name; +} + + + +guint +xfce_indicator_button_get_pos (XfceIndicatorButton *button) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_BUTTON (button), 0); + + return indicator_object_get_location (button->io, button->entry); +} + + + + + + + GtkMenu * xfce_indicator_button_get_menu (XfceIndicatorButton *button) { @@ -334,92 +468,167 @@ -void -xfce_indicator_button_set_orientation (XfceIndicatorButton *button, - GtkOrientation panel_orientation, - GtkOrientation orientation) -{ - gboolean needs_update = FALSE; - - g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (button)); - - if (button->orientation != orientation) - { - button->orientation = orientation; - - if (button->label != NULL) - gtk_label_set_angle (GTK_LABEL (button->label), - (orientation == GTK_ORIENTATION_VERTICAL) ? -90 : 0); - needs_update = TRUE; - } - - if (button->panel_orientation != panel_orientation) - { - button->panel_orientation = panel_orientation; - needs_update = TRUE; - } - - if (needs_update) - { - gtk_orientable_set_orientation (GTK_ORIENTABLE (button->box), orientation); - xfce_indicator_button_update_layout (button); - } -} - - - -void -xfce_indicator_button_set_size (XfceIndicatorButton *button, - gint panel_size, - gint size) -{ - gboolean needs_update = FALSE; - gint border_thickness; - GtkStyle *style; - gdouble aspect; - - g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (button)); - - if (button->size != size) - { - button->size = size; - needs_update = TRUE; - } - - if (button->panel_size != panel_size) - { - button->panel_size = panel_size; - needs_update = TRUE; - } - - if (needs_update) - { - style = gtk_widget_get_style (GTK_WIDGET (button)); - border_thickness = 2 * MAX (style->xthickness, style->ythickness) + 2; - button->icon_size = button->size - border_thickness; - - if (button->orig_icon != NULL) - { - xfce_indicator_button_update_icon (button); - xfce_indicator_button_update_layout (button); - } - } + + +gboolean +xfce_indicator_button_is_icon_rectangular (XfceIndicatorButton *button) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_BUTTON (button), FALSE); + + return button->rectangular_icon; +} + + + + +static gint +xfce_indicator_button_get_icon_size (XfceIndicatorButton *button) +{ + gint indicator_size; + gint border_thickness; + GtkStyle *style; + + g_return_val_if_fail (XFCE_IS_INDICATOR_BUTTON (button), 22); + + indicator_size = xfce_indicator_button_get_size (button); + + style = gtk_widget_get_style (GTK_WIDGET (button->plugin)); + border_thickness = 2 * MAX (style->xthickness, style->ythickness); + + return MIN (indicator_size - border_thickness, + indicator_config_get_icon_size_max (button->config)); +} + + + +static gint +xfce_indicator_button_get_size (XfceIndicatorButton *button) +{ + gint border_thickness; + GtkStyle *style; + + g_return_val_if_fail (XFCE_IS_INDICATOR_BUTTON (button), 24); + + style = gtk_widget_get_style (GTK_WIDGET (button->plugin)); + border_thickness = 2 * MAX (style->xthickness, style->ythickness) ; + + return MIN (indicator_config_get_panel_size (button->config) / + indicator_config_get_nrows (button->config), + indicator_config_get_icon_size_max (button->config) + border_thickness); +} + + + + +static void +xfce_indicator_configuration_changed (XfceIndicatorButton *button, + IndicatorConfig *config) +{ + g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (button)); + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (config)); + g_return_if_fail (GTK_WIDGET (button)->parent != NULL); + + if (button->orig_icon != NULL) + xfce_indicator_button_update_icon (button); + xfce_indicator_button_update_layout (button); } GtkWidget * -xfce_indicator_button_new (IndicatorObject *io, - IndicatorObjectEntry *entry) +xfce_indicator_button_new (IndicatorObject *io, + const gchar *io_name, + IndicatorObjectEntry *entry, + XfcePanelPlugin *plugin, + IndicatorConfig *config) { XfceIndicatorButton *button = g_object_new (XFCE_TYPE_INDICATOR_BUTTON, NULL); + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), NULL); + g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), NULL); + button->io = io; + button->io_name = io_name; button->entry = entry; + button->plugin = plugin; + button->config = config; + if (button->io != NULL) g_object_ref (G_OBJECT (button->io)); /* IndicatorObjectEntry is not GObject */ /* g_object_ref (G_OBJECT (button->entry)); */ + + button->configuration_changed_id = + g_signal_connect_swapped (G_OBJECT (button->config), "configuration-changed", + G_CALLBACK (xfce_indicator_configuration_changed), button); + return GTK_WIDGET (button); } + +void +xfce_indicator_button_disconnect_signals (XfceIndicatorButton *button) +{ + g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (button)); + + if (button->menu != 0) + { + gtk_menu_popdown (button->menu); + } + + if (button->configuration_changed_id != 0) + { + g_signal_handler_disconnect (button->config, button->configuration_changed_id); + button->configuration_changed_id = 0; + } + + if (button->orig_icon_changed_id != 0) + { + g_signal_handler_disconnect (G_OBJECT (button->orig_icon), button->orig_icon_changed_id); + button->orig_icon_changed_id = 0; + } + +} + + +static gboolean +xfce_indicator_button_button_press (GtkWidget *widget, + GdkEventButton *event) +{ + XfceIndicatorButton *button = XFCE_INDICATOR_BUTTON (widget); + + if(event->button == 1 && button->menu != NULL) /* left click only */ + { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),TRUE); + gtk_menu_reposition (GTK_MENU (button->menu)); + gtk_menu_popup (button->menu, NULL, NULL, + xfce_panel_plugin_position_menu, button->plugin, + event->button, event->time); + return TRUE; + } + + return FALSE; +} + + +static gboolean +xfce_indicator_button_scroll (GtkWidget *widget, GdkEventScroll *event) +{ + XfceIndicatorButton *button = XFCE_INDICATOR_BUTTON (widget); + + g_signal_emit_by_name (button->io, INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, + button->entry, 1, event->direction); + + return TRUE; +} + + +static void +xfce_indicator_button_menu_deactivate (XfceIndicatorButton *button, + GtkMenu *menu) +{ + g_return_if_fail (XFCE_IS_INDICATOR_BUTTON (button)); + g_return_if_fail (GTK_IS_MENU (menu)); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE); +} === modified file 'panel-plugin/indicator-button.h' --- panel-plugin/indicator-button.h 2012-05-05 15:54:41 +0000 +++ panel-plugin/indicator-button.h 2013-08-14 19:58:39 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2012 Andrzej +/* Copyright (c) 2012-2013 Andrzej * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,6 +18,13 @@ #ifndef __INDICATOR_BUTTON_H__ #define __INDICATOR_BUTTON_H__ +#include +#include +#include + +#include "indicator-config.h" +#include "indicator-box.h" + G_BEGIN_DECLS GType xfce_indicator_button_get_type (void); @@ -29,61 +36,42 @@ #define XFCE_IS_INDICATOR_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), XFCE_TYPE_INDICATOR_BUTTON)) #define XFCE_INDICATOR_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), XFCE_TYPE_INDICATOR_BUTTON, XfceIndicatorButtonClass)) -typedef struct _XfceIndicatorButton XfceIndicatorButton; -typedef struct _XfceIndicatorButtonClass XfceIndicatorButtonClass; - -struct _XfceIndicatorButton -{ - GtkToggleButton __parent__; - - IndicatorObject *io; - IndicatorObjectEntry *entry; - GtkMenu *menu; - - GtkWidget *box; - GtkWidget *label; - GtkWidget *icon; - GtkWidget *orig_icon; - gulong orig_icon_handler; - - gint panel_size; - gint size; - gint icon_size; - - GtkOrientation panel_orientation; - GtkOrientation orientation; -}; - -struct _XfceIndicatorButtonClass -{ - GtkToggleButtonClass __parent__; -}; - -void xfce_indicator_button_set_label (XfceIndicatorButton *button, GtkLabel *label); - -void xfce_indicator_button_set_image (XfceIndicatorButton *button, GtkImage *image); - -void xfce_indicator_button_set_menu (XfceIndicatorButton *button, GtkMenu *menu); - -GtkWidget *xfce_indicator_button_get_label (XfceIndicatorButton *button); - -GtkWidget *xfce_indicator_button_get_image (XfceIndicatorButton *button); - -IndicatorObjectEntry *xfce_indicator_button_get_entry (XfceIndicatorButton *button); - -IndicatorObject *xfce_indicator_button_get_io (XfceIndicatorButton *button); - -GtkMenu *xfce_indicator_button_get_menu (XfceIndicatorButton *button); - -void xfce_indicator_button_set_orientation (XfceIndicatorButton *button, - GtkOrientation panel_orientation, - GtkOrientation orientation); - -void xfce_indicator_button_set_size (XfceIndicatorButton *button, - gint panel_size, - gint size); - -GtkWidget *xfce_indicator_button_new (IndicatorObject *io, IndicatorObjectEntry *entry); +typedef struct _XfceIndicatorButton XfceIndicatorButton; +typedef struct _XfceIndicatorButtonClass XfceIndicatorButtonClass; + + +void xfce_indicator_button_set_label (XfceIndicatorButton *button, + GtkLabel *label); + +void xfce_indicator_button_set_image (XfceIndicatorButton *button, + GtkImage *image); + +void xfce_indicator_button_set_menu (XfceIndicatorButton *button, + GtkMenu *menu); + +GtkWidget *xfce_indicator_button_get_label (XfceIndicatorButton *button); + +GtkWidget *xfce_indicator_button_get_image (XfceIndicatorButton *button); + +IndicatorObjectEntry *xfce_indicator_button_get_entry (XfceIndicatorButton *button); + +IndicatorObject *xfce_indicator_button_get_io (XfceIndicatorButton *button); + +const gchar *xfce_indicator_button_get_io_name (XfceIndicatorButton *button); + +guint xfce_indicator_button_get_pos (XfceIndicatorButton *button); + +GtkMenu *xfce_indicator_button_get_menu (XfceIndicatorButton *button); + +gboolean xfce_indicator_button_is_icon_rectangular (XfceIndicatorButton *button); + +GtkWidget *xfce_indicator_button_new (IndicatorObject *io, + const gchar *io_name, + IndicatorObjectEntry *entry, + XfcePanelPlugin *plugin, + IndicatorConfig *config); + +void xfce_indicator_button_disconnect_signals (XfceIndicatorButton *button); G_END_DECLS === added file 'panel-plugin/indicator-config.c' --- panel-plugin/indicator-config.c 1970-01-01 00:00:00 +0000 +++ panel-plugin/indicator-config.c 2013-08-14 19:58:39 +0000 @@ -0,0 +1,781 @@ +/* + * Copyright (C) 2013 Andrzej + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + + +/* + * This file implements a configuration store. The class extends GObject. + * + */ + + + +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef HAVE_STRING_H +#include +#endif + +#include +#include +#include +#include +#include + +#include "indicator.h" +#include "indicator-config.h" + + + + +#define DEFAULT_ICON_SIZE_MAX 22 +#define DEFAULT_ALIGN_LEFT FALSE +#define DEFAULT_EXCLUDED_MODULES NULL +#define DEFAULT_ORIENTATION GTK_ORIENTATION_HORIZONTAL +#define DEFAULT_PANEL_ORIENTATION GTK_ORIENTATION_HORIZONTAL +#define DEFAULT_PANEL_SIZE 28 +#define DEFAULT_MODE_WHITELIST FALSE + + + + +static void indicator_config_finalize (GObject *object); +static void indicator_config_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void indicator_config_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); + + + +struct _IndicatorConfigClass +{ + GObjectClass __parent__; +}; + +struct _IndicatorConfig +{ + GObject __parent__; + + gint icon_size_max; + gboolean align_left; + gboolean mode_whitelist; + GHashTable *blacklist; + GHashTable *whitelist; + GList *known_indicators; + + gchar **excluded_modules; + + /* not xfconf properties but it is still convenient to have them here */ + GtkOrientation orientation; + GtkOrientation panel_orientation; + gint nrows; + gint panel_size; +}; + + + +enum +{ + PROP_0, + PROP_ICON_SIZE_MAX, + PROP_ALIGN_LEFT, + PROP_MODE_WHITELIST, + PROP_BLACKLIST, + PROP_WHITELIST, + PROP_KNOWN_INDICATORS +}; + +enum +{ + CONFIGURATION_CHANGED, + INDICATOR_LIST_CHANGED, + LAST_SIGNAL +}; + +static guint indicator_config_signals[LAST_SIGNAL] = { 0, }; + + + + +G_DEFINE_TYPE (IndicatorConfig, indicator_config, G_TYPE_OBJECT) + + + + +GType +indicator_config_value_array_get_type (void) +{ + static volatile gsize type__volatile = 0; + GType type; + + if (g_once_init_enter (&type__volatile)) + { + type = dbus_g_type_get_collection ("GPtrArray", G_TYPE_VALUE); + g_once_init_leave (&type__volatile, type); + } + + return type__volatile; +} + + +static void +indicator_config_class_init (IndicatorConfigClass *klass) +{ + GObjectClass *gobject_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = indicator_config_finalize; + gobject_class->get_property = indicator_config_get_property; + gobject_class->set_property = indicator_config_set_property; + + g_object_class_install_property (gobject_class, + PROP_ICON_SIZE_MAX, + g_param_spec_uint ("icon-size-max", + NULL, NULL, + 1, + 128, + DEFAULT_ICON_SIZE_MAX, + EXO_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_ALIGN_LEFT, + g_param_spec_boolean ("align-left", NULL, NULL, + DEFAULT_ALIGN_LEFT, + EXO_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_MODE_WHITELIST, + g_param_spec_boolean ("mode-whitelist", NULL, NULL, + DEFAULT_MODE_WHITELIST, + EXO_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_BLACKLIST, + g_param_spec_boxed ("blacklist", + NULL, NULL, + XFCE_TYPE_INDICATOR_CONFIG_VALUE_ARRAY, + EXO_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_WHITELIST, + g_param_spec_boxed ("whitelist", + NULL, NULL, + XFCE_TYPE_INDICATOR_CONFIG_VALUE_ARRAY, + EXO_PARAM_READWRITE)); + + + g_object_class_install_property (gobject_class, + PROP_KNOWN_INDICATORS, + g_param_spec_boxed ("known-indicators", + NULL, NULL, + XFCE_TYPE_INDICATOR_CONFIG_VALUE_ARRAY, + EXO_PARAM_READWRITE)); + + + indicator_config_signals[CONFIGURATION_CHANGED] = + g_signal_new (g_intern_static_string ("configuration-changed"), + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + 0, NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + indicator_config_signals[INDICATOR_LIST_CHANGED] = + g_signal_new (g_intern_static_string ("indicator-list-changed"), + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + 0, NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); +} + + + +static void +indicator_config_init (IndicatorConfig *config) +{ + config->icon_size_max = DEFAULT_ICON_SIZE_MAX; + config->align_left = DEFAULT_ALIGN_LEFT; + config->mode_whitelist = DEFAULT_MODE_WHITELIST; + config->blacklist = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + config->whitelist = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + config->known_indicators = NULL; + + config->orientation = DEFAULT_ORIENTATION; + config->panel_orientation = DEFAULT_PANEL_ORIENTATION; + config->nrows = 1; + config->panel_size = DEFAULT_PANEL_SIZE; +} + + + +static void +indicator_config_finalize (GObject *object) +{ + IndicatorConfig *config = XFCE_INDICATOR_CONFIG (object); + + xfconf_shutdown(); + + g_hash_table_destroy (config->blacklist); + g_hash_table_destroy (config->whitelist); + g_list_foreach (config->known_indicators, (GFunc) g_free, NULL); + g_list_free (config->known_indicators); + + G_OBJECT_CLASS (indicator_config_parent_class)->finalize (object); +} + + + +static void +indicator_config_collect_keys (gpointer key, + gpointer value, + gpointer array) +{ + GValue *tmp; + + tmp = g_new0 (GValue, 1); + g_value_init (tmp, G_TYPE_STRING); + g_value_set_string (tmp, key); + g_ptr_array_add (array, tmp); +} + + + +static void +indicator_config_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + IndicatorConfig *config = XFCE_INDICATOR_CONFIG (object); + GPtrArray *array; + GList *li; + GValue *tmp; + + switch (prop_id) + { + case PROP_ICON_SIZE_MAX: + g_value_set_uint (value, config->icon_size_max); + break; + + case PROP_ALIGN_LEFT: + g_value_set_boolean (value, config->align_left); + break; + + case PROP_MODE_WHITELIST: + g_value_set_boolean (value, config->mode_whitelist); + break; + + case PROP_BLACKLIST: + array = g_ptr_array_new (); + g_hash_table_foreach (config->blacklist, indicator_config_collect_keys, array); + g_value_set_boxed (value, array); + xfconf_array_free (array); + break; + + case PROP_WHITELIST: + array = g_ptr_array_new (); + g_hash_table_foreach (config->whitelist, indicator_config_collect_keys, array); + g_value_set_boxed (value, array); + xfconf_array_free (array); + break; + + case PROP_KNOWN_INDICATORS: + array = g_ptr_array_new (); + for(li = config->known_indicators; li != NULL; li = li->next) + { + tmp = g_new0 (GValue, 1); + g_value_init (tmp, G_TYPE_STRING); + g_value_set_string (tmp, li->data); + g_ptr_array_add (array, tmp); + } + g_value_set_boxed (value, array); + xfconf_array_free (array); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + + + +static void +indicator_config_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + IndicatorConfig *config = XFCE_INDICATOR_CONFIG (object); + gint val; + GPtrArray *array; + const GValue *tmp; + gchar *name; + guint i; + + switch (prop_id) + { + case PROP_ICON_SIZE_MAX: + val = g_value_get_uint (value); + if (config->icon_size_max != val) + { + config->icon_size_max = val; + g_signal_emit (G_OBJECT (config), indicator_config_signals [CONFIGURATION_CHANGED], 0); + } + break; + + case PROP_ALIGN_LEFT: + val = g_value_get_boolean (value); + if (config->align_left != val) + { + config->align_left = val; + g_signal_emit (G_OBJECT (config), indicator_config_signals [CONFIGURATION_CHANGED], 0); + } + break; + + case PROP_MODE_WHITELIST: + val = g_value_get_boolean (value); + if (config->mode_whitelist != val) + { + config->mode_whitelist = val; + g_signal_emit (G_OBJECT (config), indicator_config_signals [INDICATOR_LIST_CHANGED], 0); + } + break; + + case PROP_BLACKLIST: + g_hash_table_remove_all (config->blacklist); + array = g_value_get_boxed (value); + if (G_LIKELY (array != NULL)) + { + for (i = 0; i < array->len; i++) + { + tmp = g_ptr_array_index (array, i); + g_assert (G_VALUE_HOLDS_STRING (tmp)); + name = g_value_dup_string (tmp); + g_hash_table_replace (config->blacklist, name, name); + } + } + g_signal_emit (G_OBJECT (config), indicator_config_signals [INDICATOR_LIST_CHANGED], 0); + break; + + case PROP_WHITELIST: + g_hash_table_remove_all (config->whitelist); + array = g_value_get_boxed (value); + if (G_LIKELY (array != NULL)) + { + for (i = 0; i < array->len; i++) + { + tmp = g_ptr_array_index (array, i); + g_assert (G_VALUE_HOLDS_STRING (tmp)); + name = g_value_dup_string (tmp); + g_hash_table_replace (config->whitelist, name, name); + } + } + g_signal_emit (G_OBJECT (config), indicator_config_signals [INDICATOR_LIST_CHANGED], 0); + break; + + case PROP_KNOWN_INDICATORS: + g_list_foreach (config->known_indicators, (GFunc) g_free, NULL); + g_list_free (config->known_indicators); + config->known_indicators = NULL; + array = g_value_get_boxed (value); + if (G_LIKELY (array != NULL)) + { + for (i = 0; i < array->len; i++) + { + tmp = g_ptr_array_index (array, i); + g_assert (G_VALUE_HOLDS_STRING (tmp)); + name = g_value_dup_string (tmp); + config->known_indicators = g_list_append (config->known_indicators, name); + } + } + g_signal_emit (G_OBJECT (config), indicator_config_signals [INDICATOR_LIST_CHANGED], 0); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + + + + +gint +indicator_config_get_icon_size_max (IndicatorConfig *config) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), DEFAULT_ICON_SIZE_MAX); + + return config->icon_size_max; +} + + + + +gboolean +indicator_config_get_align_left (IndicatorConfig *config) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), DEFAULT_ALIGN_LEFT); + + return config->align_left; +} + + + + +void +indicator_config_set_orientation (IndicatorConfig *config, + GtkOrientation panel_orientation, + GtkOrientation orientation) +{ + gboolean needs_update = FALSE; + + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (config)); + + if (config->orientation != orientation) + { + config->orientation = orientation; + needs_update = TRUE; + } + + if (config->panel_orientation != panel_orientation) + { + config->panel_orientation = panel_orientation; + needs_update = TRUE; + } + + if (needs_update) + g_signal_emit (G_OBJECT (config), indicator_config_signals[CONFIGURATION_CHANGED], 0); +} + + + +GtkOrientation +indicator_config_get_orientation (IndicatorConfig *config) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), DEFAULT_ORIENTATION); + + return config->orientation; +} + + + + +GtkOrientation +indicator_config_get_panel_orientation (IndicatorConfig *config) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), DEFAULT_PANEL_ORIENTATION); + + return config->panel_orientation; +} + + + + +void +indicator_config_set_size (IndicatorConfig *config, + gint panel_size, + gint nrows) +{ + gboolean needs_update = FALSE; + + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (config)); + + if (config->nrows != nrows) + { + config->nrows = nrows; + needs_update = TRUE; + } + + if (config->panel_size != panel_size) + { + config->panel_size = panel_size; + needs_update = TRUE; + } + + if (needs_update) + g_signal_emit (G_OBJECT (config), indicator_config_signals[CONFIGURATION_CHANGED], 0); +} + + + +gint +indicator_config_get_nrows (IndicatorConfig *config) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), 1); + + return config->nrows; +} + + + + +gint +indicator_config_get_panel_size (IndicatorConfig *config) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), DEFAULT_PANEL_SIZE); + + return config->panel_size; +} + + + + +gchar** +indicator_config_get_excluded_modules (IndicatorConfig *config) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), DEFAULT_ALIGN_LEFT); + + return config->excluded_modules; +} + + + + +gboolean +indicator_config_get_mode_whitelist (IndicatorConfig *config) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), FALSE); + + return config->mode_whitelist; +} + + + + +gboolean +indicator_config_is_blacklisted (IndicatorConfig *config, + const gchar *name) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), FALSE); + + return g_hash_table_lookup_extended (config->blacklist, name, NULL, NULL); +} + + + + +void +indicator_config_blacklist_set (IndicatorConfig *config, + const gchar *name, + gboolean add) +{ + gchar *name_copy; + + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (config)); + g_return_if_fail (!exo_str_is_empty (name)); + + if (add) + { + name_copy = g_strdup (name); + g_hash_table_replace (config->blacklist, name_copy, name_copy); + } + else + { + g_hash_table_remove (config->blacklist, name); + } + g_object_notify (G_OBJECT (config), "blacklist"); + g_signal_emit (G_OBJECT (config), indicator_config_signals [INDICATOR_LIST_CHANGED], 0); +} + + + + + +void +indicator_config_whitelist_set (IndicatorConfig *config, + const gchar *name, + gboolean add) +{ + gchar *name_copy; + + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (config)); + g_return_if_fail (!exo_str_is_empty (name)); + + if (add) + { + name_copy = g_strdup (name); + g_hash_table_replace (config->whitelist, name_copy, name_copy); + } + else + { + g_hash_table_remove (config->whitelist, name); + } + g_object_notify (G_OBJECT (config), "whitelist"); + g_signal_emit (G_OBJECT (config), indicator_config_signals [INDICATOR_LIST_CHANGED], 0); +} + + + + + +gboolean +indicator_config_is_whitelisted (IndicatorConfig *config, + const gchar *name) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), FALSE); + + return g_hash_table_lookup_extended (config->whitelist, name, NULL, NULL); +} + + + + +GList* +indicator_config_get_known_indicators (IndicatorConfig *config) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_CONFIG (config), NULL); + + return config->known_indicators; +} + + + + +void +indicator_config_add_known_indicator (IndicatorConfig *config, + const gchar *name) +{ + GList *li; + + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (config)); + g_return_if_fail (!exo_str_is_empty (name)); + + /* check if the indicator is already known */ + for(li = config->known_indicators; li != NULL; li = li->next) + if (g_strcmp0 (li->data, name) == 0) + return; + + config->known_indicators = g_list_append (config->known_indicators, g_strdup (name)); + + g_object_notify (G_OBJECT (config), "known-indicators"); + g_signal_emit (G_OBJECT (config), indicator_config_signals [INDICATOR_LIST_CHANGED], 0); +} + + + + +void +indicator_config_swap_known_indicators (IndicatorConfig *config, + const gchar *name1, + const gchar *name2) +{ + GList *li, *li_tmp; + + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (config)); + g_return_if_fail (!exo_str_is_empty (name1)); + g_return_if_fail (!exo_str_is_empty (name2)); + + for(li = config->known_indicators; li != NULL; li = li->next) + if (g_strcmp0 (li->data, name1) == 0) + break; + + /* make sure that the list contains name1 followed by name2 */ + if (li == NULL || li->next == NULL || g_strcmp0 (li->next->data, name2) != 0) + { + g_debug("Couldn't swap indicators: %s and %s\n", name1, name2); + return; + } + + /* li_tmp will contain only the removed element (name2) */ + li_tmp = li->next; + config->known_indicators = g_list_remove_link (config->known_indicators, li_tmp); + + /* not strictly necessary (in testing the list contents was preserved) + * but searching for the index again should be safer */ + for(li = config->known_indicators; li != NULL; li = li->next) + if (g_strcmp0 (li->data, name1) == 0) + break; + + config->known_indicators = g_list_insert_before (config->known_indicators, li, li_tmp->data); + g_list_free (li_tmp); + + g_object_notify (G_OBJECT (config), "known-indicators"); + g_signal_emit (G_OBJECT (config), indicator_config_signals [INDICATOR_LIST_CHANGED], 0); +} + + + + +void +indicator_config_names_clear (IndicatorConfig *config) +{ + g_list_foreach (config->known_indicators, (GFunc) g_free, NULL); + g_list_free (config->known_indicators); + config->known_indicators = NULL; + g_object_notify (G_OBJECT (config), "known-indicators"); + + g_hash_table_remove_all (config->blacklist); + g_object_notify (G_OBJECT (config), "blacklist"); + + g_hash_table_remove_all (config->whitelist); + g_object_notify (G_OBJECT (config), "whitelist"); + g_signal_emit (G_OBJECT (config), indicator_config_signals [INDICATOR_LIST_CHANGED], 0); +} + + + + +IndicatorConfig * +indicator_config_new (const gchar *property_base) +{ + IndicatorConfig *config; + XfconfChannel *channel; + gchar *property; + + config = g_object_new (XFCE_TYPE_INDICATOR_CONFIG, NULL); + + if (xfconf_init (NULL)) + { + channel = xfconf_channel_get ("xfce4-panel"); + + property = g_strconcat (property_base, "/icon-size-max", NULL); + xfconf_g_property_bind (channel, property, G_TYPE_INT, config, "icon-size-max"); + g_free (property); + + property = g_strconcat (property_base, "/align-left", NULL); + xfconf_g_property_bind (channel, property, G_TYPE_BOOLEAN, config, "align-left"); + g_free (property); + + property = g_strconcat (property_base, "/mode-whitelist", NULL); + xfconf_g_property_bind (channel, property, G_TYPE_BOOLEAN, config, "mode-whitelist"); + g_free (property); + + property = g_strconcat (property_base, "/blacklist", NULL); + xfconf_g_property_bind (channel, property, XFCE_TYPE_INDICATOR_CONFIG_VALUE_ARRAY, config, "blacklist"); + g_free (property); + + property = g_strconcat (property_base, "/whitelist", NULL); + xfconf_g_property_bind (channel, property, XFCE_TYPE_INDICATOR_CONFIG_VALUE_ARRAY, config, "whitelist"); + g_free (property); + + property = g_strconcat (property_base, "/known-indicators", NULL); + xfconf_g_property_bind (channel, property, XFCE_TYPE_INDICATOR_CONFIG_VALUE_ARRAY, config, "known-indicators"); + g_free (property); + + g_signal_emit (G_OBJECT (config), indicator_config_signals[CONFIGURATION_CHANGED], 0); + } + + return config; +} === added file 'panel-plugin/indicator-config.h' --- panel-plugin/indicator-config.h 1970-01-01 00:00:00 +0000 +++ panel-plugin/indicator-config.h 2013-08-14 19:58:39 +0000 @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2013 Andrzej + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __INDICATOR_CONFIG_H__ +#define __INDICATOR_CONFIG_H__ + +#include +#include + +G_BEGIN_DECLS + +typedef struct _IndicatorConfigClass IndicatorConfigClass; +typedef struct _IndicatorConfig IndicatorConfig; + +#define XFCE_TYPE_INDICATOR_CONFIG (indicator_config_get_type ()) +#define XFCE_INDICATOR_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_INDICATOR_CONFIG, IndicatorConfig)) +#define XFCE_INDICATOR_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_INDICATOR_CONFIG, IndicatorConfigClass)) +#define XFCE_IS_INDICATOR_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_INDICATOR_CONFIG)) +#define XFCE_IS_INDICATOR_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_INDICATOR_CONFIG)) +#define XFCE_INDICATOR_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_INDICATOR_CONFIG, IndicatorConfigClass)) + +#define XFCE_TYPE_INDICATOR_CONFIG_VALUE_ARRAY (indicator_config_value_array_get_type ()) + +typedef struct _IncicatorConfigProperty IndicatorConfigProperty; +struct _IndicatorConfigProperty +{ + const gchar *property; + GType type; +}; + +GType indicator_config_value_array_get_type (void) G_GNUC_CONST; + +GType indicator_config_get_type (void) G_GNUC_CONST; + +IndicatorConfig *indicator_config_new (const gchar *property_base); + +void indicator_config_set_orientation (IndicatorConfig *config, + GtkOrientation panel_orientation, + GtkOrientation orientation); + +GtkOrientation indicator_config_get_orientation (IndicatorConfig *config); + +GtkOrientation indicator_config_get_panel_orientation (IndicatorConfig *config); + +void indicator_config_set_size (IndicatorConfig *config, + gint panel_size, + gint nrows); + +gint indicator_config_get_nrows (IndicatorConfig *config); + +gint indicator_config_get_panel_size (IndicatorConfig *config); + +gint indicator_config_get_icon_size_max (IndicatorConfig *config); + +gboolean indicator_config_get_align_left (IndicatorConfig *config); + +gboolean indicator_config_get_mode_whitelist (IndicatorConfig *config); + +gboolean indicator_config_is_blacklisted (IndicatorConfig *config, + const gchar *name); + +void indicator_config_blacklist_set (IndicatorConfig *config, + const gchar *name, + gboolean add); + +gboolean indicator_config_is_whitelisted (IndicatorConfig *config, + const gchar *name); + +void indicator_config_whitelist_set (IndicatorConfig *config, + const gchar *name, + gboolean add); + +gchar **indicator_config_get_excluded_modules (IndicatorConfig *config); + +GList *indicator_config_get_known_indicators (IndicatorConfig *config); + +void indicator_config_add_known_indicator (IndicatorConfig *config, + const gchar *name); + +void indicator_config_swap_known_indicators (IndicatorConfig *config, + const gchar *name1, + const gchar *name2); + +void indicator_config_names_clear (IndicatorConfig *config); + +G_END_DECLS + +#endif /* !__INDICATOR_CONFIG_H__ */ === added file 'panel-plugin/indicator-dialog.c' --- panel-plugin/indicator-dialog.c 1970-01-01 00:00:00 +0000 +++ panel-plugin/indicator-dialog.c 2013-08-14 19:58:39 +0000 @@ -0,0 +1,602 @@ +/* + * Copyright (C) 2012-2013 Andrzej + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + + +/* + * This file implements a preferences dialog. The class extends GtkBuilder. + * + */ + + + +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef HAVE_STRING_H +#include +#endif + +#include +#include +#include +#include + +#include "indicator-dialog.h" +#include "indicator-dialog_ui.h" + +#define PLUGIN_WEBSITE "http://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin" + +#ifdef LIBXFCE4UI_CHECK_VERSION +#if LIBXFCE4UI_CHECK_VERSION (4,9,0) +#define HAS_ONLINE_HELP +#endif +#endif + + +/* known indicator names */ +static const gchar *pretty_names[][3] = +{ + /* raw name, pretty name, icon-name(?) */ + { "libapplication.so", N_("Application Indicators"), "application-default-icon" }, + { "libsoundmenu.so", N_("Sound Menu"), "preferences-desktop-sound" }, + { "libprintersmenu.so", N_("Printers Menu"), "printer" }, + { "libpower.so", N_("Power Management"), NULL }, + { "libappmenu.so", N_("Application Menus (Global Menu)"), "menu-editor" }, + { "libsession.so", N_("Session Management"), NULL }, + { "libmessaging.so", N_("Messaging Menu"), "indicator-messages" }, + { "libdatetime.so", N_("Date and Time"), "time-admin" }, +}; + + +#define ICON_SIZE (22) + +static void indicator_dialog_build (IndicatorDialog *dialog); +static void indicator_dialog_close_button_clicked (IndicatorDialog *dialog, + GtkWidget *button); + +static void indicator_dialog_help_button_clicked (IndicatorDialog *dialog, + GtkWidget *button); + + + +struct _IndicatorDialogClass +{ + GtkBuilderClass __parent__; +}; + +struct _IndicatorDialog +{ + GtkBuilder __parent__; + + GObject *dialog; + GObject *store; + IndicatorConfig *config; +}; + + + +enum +{ + COLUMN_PIXBUF, + COLUMN_TITLE, + COLUMN_HIDDEN, + COLUMN_VISIBLE, + COLUMN_TIP +}; + + + +G_DEFINE_TYPE (IndicatorDialog, indicator_dialog, GTK_TYPE_BUILDER) + + + +static void +indicator_dialog_class_init (IndicatorDialogClass *klass) +{ +} + + + +static void +indicator_dialog_init (IndicatorDialog *dialog) +{ + dialog->dialog = NULL; + dialog->store = NULL; + dialog->config = NULL; +} + + + + +static void +indicator_dialog_add_indicator (IndicatorDialog *dialog, + GdkPixbuf *pixbuf, + const gchar *name, + const gchar *pretty_name, + gboolean hidden, + gboolean visible) +{ + GtkTreeIter iter; + + g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); + g_return_if_fail (GTK_IS_LIST_STORE (dialog->store)); + g_return_if_fail (name == NULL || g_utf8_validate (name, -1, NULL)); + + /* insert in the store */ + gtk_list_store_append (GTK_LIST_STORE (dialog->store), &iter); + gtk_list_store_set (GTK_LIST_STORE (dialog->store), &iter, + COLUMN_PIXBUF, pixbuf, + COLUMN_TITLE, (pretty_name != NULL) ? pretty_name : name, + COLUMN_HIDDEN, hidden, + COLUMN_VISIBLE, visible, + COLUMN_TIP, name, + -1); +} + + + +static void +indicator_dialog_update_indicator_names (IndicatorDialog *dialog) +{ + GList *li; + const gchar *name; + const gchar *pretty_name = NULL; + const gchar *icon_name = NULL; + GdkPixbuf *pixbuf = NULL; + guint i; + + g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (dialog->config)); + g_return_if_fail (GTK_IS_LIST_STORE (dialog->store)); + + for(li = indicator_config_get_known_indicators (dialog->config); li != NULL; li = li->next) + { + name = li->data; + + /* check if we have a better name for the application */ + for (i = 0; i < G_N_ELEMENTS (pretty_names); i++) + { + if (strcmp (name, pretty_names[i][0]) == 0) + { + pretty_name = pretty_names[i][1]; + icon_name = pretty_names[i][2]; + break; + } + } + + /* try to load the icon name */ + if (icon_name != NULL) + pixbuf = xfce_panel_pixbuf_from_source (icon_name, NULL, ICON_SIZE); + else + pixbuf = NULL; + + /* insert indicator in the store */ + indicator_dialog_add_indicator + (dialog, + pixbuf, + name, + pretty_name, + indicator_config_is_blacklisted (dialog->config, name), + indicator_config_is_whitelisted (dialog->config, name)); + } + if (pixbuf != NULL) + g_object_unref (G_OBJECT (pixbuf)); +} + + + +static void +indicator_dialog_hidden_toggled (GtkCellRendererToggle *renderer, + const gchar *path_string, + IndicatorDialog *dialog) +{ + GtkTreeIter iter; + gboolean hidden; + gchar *name; + + g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (dialog->config)); + g_return_if_fail (GTK_IS_LIST_STORE (dialog->store)); + + if (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (dialog->store), &iter, path_string)) + { + gtk_tree_model_get (GTK_TREE_MODEL (dialog->store), &iter, + COLUMN_HIDDEN, &hidden, + COLUMN_TIP, &name, -1); + + /* insert value (we need to update it) */ + hidden = !hidden; + + /* update box and store with new state */ + indicator_config_blacklist_set (dialog->config, name, hidden); + gtk_list_store_set (GTK_LIST_STORE (dialog->store), &iter, COLUMN_HIDDEN, hidden, -1); + + g_free (name); + } +} + + + +static void +indicator_dialog_visible_toggled (GtkCellRendererToggle *renderer, + const gchar *path_string, + IndicatorDialog *dialog) +{ + GtkTreeIter iter; + gboolean visible; + gchar *name; + + g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (dialog->config)); + g_return_if_fail (GTK_IS_LIST_STORE (dialog->store)); + + if (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (dialog->store), &iter, path_string)) + { + gtk_tree_model_get (GTK_TREE_MODEL (dialog->store), &iter, + COLUMN_VISIBLE, &visible, + COLUMN_TIP, &name, -1); + + /* insert value (we need to update it) */ + visible = !visible; + + /* update box and store with new state */ + indicator_config_whitelist_set (dialog->config, name, visible); + gtk_list_store_set (GTK_LIST_STORE (dialog->store), &iter, COLUMN_VISIBLE, visible, -1); + + g_free (name); + } +} + + + + +static void +indicator_dialog_mode_whitelist_toggled (GtkCheckButton *check_box, + IndicatorDialog *dialog) +{ + GtkTreeViewColumn *column_visible, *column_hidden; + GObject *treeview; + gboolean mode_whitelist; + + g_return_if_fail (GTK_IS_CHECK_BUTTON (check_box)); + g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); + + mode_whitelist = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_box)); + + treeview = gtk_builder_get_object (GTK_BUILDER (dialog), "indicators-treeview"); + g_return_if_fail (GTK_IS_TREE_VIEW (treeview)); + + column_visible = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), COLUMN_VISIBLE); + column_hidden = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), COLUMN_HIDDEN); + + gtk_tree_view_column_set_visible (column_visible, mode_whitelist); + gtk_tree_view_column_set_visible (column_hidden, !mode_whitelist); +} + + + + +static void +indicator_dialog_swap_rows (IndicatorDialog *dialog, + GtkTreeIter *iter_prev, + GtkTreeIter *iter) +{ + GdkPixbuf *pixbuf1, *pixbuf2; + gchar *name1, *name2; + gboolean hidden1, hidden2; + gboolean visible1, visible2; + gchar *tip1, *tip2; + + g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (dialog->config)); + g_return_if_fail (GTK_IS_LIST_STORE (dialog->store)); + + gtk_tree_model_get (GTK_TREE_MODEL (dialog->store), iter_prev, + COLUMN_PIXBUF, &pixbuf1, + COLUMN_TITLE, &name1, + COLUMN_HIDDEN, &hidden1, + COLUMN_VISIBLE, &visible1, + COLUMN_TIP, &tip1, -1); + gtk_tree_model_get (GTK_TREE_MODEL (dialog->store), iter, + COLUMN_PIXBUF, &pixbuf2, + COLUMN_TITLE, &name2, + COLUMN_HIDDEN, &hidden2, + COLUMN_VISIBLE, &visible2, + COLUMN_TIP, &tip2, -1); + gtk_list_store_set (GTK_LIST_STORE (dialog->store), iter_prev, + COLUMN_PIXBUF, pixbuf2, + COLUMN_TITLE, name2, + COLUMN_HIDDEN, hidden2, + COLUMN_VISIBLE, visible2, + COLUMN_TIP, tip2, -1); + gtk_list_store_set (GTK_LIST_STORE (dialog->store), iter, + COLUMN_PIXBUF, pixbuf1, + COLUMN_TITLE, name1, + COLUMN_HIDDEN, hidden1, + COLUMN_VISIBLE, visible1, + COLUMN_TIP, tip1, -1); + + /* do a matching operation on IndicatorConfig */ + indicator_config_swap_known_indicators (dialog->config, tip1, tip2); +} + + + + + +static gboolean +indicator_dialog_iter_equal (GtkTreeIter *iter1, + GtkTreeIter *iter2) +{ + return (iter1->user_data == iter2->user_data && + iter1->user_data2 == iter2->user_data2 && + iter1->user_data3 == iter2->user_data3); +} + + + + + +static void +indicator_dialog_item_up_clicked (GtkWidget *button, + IndicatorDialog *dialog) +{ + GObject *treeview; + GtkTreeSelection *selection; + GtkTreeIter iter, iter_prev, iter_tmp; + + g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); + g_return_if_fail (GTK_IS_LIST_STORE (dialog->store)); + + treeview = gtk_builder_get_object (GTK_BUILDER (dialog), "indicators-treeview"); + g_return_if_fail (GTK_IS_TREE_VIEW (treeview)); + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) + return; + + /* gtk_tree_model_iter_previous available from Gtk3 */ + /* so we have to search for it starting from the first iter */ + if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (dialog->store), &iter_prev)) + return; + + iter_tmp = iter_prev; + while (!indicator_dialog_iter_equal (&iter_tmp, &iter)) + { + iter_prev = iter_tmp; + if (!gtk_tree_model_iter_next (GTK_TREE_MODEL (dialog->store), &iter_tmp)) + return; + } + + indicator_dialog_swap_rows (dialog, &iter_prev, &iter); + gtk_tree_selection_select_iter (selection, &iter_prev); +} + + + + + +static void +indicator_dialog_item_down_clicked (GtkWidget *button, + IndicatorDialog *dialog) +{ + GObject *treeview; + GtkTreeSelection *selection; + GtkTreeIter iter, iter_next; + + g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); + g_return_if_fail (GTK_IS_LIST_STORE (dialog->store)); + + treeview = gtk_builder_get_object (GTK_BUILDER (dialog), "indicators-treeview"); + g_return_if_fail (GTK_IS_TREE_VIEW (treeview)); + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) + return; + + iter_next = iter; + if (!gtk_tree_model_iter_next (GTK_TREE_MODEL (dialog->store), &iter_next)) + return; + + indicator_dialog_swap_rows (dialog, &iter, &iter_next); + gtk_tree_selection_select_iter (selection, &iter_next); +} + + + + + +static void +indicator_dialog_clear_clicked (GtkWidget *button, + IndicatorDialog *dialog) +{ + g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (dialog->config)); + g_return_if_fail (GTK_IS_LIST_STORE (dialog->store)); + + if (xfce_dialog_confirm (GTK_WINDOW (gtk_widget_get_toplevel (button)), + GTK_STOCK_CLEAR, NULL, NULL, + _("Are you sure you want to clear the list of " + "known indicators?"))) + { + gtk_list_store_clear (GTK_LIST_STORE (dialog->store)); + + indicator_config_names_clear (dialog->config); + } +} + + + + + +static void +indicator_dialog_build (IndicatorDialog *dialog) +{ + GtkBuilder *builder = GTK_BUILDER (dialog); + GObject *object; + GError *error = NULL; + + if (xfce_titled_dialog_get_type () == 0) + return; + + /* load the builder data into the object */ + if (gtk_builder_add_from_string (builder, indicator_dialog_ui, + indicator_dialog_ui_length, &error)) + { + + dialog->dialog = gtk_builder_get_object (builder, "dialog"); + g_return_if_fail (XFCE_IS_TITLED_DIALOG (dialog->dialog)); + + object = gtk_builder_get_object (builder, "close-button"); + g_return_if_fail (GTK_IS_BUTTON (object)); + g_signal_connect_swapped (G_OBJECT (object), "clicked", + G_CALLBACK (indicator_dialog_close_button_clicked), + dialog); + + object = gtk_builder_get_object (builder, "help-button"); + g_return_if_fail (GTK_IS_BUTTON (object)); + g_signal_connect_swapped (G_OBJECT (object), "clicked", + G_CALLBACK (indicator_dialog_help_button_clicked), + dialog); + + object = gtk_builder_get_object (builder, "size-max"); + g_return_if_fail (GTK_IS_WIDGET (object)); + exo_mutual_binding_new (G_OBJECT (dialog->config), "icon-size-max", + G_OBJECT (object), "value"); + + object = gtk_builder_get_object (builder, "checkbutton-align-left"); + g_return_if_fail (GTK_IS_WIDGET (object)); + exo_mutual_binding_new (G_OBJECT (dialog->config), "align-left", + G_OBJECT (object), "active"); + + object = gtk_builder_get_object (builder, "checkbutton-whitelist"); + g_return_if_fail (GTK_IS_WIDGET (object)); + exo_mutual_binding_new (G_OBJECT (dialog->config), "mode-whitelist", + G_OBJECT (object), "active"); + g_signal_connect (G_OBJECT (object), "toggled", + G_CALLBACK (indicator_dialog_mode_whitelist_toggled), dialog); + indicator_dialog_mode_whitelist_toggled (GTK_CHECK_BUTTON (object), dialog); + + dialog->store = gtk_builder_get_object (builder, "indicators-store"); + g_return_if_fail (GTK_IS_LIST_STORE (dialog->store)); + indicator_dialog_update_indicator_names (dialog); + + object = gtk_builder_get_object (GTK_BUILDER (dialog), "indicators-treeview"); + g_return_if_fail (GTK_IS_TREE_VIEW (object)); + gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (object), COLUMN_TIP); + + object = gtk_builder_get_object (builder, "hidden-toggle"); + g_return_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (object)); + g_signal_connect (G_OBJECT (object), "toggled", + G_CALLBACK (indicator_dialog_hidden_toggled), dialog); + + object = gtk_builder_get_object (builder, "visible-toggle"); + g_return_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (object)); + g_signal_connect (G_OBJECT (object), "toggled", + G_CALLBACK (indicator_dialog_visible_toggled), dialog); + + object = gtk_builder_get_object (builder, "item-up"); + g_return_if_fail (GTK_IS_BUTTON (object)); + g_signal_connect (G_OBJECT (object), "clicked", + G_CALLBACK (indicator_dialog_item_up_clicked), dialog); + + object = gtk_builder_get_object (builder, "item-down"); + g_return_if_fail (GTK_IS_BUTTON (object)); + g_signal_connect (G_OBJECT (object), "clicked", + G_CALLBACK (indicator_dialog_item_down_clicked), dialog); + + object = gtk_builder_get_object (builder, "indicators-clear"); + g_return_if_fail (GTK_IS_BUTTON (object)); + g_signal_connect (G_OBJECT (object), "clicked", + G_CALLBACK (indicator_dialog_clear_clicked), dialog); + } + else + { + g_critical ("Faild to construct the builder: %s.", + error->message); + g_error_free (error); + } +} + + +static void +indicator_dialog_close_button_clicked (IndicatorDialog *dialog, + GtkWidget *button) +{ + g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); + g_return_if_fail (GTK_IS_BUTTON (button)); + g_return_if_fail (GTK_IS_WINDOW (dialog->dialog)); + + gtk_widget_destroy (GTK_WIDGET (dialog->dialog)); + g_object_unref (G_OBJECT (dialog)); +} + + +static void +indicator_dialog_help_button_clicked (IndicatorDialog *dialog, + GtkWidget *button) +{ + //#ifndef HAS_ONLINE_HELP + gboolean result; + //#endif + + g_return_if_fail (XFCE_IS_INDICATOR_DIALOG (dialog)); + g_return_if_fail (GTK_IS_BUTTON (button)); + g_return_if_fail (GTK_IS_WINDOW (dialog->dialog)); + + /* Doesn't seem to work */ + //#ifdef HAS_ONLINE_HELP + //xfce_dialog_show_help (GTK_WINDOW (dialog->dialog), "xfce4-indicator", "dialog", NULL); + //#else + + result = g_spawn_command_line_async ("exo-open --launch WebBrowser " PLUGIN_WEBSITE, NULL); + + if (G_UNLIKELY (result == FALSE)) + g_warning (_("Unable to open the following url: %s"), PLUGIN_WEBSITE); + + //#endif +} + + + +void +indicator_dialog_show (GdkScreen *screen, + IndicatorConfig *config) +{ + static IndicatorDialog *dialog = NULL; + + g_return_if_fail (GDK_IS_SCREEN (screen)); + g_return_if_fail (XFCE_IS_INDICATOR_CONFIG (config)); + + if (dialog == NULL) + { + dialog = g_object_new (XFCE_TYPE_INDICATOR_DIALOG, NULL); + g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer *) &dialog); + dialog->config = config; + indicator_dialog_build (XFCE_INDICATOR_DIALOG (dialog)); + gtk_widget_show (GTK_WIDGET (dialog->dialog)); + } + else + { + gtk_window_present (GTK_WINDOW (dialog->dialog)); + } + + gtk_window_set_screen (GTK_WINDOW (dialog->dialog), screen); +} === added file 'panel-plugin/indicator-dialog.glade' --- panel-plugin/indicator-dialog.glade 1970-01-01 00:00:00 +0000 +++ panel-plugin/indicator-dialog.glade 2013-08-14 19:58:39 +0000 @@ -0,0 +1,442 @@ + + + + + + + False + Indicators + 425 + 525 + gtk-properties + normal + + + True + False + 2 + + + True + False + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + gtk-help + True + True + True + False + True + + + False + False + 1 + True + + + + + False + True + end + 0 + + + + + True + False + 6 + 6 + + + True + False + 0 + none + + + True + False + 12 + + + True + False + 6 + 6 + + + True + False + 12 + + + True + False + 0 + _Maximum icon size (px): + True + size-max + + + False + True + 0 + + + + + True + True + Icons are scaled to fit a single row of the panel. Use this option to restrict the maximum size of the icon. + False + False + True + True + size-adjustment + True + + + False + True + 1 + + + + + True + True + 0 + + + + + Align left in deskbar mode + True + True + False + Controls the indicator button layout when the panel is in a Deskbar mode. Possible choices are "centered" or "aligned left". + False + True + + + True + True + 1 + + + + + + + + + True + False + Appearance + + + + + + + + False + True + 0 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + 6 + 6 + + + Hide indicators by default + True + True + False + When enabled, only indicators marked "Visible" are shown. Otherwise, all indicators not marked "Hidden" are displayed. + False + True + + + False + True + 0 + + + + + True + False + 6 + + + True + True + automatic + automatic + in + + + True + True + indicators-store + False + True + False + + + 24 + + + + 0 + + + + + + + Indicator + True + + + + 1 + + + + + + + Hidden + + + + 2 + + + + + + + Visible + + + + 3 + + + + + + + + + True + True + 0 + + + + + True + False + 6 + + + True + True + True + Move the selected indicator one row up. + False + + + True + False + gtk-go-up + + + + + False + True + 0 + + + + + True + True + True + Move the selected indicator one row down. + False + + + True + False + gtk-go-down + + + + + False + True + 1 + + + + + False + True + 1 + + + + + True + True + 1 + + + + + True + False + 0 + 20 + 6 + <i>Please restart the panel for visibility changes to take effect.</i> + True + True + + + False + True + 2 + + + + + True + False + start + + + C_lear known indicators + True + True + True + Resets the list of indicators and their visibility settings. + False + image1 + True + + + False + False + 0 + + + + + False + True + 3 + + + + + + + + + True + False + Known Indicators + + + + + + + + True + True + 1 + + + + + True + True + 1 + + + + + + close-button + help-button + + + + True + False + gtk-clear + + + + + + + + + + + + + + + + + 12 + 64 + 32 + 1 + 2 + + === added file 'panel-plugin/indicator-dialog.h' --- panel-plugin/indicator-dialog.h 1970-01-01 00:00:00 +0000 +++ panel-plugin/indicator-dialog.h 2013-08-14 19:58:39 +0000 @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2012-2013 Andrzej + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __INDICATOR_DIALOG_H__ +#define __INDICATOR_DIALOG_H__ + +#include +#include "indicator-config.h" + +G_BEGIN_DECLS + +typedef struct _IndicatorDialogClass IndicatorDialogClass; +typedef struct _IndicatorDialog IndicatorDialog; + +#define XFCE_TYPE_INDICATOR_DIALOG (indicator_dialog_get_type ()) +#define XFCE_INDICATOR_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_INDICATOR_DIALOG, IndicatorDialog)) +#define XFCE_INDICATOR_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_INDICATOR_DIALOG, IndicatorDialogClass)) +#define XFCE_IS_INDICATOR_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_INDICATOR_DIALOG)) +#define XFCE_IS_INDICATOR_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_INDICATOR_DIALOG)) +#define XFCE_INDICATOR_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_INDICATOR_DIALOG, IndicatorDialogClass)) + +GType indicator_dialog_get_type (void) G_GNUC_CONST; + +void indicator_dialog_show (GdkScreen *screen, + IndicatorConfig *config); + +G_END_DECLS + +#endif /* !__INDICATOR_DIALOG_H__ */ === added file 'panel-plugin/indicator-dialog_ui.h' --- panel-plugin/indicator-dialog_ui.h 1970-01-01 00:00:00 +0000 +++ panel-plugin/indicator-dialog_ui.h 2013-08-14 19:58:39 +0000 @@ -0,0 +1,219 @@ +/* automatically generated from indicator-dialog.glade */ +#ifdef __SUNPRO_C +#pragma align 4 (indicator_dialog_ui) +#endif +#ifdef __GNUC__ +static const char indicator_dialog_ui[] __attribute__ ((__aligned__ (4))) = +#else +static const char indicator_dialog_ui[] = +#endif +{ + "FalseIndicators425525gtk-propertiesnormalTrueFalse2True<" + "/property>Falseendgtk-closeTrueTrueTrueFalseTru" + "eFalseFalse0<" + "/property>gtk-helpTrueTrueTrueFalseTrueFalseFalse1TrueFalseTrueend0TrueFalse66TrueFalse0none<" + "child>TrueFalse<" + "property name=\"left_padding\">12TrueFalse66TrueFalse12TrueFalse<" + "property name=\"xalign\">0_Maximum icon size (px):Truesize-maxFalseTrue0TrueTrueIcons are scaled to fit a single row of the panel. Use this option t" + "o restrict the maximum size of the icon.FalseFalseTrueTruesize-adjustmentTrueFalseTrue1TrueTrue0Align left in deskbar mode" + "True" + "TrueFalseControls the indicator" + " button layout when the panel is in a Deskbar mode. Possible choices ar" + "e \"centered\" or \"aligned left\".FalseTrue<" + "/property>TrueTrue1TrueFalseAppearanceFalseTrue0TrueFals" + "e0noneTrueFalse12TrueFalse66Hide indicators by" + " defaultTrueTrueF" + "alseWhe" + "n enabled, only indicators marked \"Visible\" are shown. Otherwise, all" + " indicators not marked \"Hidden\" are displayed.FalseTrueFals" + "eTrue0TrueFalse6TrueTrueautomaticautomaticinTrueTrueindicators-store" + "FalseTrue" + "False240IndicatorTrue1Hidden2Visible" + "<" + "attributes>3TrueTrue0TrueFalse6TrueTrueTrueMove the selected indicator one row u" + "p.False<" + "child>TrueFalsegtk-go-upFalseTrue" + "0TrueTrueTrueMove the selected indicator one row down.FalseTr" + "ueFalsegtk-go-downFalseTrue1FalseTrue1TrueTrue1" + "True" + "False0206<i>Please restart the panel for vi" + "sibility changes to take effect.</i>TrueTrueFalseTrue2TrueFals" + "estartC_lear known indicatorsTrueTrue" + "TrueResets the list of indicators and thei" + "r visibility settings.Falseimage1TrueFalseFalse0FalseTrue" + "3TrueFalseKnown IndicatorsTrueTrue" + "1TrueTrue1close-buttonhelp-butt" + "onTrueFalsegtk-clear126" + "43212" + "" +}; + +static const unsigned indicator_dialog_ui_length = 13842u; + === modified file 'panel-plugin/indicator.c' --- panel-plugin/indicator.c 2012-05-23 21:20:49 +0000 +++ panel-plugin/indicator.c 2013-08-14 19:58:39 +0000 @@ -1,4 +1,5 @@ -/* Copyright (c) 2009 Mark Trompell +/* Copyright (c) 2009 Mark Trompell + * Copyright (c) 2012-2013 Andrzej * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +16,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + +/* + * This file implements the main plugin class. + * + */ + + + #ifdef HAVE_CONFIG_H #include #endif @@ -26,13 +36,11 @@ #include #include #include -#include #include "indicator.h" #include "indicator-box.h" #include "indicator-button.h" - -#define DEFAULT_EXCLUDED_MODULES NULL +#include "indicator-dialog.h" #ifdef LIBXFCE4PANEL_CHECK_VERSION #if LIBXFCE4PANEL_CHECK_VERSION (4,9,0) @@ -41,176 +49,82 @@ #endif /* prototypes */ -static void -indicator_construct (XfcePanelPlugin *plugin); - -static gboolean -load_module (const gchar * name, IndicatorPlugin * indicator); - -static gboolean -indicator_size_changed (XfcePanelPlugin *plugin, gint size, IndicatorPlugin *indicator); - -#ifdef HAS_PANEL_49 -static void -indicator_mode_changed (XfcePanelPlugin *plugin, XfcePanelPluginMode mode, IndicatorPlugin *indicator); -#else -static void -indicator_orientation_changed (XfcePanelPlugin *plugin, GtkOrientation orientation, IndicatorPlugin *indicator); -#endif - - -/* register the plugin */ -XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (indicator_construct); - -#if 0 -void -indicator_save (XfcePanelPlugin *plugin, - IndicatorPlugin *indicator) -{ - XfceRc *rc; - gchar *file; - - /* get the config file location */ - file = xfce_panel_plugin_save_location (plugin, TRUE); - - if (G_UNLIKELY (file == NULL)) - { - DBG ("Failed to open config file"); - return; - } - - /* open the config file, read/write */ - rc = xfce_rc_simple_open (file, FALSE); - g_free (file); - - if (G_LIKELY (rc != NULL)) - { - /* save the settings */ - DBG("."); - if (indicator->excluded_modules) - xfce_rc_write_list_entry (rc, "Exclude", - indicator->excluded_modules, NULL); - - /* close the rc file */ - xfce_rc_close (rc); - } -} -#endif - - -static void -indicator_read (IndicatorPlugin *indicator) -{ - XfceRc * rc; - gchar * file; - XfconfChannel * channel = xfconf_channel_get (xfce_panel_get_channel_name ()); - gchar * property = g_strconcat (xfce_panel_plugin_get_property_base(indicator->plugin),"/blacklist",NULL); - indicator->excluded_modules = xfconf_channel_get_string_list(channel, property); - /* if it's empty, try to migrate from old XfceRc file */ - if (indicator->excluded_modules == NULL) { - file = xfce_panel_plugin_lookup_rc_file (indicator->plugin); - if (file != NULL) { - rc = xfce_rc_simple_open (file, TRUE); - g_free (file); - if (rc != NULL) { - indicator->excluded_modules = xfce_rc_read_list_entry (rc, "Exclude", NULL); - xfce_rc_close (rc); - if (indicator->excluded_modules != NULL) - xfconf_channel_set_string_list (channel, property, (const gchar * const *)indicator->excluded_modules); - } - } - } - g_free (property); - property = g_strconcat (xfce_panel_plugin_get_property_base(indicator->plugin),"/icon-size-max",NULL); - xfconf_g_property_bind (channel, property, G_TYPE_INT, indicator->buttonbox, "icon-size-max"); - g_free (property); - /* something went wrong, apply default values */ - /* - DBG ("Applying default settings"); - indicator->excluded_modules = DEFAULT_EXCLUDED_MODULES; - */ -} - -static IndicatorPlugin * -indicator_new (XfcePanelPlugin *plugin) -{ - IndicatorPlugin *indicator; - GtkOrientation orientation; - gint indicators_loaded = 0; - - /* allocate memory for the plugin structure */ - indicator = panel_slice_new0 (IndicatorPlugin); - - /* pointer to plugin */ - indicator->plugin = plugin; - - /* get the current orientation */ - orientation = xfce_panel_plugin_get_orientation (plugin); - - /* Init some theme/icon stuff */ - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), - INDICATOR_ICONS_DIR); - /*gtk_widget_set_name(GTK_WIDGET (indicator->plugin), "indicator-plugin");*/ - - indicator->buttonbox = xfce_indicator_box_new ();; - /* initialize xfconf */ - if (xfconf_init(NULL)){ - /* get the list of excluded modules */ - indicator_read (indicator); - } - /* load 'em */ - if (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) { - GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL); - - const gchar * name; - guint i, length; - gboolean match = FALSE; - - length = (indicator->excluded_modules != NULL) ? g_strv_length (indicator->excluded_modules) : 0; - while ((name = g_dir_read_name(dir)) != NULL) { - for (i = 0; i < length; ++i) { - if (match = (g_strcmp0 (name, indicator->excluded_modules[i]) == 0)) - break; - } - - if (G_UNLIKELY (match)) { - g_debug ("Excluding module: %s", name); - continue; - } - - if (load_module(name, indicator)) - indicators_loaded++; - } - g_dir_close (dir); - } - - if (indicators_loaded == 0) { - /* A label to allow for click through */ - indicator->item = xfce_indicator_button_new(NULL, NULL); - xfce_indicator_button_set_label(XFCE_INDICATOR_BUTTON(indicator->item), - GTK_LABEL (gtk_label_new(_("No Indicators")))); - gtk_container_add (GTK_CONTAINER (plugin), indicator->item); - gtk_widget_show(indicator->item); - /* show the panel's right-click menu on this menu */ - xfce_panel_plugin_add_action_widget (plugin, indicator->item); - } else { - indicator->ebox = gtk_event_box_new(); - gtk_widget_set_can_focus(GTK_WIDGET(indicator->ebox), TRUE); - gtk_container_add (GTK_CONTAINER (indicator->ebox), GTK_WIDGET(indicator->buttonbox)); - gtk_container_add (GTK_CONTAINER (plugin), GTK_WIDGET(indicator->ebox)); - gtk_widget_show(GTK_WIDGET(indicator->buttonbox)); - gtk_widget_show(GTK_WIDGET(indicator->ebox)); - /* show the panel's right-click menu on this menu */ - xfce_panel_plugin_add_action_widget (plugin, indicator->ebox); - } - return indicator; -} - - - -static void -indicator_free (XfcePanelPlugin *plugin, - IndicatorPlugin *indicator) +static void indicator_construct (XfcePanelPlugin *plugin); +static void indicator_free (XfcePanelPlugin *plugin); +static gboolean load_module (const gchar *name, + IndicatorPlugin *indicator); +static void indicator_show_about (XfcePanelPlugin *plugin); +static void indicator_configure_plugin (XfcePanelPlugin *plugin); +static gboolean indicator_size_changed (XfcePanelPlugin *plugin, + gint size); +#ifdef HAS_PANEL_49 +static void indicator_mode_changed (XfcePanelPlugin *plugin, + XfcePanelPluginMode mode); +#else +static void indicator_orientation_changed (XfcePanelPlugin *plugin, + GtkOrientation orientation); +#endif + + +struct _IndicatorPluginClass +{ + XfcePanelPluginClass __parent__; +}; + +/* plugin structure */ +struct _IndicatorPlugin +{ + XfcePanelPlugin __parent__; + + /* panel widgets */ + GtkWidget *item; + GtkWidget *buttonbox; + + /* indicator settings */ + IndicatorConfig *config; +}; + + +/* define the plugin */ +XFCE_PANEL_DEFINE_PLUGIN (IndicatorPlugin, indicator) + + + + +static void +indicator_class_init (IndicatorPluginClass *klass) +{ + XfcePanelPluginClass *plugin_class; + + plugin_class = XFCE_PANEL_PLUGIN_CLASS (klass); + plugin_class->construct = indicator_construct; + plugin_class->free_data = indicator_free; + plugin_class->size_changed = indicator_size_changed; + plugin_class->about = indicator_show_about; + plugin_class->configure_plugin = indicator_configure_plugin; +#ifdef HAS_PANEL_49 + plugin_class->mode_changed = indicator_mode_changed; +#else + plugin_class->orientation_changed = indicator_orientation_changed; +#endif +} + + + +static void +indicator_init (IndicatorPlugin *indicator) +{ + /* Indicators print a lot of warnings. By default, "wrapper" + makes them critical, so the plugin "crashes" when run as an external + plugin but not internal one (loaded by "xfce4-panel" itself). + The following lines makes only g_error critical. */ + g_log_set_always_fatal (G_LOG_LEVEL_ERROR); +} + + + +static void +indicator_free (XfcePanelPlugin *plugin) { GtkWidget *dialog; @@ -218,28 +132,65 @@ dialog = g_object_get_data (G_OBJECT (plugin), "dialog"); if (G_UNLIKELY (dialog != NULL)) gtk_widget_destroy (dialog); - xfconf_shutdown(); - /* free the plugin structure */ - panel_slice_free (IndicatorPlugin, indicator); -} +} + + + +static void +indicator_show_about (XfcePanelPlugin *plugin) +{ + GdkPixbuf *icon; + + const gchar *auth[] = { + "Mark Trompell ", "Andrzej Radecki ", + "Lionel Le Folgoc ", "Jason Conti ", + "Nick Schermer ", "Evgeni Golov ", NULL }; + + g_return_if_fail (XFCE_IS_INDICATOR_PLUGIN (plugin)); + + icon = xfce_panel_pixbuf_from_source("xfce4-indicator-plugin", NULL, 32); + gtk_show_about_dialog(NULL, + "logo", icon, + "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL), + "version", PACKAGE_VERSION, + "program-name", PACKAGE_NAME, + "comments", _("An indicator of something that needs your attention on the desktop"), + "website", "http://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin", + "copyright", _("Copyright (c) 2009-2013\n"), + "authors", auth, NULL); + + if(icon) + g_object_unref(G_OBJECT(icon)); +} + + + +static void +indicator_configure_plugin (XfcePanelPlugin *plugin) +{ + IndicatorPlugin *indicator = XFCE_INDICATOR_PLUGIN (plugin); + + indicator_dialog_show (gtk_widget_get_screen (GTK_WIDGET (plugin)), indicator->config); +} + #ifdef HAS_PANEL_49 static void indicator_mode_changed (XfcePanelPlugin *plugin, - XfcePanelPluginMode mode, - IndicatorPlugin *indicator) + XfcePanelPluginMode mode) { - GtkOrientation orientation; - GtkOrientation panel_orientation = xfce_panel_plugin_get_orientation (plugin); + GtkOrientation orientation; + GtkOrientation panel_orientation = xfce_panel_plugin_get_orientation (plugin); + IndicatorPlugin *indicator = XFCE_INDICATOR_PLUGIN (plugin); orientation = (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL; - xfce_indicator_box_set_orientation (XFCE_INDICATOR_BOX (indicator->buttonbox), panel_orientation, orientation); + indicator_config_set_orientation (indicator->config, panel_orientation, orientation); - indicator_size_changed (plugin, xfce_panel_plugin_get_size (plugin), indicator); + indicator_size_changed (plugin, xfce_panel_plugin_get_size (plugin)); } @@ -247,109 +198,122 @@ #else static void indicator_orientation_changed (XfcePanelPlugin *plugin, - GtkOrientation orientation, - IndicatorPlugin *indicator) + GtkOrientation orientation) { - xfce_indicator_box_set_orientation (XFCE_INDICATOR_BOX (indicator->buttonbox), orientation, GTK_ORIENTATION_HORIZONTAL); - - indicator_size_changed (plugin, xfce_panel_plugin_get_size (plugin), indicator); + IndicatorPlugin *indicator = XFCE_INDICATOR_PLUGIN (plugin); + + indicator_config_set_orientation (indicator->config, orientation, GTK_ORIENTATION_HORIZONTAL); + + indicator_size_changed (plugin, xfce_panel_plugin_get_size (plugin)); } #endif static gboolean indicator_size_changed (XfcePanelPlugin *plugin, - gint size, - IndicatorPlugin *indicator) + gint size) { + IndicatorPlugin *indicator = XFCE_INDICATOR_PLUGIN (plugin); + #ifdef HAS_PANEL_49 - xfce_indicator_box_set_size (XFCE_INDICATOR_BOX (indicator->buttonbox), - size, xfce_panel_plugin_get_nrows (plugin)); + indicator_config_set_size (indicator->config, size, xfce_panel_plugin_get_nrows (plugin)); #else - xfce_indicator_box_set_size (XFCE_INDICATOR_BOX (indicator->buttonbox), - size, 1); + indicator_config_set_size (indicator->config, size, 1); #endif return TRUE; } - -static gboolean -on_button_press (GtkWidget *widget, GdkEventButton *event, IndicatorPlugin *indicator) -{ - if (indicator != NULL) - { - if( event->button == 1) /* left click only */ - { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),TRUE); - gtk_menu_popup (xfce_indicator_button_get_menu (XFCE_INDICATOR_BUTTON(widget)), NULL, NULL, - xfce_panel_plugin_position_menu, - indicator->plugin, 1, gtk_get_current_event_time ()); - - return TRUE; - } - /* event doesn't make it to the ebox, so I just push it. */ - gtk_widget_event (indicator->ebox, (GdkEvent*)event); - } - return FALSE; -} - -static void -menu_deactivate (GtkMenu *menu, - gpointer user_data) -{ - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_menu_get_attach_widget (menu)), FALSE); -} - static void indicator_construct (XfcePanelPlugin *plugin) { - IndicatorPlugin *indicator; + IndicatorPlugin *indicator = XFCE_INDICATOR_PLUGIN (plugin); + gint indicators_loaded = 0; + GtkWidget *label; + + xfce_panel_plugin_menu_show_configure (plugin); + xfce_panel_plugin_menu_show_about (plugin); /* setup transation domain */ xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); - /* create the plugin */ - indicator = indicator_new (plugin); - - /* connect plugin signals */ - g_signal_connect (G_OBJECT (plugin), "free-data", - G_CALLBACK (indicator_free), indicator); - - g_signal_connect (G_OBJECT (plugin), "size-changed", - G_CALLBACK (indicator_size_changed), indicator); - -#ifdef HAS_PANEL_49 - g_signal_connect (G_OBJECT (plugin), "mode-changed", - G_CALLBACK (indicator_mode_changed), indicator); -#else - g_signal_connect (G_OBJECT (plugin), "orientation-changed", - G_CALLBACK (indicator_orientation_changed), indicator); -#endif -} - - -static gboolean -entry_scrolled (GtkWidget *menuitem, GdkEventScroll *event, IndicatorPlugin *indicator) -{ - IndicatorObject *io = xfce_indicator_button_get_io (XFCE_INDICATOR_BUTTON (menuitem)); - IndicatorObjectEntry *entry = xfce_indicator_button_get_entry (XFCE_INDICATOR_BUTTON (menuitem)); - - g_return_val_if_fail(INDICATOR_IS_OBJECT(io), FALSE); - g_return_val_if_fail(indicator != NULL, FALSE); - - g_signal_emit_by_name (io, INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, entry, 1, event->direction); - - return TRUE; + /* Init some theme/icon stuff */ + gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), + INDICATOR_ICONS_DIR); + /*gtk_widget_set_name(GTK_WIDGET (indicator->plugin), "indicator-plugin");*/ + + /* initialize xfconf */ + indicator->config = indicator_config_new (xfce_panel_plugin_get_property_base (plugin)); + + /* instantiate a button box */ + indicator->buttonbox = xfce_indicator_box_new (indicator->config); + gtk_container_add (GTK_CONTAINER (plugin), GTK_WIDGET(indicator->buttonbox)); + gtk_widget_show(GTK_WIDGET(indicator->buttonbox)); + + /* load 'em */ + if (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) { + GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL); + + const gchar * name; + if (indicator_config_get_mode_whitelist (indicator->config)) + { + while ((name = g_dir_read_name (dir)) != NULL) + if (indicator_config_is_whitelisted (indicator->config, name)) + { + g_debug ("Loading whitelisted module: %s", name); + if (load_module(name, indicator)) + indicators_loaded++; + } + } + else + { + while ((name = g_dir_read_name (dir)) != NULL) + if (indicator_config_is_blacklisted (indicator->config, name)) + g_debug ("Excluding blacklisted module: %s", name); + else if (load_module(name, indicator)) + indicators_loaded++; + } + + g_dir_close (dir); + } + + if (indicators_loaded == 0) { + /* A label to allow for click through */ + indicator->item = xfce_indicator_button_new (NULL, + "", + NULL, + plugin, + indicator->config); + label = gtk_label_new ( _("No Indicators")); + xfce_indicator_button_set_label (XFCE_INDICATOR_BUTTON (indicator->item), GTK_LABEL (label)); + gtk_container_add (GTK_CONTAINER (indicator->buttonbox), indicator->item); + gtk_widget_show (label); + gtk_widget_show (indicator->item); + } } static void entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data) { - XfcePanelPlugin *plugin = ((IndicatorPlugin *) user_data)->plugin; - GtkWidget * button = xfce_indicator_button_new (io, entry); + XfcePanelPlugin *plugin = XFCE_PANEL_PLUGIN (user_data); + IndicatorPlugin *indicator = XFCE_INDICATOR_PLUGIN (plugin); + const gchar *io_name = g_object_get_data (G_OBJECT (io), "io-name"); + GtkWidget *button = xfce_indicator_button_new (io, + io_name, + entry, + plugin, + indicator->config); + + /* remove placeholder item when there are real entries to be added */ + if (indicator->item != NULL) + { + xfce_indicator_button_disconnect_signals (XFCE_INDICATOR_BUTTON (indicator->item)); + gtk_widget_destroy (GTK_WIDGET (indicator->item)); + indicator->item = NULL; + } + gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_button_set_use_underline(GTK_BUTTON (button),TRUE); gtk_widget_set_name(GTK_WIDGET (button), "indicator-button"); @@ -361,69 +325,67 @@ xfce_indicator_button_set_label(XFCE_INDICATOR_BUTTON(button), entry->label); if (entry->menu != NULL) - { xfce_indicator_button_set_menu (XFCE_INDICATOR_BUTTON(button), entry->menu); - g_signal_connect(G_OBJECT(entry->menu), "deactivate", G_CALLBACK(menu_deactivate),NULL); - } - - g_signal_connect(button, "button-press-event", G_CALLBACK(on_button_press), - user_data); - g_signal_connect(button, "scroll-event", G_CALLBACK(entry_scrolled), - user_data); - - gtk_container_add(GTK_CONTAINER (((IndicatorPlugin *)user_data)->buttonbox), button); + + gtk_container_add(GTK_CONTAINER (indicator->buttonbox), button); gtk_widget_show(button); } static void -entry_removed_cb (GtkWidget * widget, gpointer userdata) -{ - gpointer data = (gpointer) xfce_indicator_button_get_entry (XFCE_INDICATOR_BUTTON (widget)); - - if (data != userdata) - return; - - gtk_widget_destroy(widget); -} - - -static void entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data) { - gtk_container_foreach(GTK_CONTAINER(user_data), entry_removed_cb, entry); + xfce_indicator_box_remove_entry (XFCE_INDICATOR_BOX (user_data), entry); } static gboolean load_module (const gchar * name, IndicatorPlugin * indicator) { - g_debug("Looking at Module: %s", name); - g_return_val_if_fail(name != NULL, FALSE); - - if (!g_str_has_suffix(name,G_MODULE_SUFFIX)) - return FALSE; - - g_debug("Loading Module: %s", name); - - gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL); - IndicatorObject * io = indicator_object_new_from_file(fullpath); - g_free(fullpath); - - g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, - G_CALLBACK(entry_added), indicator); - g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, - G_CALLBACK(entry_removed), indicator->buttonbox); - - GList * entries = indicator_object_get_entries(io); - GList * entry = NULL; - - for (entry = entries; entry != NULL; entry = g_list_next(entry)) { - IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data; - entry_added(io, entrydata, indicator); - } - - g_list_free(entries); - - return TRUE; + gchar *fullpath; + IndicatorObject *io; + GList *entries, *entry; + IndicatorObjectEntry *entrydata; + + g_debug("Looking at Module: %s", name); + g_return_val_if_fail(name != NULL, FALSE); + + if (!g_str_has_suffix(name,G_MODULE_SUFFIX)) + return FALSE; + + g_debug("Loading Module: %s", name); + + indicator_config_add_known_indicator (indicator->config, name); + + fullpath = g_build_filename(INDICATOR_DIR, name, NULL); + io = indicator_object_new_from_file(fullpath); + g_free(fullpath); + g_object_set_data (G_OBJECT (io), "io-name", g_strdup (name)); + + g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, + G_CALLBACK(entry_added), indicator); + g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, + G_CALLBACK(entry_removed), indicator->buttonbox); + + entries = indicator_object_get_entries(io); + entry = NULL; + + for (entry = entries; entry != NULL; entry = g_list_next(entry)) + { + entrydata = (IndicatorObjectEntry *)entry->data; + entry_added(io, entrydata, indicator); + } + + g_list_free(entries); + + return TRUE; +} + + +XfceIndicatorBox * +indicator_get_buttonbox (IndicatorPlugin *plugin) +{ + g_return_val_if_fail (XFCE_IS_INDICATOR_PLUGIN (plugin), NULL); + + return XFCE_INDICATOR_BOX (plugin->buttonbox); } === added file 'panel-plugin/indicator.desktop.in' --- panel-plugin/indicator.desktop.in 1970-01-01 00:00:00 +0000 +++ panel-plugin/indicator.desktop.in 2013-08-14 19:58:39 +0000 @@ -0,0 +1,8 @@ +[Xfce Panel] +Type=X-XFCE-PanelPlugin +Encoding=UTF-8 +_Name=Indicator Plugin +_Comment=An indicator of something that needs your attention on the desktop +Icon=xfce4-indicator-plugin +X-XFCE-Module=indicator-plugin +X-XFCE-Internal=FALSE === removed file 'panel-plugin/indicator.desktop.in.in' --- panel-plugin/indicator.desktop.in.in 2010-06-13 17:14:30 +0000 +++ panel-plugin/indicator.desktop.in.in 1970-01-01 00:00:00 +0000 @@ -1,8 +0,0 @@ -[Xfce Panel] -Type=X-XFCE-PanelPlugin -Encoding=UTF-8 -_Name=Indicator Plugin -_Comment=An indicator of something that needs your attention on the desktop -Icon=xfce4-indicator-plugin -X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-indicator-plugin -#X-XFCE-Unique=true === modified file 'panel-plugin/indicator.h' --- panel-plugin/indicator.h 2011-10-30 18:50:42 +0000 +++ panel-plugin/indicator.h 2013-08-14 19:58:39 +0000 @@ -18,28 +18,30 @@ #ifndef __INDICATOR_H__ #define __INDICATOR_H__ +#include +#include +#include +#include "indicator-box.h" + G_BEGIN_DECLS -#ifndef INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED -#define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED "scroll-entry" -#endif -/* plugin structure */ -typedef struct -{ - XfcePanelPlugin *plugin; - - /* panel widgets */ - GtkWidget *item; - GtkWidget *buttonbox; - GtkWidget *ebox; - - /* indicator settings */ - gchar **excluded_modules; -} -IndicatorPlugin; - -void -indicator_save (XfcePanelPlugin *plugin, - IndicatorPlugin *indicator); +typedef struct _IndicatorPluginClass IndicatorPluginClass; +typedef struct _IndicatorPlugin IndicatorPlugin; + +#define XFCE_TYPE_INDICATOR_PLUGIN (indicator_get_type ()) +#define XFCE_INDICATOR_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_INDICATOR_PLUGIN, IndicatorPlugin)) +#define XFCE_INDICATOR_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_INDICATOR_PLUGIN, IndicatorPluginClass)) +#define XFCE_IS_INDICATOR_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_INDICATOR_PLUGIN)) +#define XFCE_IS_INDICATOR_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_INDICATOR_PLUGIN)) +#define XFCE_INDICATOR_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_INDICATOR_PLUGIN, IndicatorPluginClass)) + +GType indicator_get_type (void) G_GNUC_CONST; + +void indicator_register_type (XfcePanelTypeModule *type_module); + +void indicator_save (XfcePanelPlugin *plugin, + IndicatorPlugin *indicator); + +XfceIndicatorBox *indicator_get_buttonbox (IndicatorPlugin *plugin); G_END_DECLS === modified file 'po/Makefile.in.in' --- po/Makefile.in.in 2011-02-19 11:59:37 +0000 +++ po/Makefile.in.in 2013-08-14 19:58:39 +0000 @@ -50,8 +50,8 @@ XGETTEXT = @XGETTEXT@ $(XGETTEXT_ARGS) INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -74,15 +74,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: === modified file 'po/POTFILES.in' --- po/POTFILES.in 2010-06-13 17:14:30 +0000 +++ po/POTFILES.in 2013-08-14 19:58:39 +0000 @@ -1,2 +1,7 @@ +panel-plugin/indicator.desktop.in panel-plugin/indicator.c -panel-plugin/indicator.desktop.in.in +panel-plugin/indicator-box.c +panel-plugin/indicator-button.c +panel-plugin/indicator-config.c +panel-plugin/indicator-dialog.c +panel-plugin/indicator-dialog.glade === modified file 'po/de.po' --- po/de.po 2011-05-06 22:33:52 +0000 +++ po/de.po 2013-08-14 19:58:39 +0000 @@ -3,29 +3,159 @@ # Copyright (C) 2009 Mark Trompell # This file is distributed under the same license as the xfce4-indicator-plugin package. # Mark Trompell , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-indicator-plugin 0.0.1svn-r\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 13:40+0200\n" +"POT-Creation-Date: 2013-04-22 07:57+0000\n" "PO-Revision-Date: 2009-06-09 12:02+0200\n" "Last-Translator: Mark Trompell \n" "Language-Team: German\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. A label to allow for click through -#: ../panel-plugin/indicator.c:209 -msgid "No Indicators" -msgstr "Keine Anzeigen" - -#: ../panel-plugin/indicator.desktop.in.in.h:1 +#: ../panel-plugin/indicator.desktop.in.h:1 ../panel-plugin/indicator.c:157 msgid "An indicator of something that needs your attention on the desktop" msgstr "Eine Anzeige, dass etwas Ihre Aufmerksamkeit benötigt" -#: ../panel-plugin/indicator.desktop.in.in.h:2 +#: ../panel-plugin/indicator.desktop.in.h:2 msgid "Indicator Plugin" msgstr "Nachrichtenanzeige" + +#: ../panel-plugin/indicator.c:159 +msgid "Copyright (c) 2009-2013\n" +msgstr "Copyright (c) 2009-2013\n" + +#: ../panel-plugin/indicator.c:288 +msgid "No Indicators" +msgstr "Keine Anzeigen" + +#. raw name, pretty name, +#. icon-name(?) +#: ../panel-plugin/indicator-dialog.c:57 +msgid "Application Indicators" +msgstr "Anwendungsanzeigen" + +#: ../panel-plugin/indicator-dialog.c:58 +msgid "Sound Menu" +msgstr "Soundmenü" + +#: ../panel-plugin/indicator-dialog.c:59 +msgid "Printers Menu" +msgstr "Druckermenü" + +#: ../panel-plugin/indicator-dialog.c:60 +msgid "Power Management" +msgstr "Energieverwaltung" + +#: ../panel-plugin/indicator-dialog.c:61 +msgid "Application Menus (Global Menu)" +msgstr "Anwendungsmenü (Globales Menü)" + +#: ../panel-plugin/indicator-dialog.c:62 +msgid "Session Management" +msgstr "Sitzungsverwaltung" + +#: ../panel-plugin/indicator-dialog.c:63 +msgid "Messaging Menu" +msgstr "Nachrichtenmenü" + +#: ../panel-plugin/indicator-dialog.c:64 +msgid "Date and Time" +msgstr "Datum und Uhrzeit" + +#: ../panel-plugin/indicator-dialog.c:436 +msgid "Are you sure you want to clear the list of known indicators?" +msgstr "Soll die Liste der bekannten Indikatoren gelöscht werden?" + +#: ../panel-plugin/indicator-dialog.c:572 +#, c-format +msgid "Unable to open the following url: %s" +msgstr "%s konnte nicht geöffnet werden." + +#: ../panel-plugin/indicator-dialog.glade.h:1 +msgid "Please restart the panel for visibility changes to take effect." +msgstr "" +"Sie müssen das Panel neu starten damit die Änderungen wirksam werden" + +#: ../panel-plugin/indicator-dialog.glade.h:2 +msgid "Align left in deskbar mode" +msgstr "Im Deskbarmodus linksbündig ausrichten" + +#: ../panel-plugin/indicator-dialog.glade.h:3 +msgid "Appearance" +msgstr "Erscheinungsbild" + +#: ../panel-plugin/indicator-dialog.glade.h:4 +msgid "C_lear known indicators" +msgstr "Bekannte Anzeigen _löschen" + +#: ../panel-plugin/indicator-dialog.glade.h:5 +msgid "" +"Controls the indicator button layout when the panel is in a Deskbar mode. " +"Possible choices are \"centered\" or \"aligned left\"." +msgstr "" +"Bestimmt die Ausrichtung der Anzeigenknöpfe im Deskbarmodus. Mögliche " +"Auswahl: \"zentriert\" oder \"linksbündig\"" + +#: ../panel-plugin/indicator-dialog.glade.h:6 +msgid "Hidden" +msgstr "Versteckt" + +#: ../panel-plugin/indicator-dialog.glade.h:7 +msgid "Hide indicators by default" +msgstr "Anzeigen standardmäßig verstecken" + +#: ../panel-plugin/indicator-dialog.glade.h:8 +msgid "" +"Icons are scaled to fit a single row of the panel. Use this option to " +"restrict the maximum size of the icon." +msgstr "" +"Icons werden skaliert um in eine Reihe des Panels zu passen.\r\n" +"Benutzen Sie diese Einstellung um die maximale Größe der Icons zu " +"beschränken." + +#: ../panel-plugin/indicator-dialog.glade.h:9 +msgid "Indicator" +msgstr "Anzeige" + +#: ../panel-plugin/indicator-dialog.glade.h:10 +msgid "Indicators" +msgstr "Anzeigen" + +#: ../panel-plugin/indicator-dialog.glade.h:11 +msgid "Known Indicators" +msgstr "Bekannte Anzeigen" + +#: ../panel-plugin/indicator-dialog.glade.h:12 +msgid "Move the selected indicator one row down." +msgstr "Ausgewählte Anzeige eine Position hinab setzten." + +#: ../panel-plugin/indicator-dialog.glade.h:13 +msgid "Move the selected indicator one row up." +msgstr "Ausgewählte Anzeige eine Position hinauf setzten." + +#: ../panel-plugin/indicator-dialog.glade.h:14 +msgid "Resets the list of indicators and their visibility settings." +msgstr "Liste der Anzeigen und ihre Sichtbarkeitseinstellungen zurücksetzen." + +#: ../panel-plugin/indicator-dialog.glade.h:15 +msgid "Visible" +msgstr "Sichtbar" + +#: ../panel-plugin/indicator-dialog.glade.h:16 +msgid "" +"When enabled, only indicators marked \"Visible\" are shown. Otherwise, all " +"indicators not marked \"Hidden\" are displayed." +msgstr "" +"Wenn aktiviert werden nur als sichtbar makierte Anzeigen angezeigt.\r\n" +"Ansonsten werden nur Anzeigen angezeigt, die nicht als versteckt markiert " +"sind." + +#: ../panel-plugin/indicator-dialog.glade.h:17 +msgid "_Maximum icon size (px):" +msgstr "_Maximale Icongröße (px):" === modified file 'po/es.po' --- po/es.po 2011-10-30 18:50:42 +0000 +++ po/es.po 2013-08-14 19:58:39 +0000 @@ -7,24 +7,152 @@ msgstr "" "Project-Id-Version: xfce4-indicator-plugin VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-19 10:20+0000\n" -"PO-Revision-Date: 2011-07-19 11:13-0500\n" -"Last-Translator: Andres Sanchez \n" +"POT-Creation-Date: 2013-04-16 17:00+0000\n" +"PO-Revision-Date: 2013-04-16 16:41-0600\n" +"Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Spanish\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Spanish\n" - -#: ../panel-plugin/indicator.c:182 -msgid "No Indicators" -msgstr "Sin indicadores" - -#: ../panel-plugin/indicator.desktop.in.in.h:1 +"X-Generator: Poedit 1.5.4\n" + +#: ../panel-plugin/indicator.desktop.in.h:1 ../panel-plugin/indicator.c:157 msgid "An indicator of something that needs your attention on the desktop" -msgstr "Un indicator necesita su atención en el escritorio" +msgstr "Un indicador de algo que necesita su atención en el escritorio" -#: ../panel-plugin/indicator.desktop.in.in.h:2 +#: ../panel-plugin/indicator.desktop.in.h:2 msgid "Indicator Plugin" -msgstr "Plugin Indicador" - +msgstr "Complemento de indicador" + +#: ../panel-plugin/indicator.c:159 +msgid "Copyright (c) 2009-2013\n" +msgstr "Copyright © 2009–2013\n" + +#: ../panel-plugin/indicator.c:288 +msgid "No Indicators" +msgstr "No hay indicadores" + +#. raw name, pretty name, icon-name(?) +#: ../panel-plugin/indicator-dialog.c:57 +msgid "Application Indicators" +msgstr "Indicadores de aplicación" + +#: ../panel-plugin/indicator-dialog.c:58 +msgid "Sound Menu" +msgstr "Menú de sonido" + +#: ../panel-plugin/indicator-dialog.c:59 +msgid "Printers Menu" +msgstr "Menú de impresoras" + +#: ../panel-plugin/indicator-dialog.c:60 +msgid "Power Management" +msgstr "Gestión de energía" + +#: ../panel-plugin/indicator-dialog.c:61 +msgid "Application Menus (Global Menu)" +msgstr "Menús de aplicación (menú global)" + +#: ../panel-plugin/indicator-dialog.c:62 +msgid "Session Management" +msgstr "Gestión de sesión" + +#: ../panel-plugin/indicator-dialog.c:63 +msgid "Messaging Menu" +msgstr "Menú de mensajería" + +#: ../panel-plugin/indicator-dialog.c:64 +msgid "Date and Time" +msgstr "Fecha y hora" + +#: ../panel-plugin/indicator-dialog.c:436 +msgid "Are you sure you want to clear the list of known indicators?" +msgstr "¿Está seguro de que quiere limpiar la lista de indicadores conocidos?" + +#: ../panel-plugin/indicator-dialog.c:581 +#, c-format +msgid "Unable to open the following url: %s" +msgstr "No se pudo abrir el siguiente URL: %s" + +#: ../panel-plugin/indicator-dialog.glade.h:1 +msgid "Please restart the panel for visibility changes to take effect." +msgstr "" +"Reinicie el panel para que los cambios en la visibilidad surtan efecto." + +#: ../panel-plugin/indicator-dialog.glade.h:2 +msgid "Align left in deskbar mode" +msgstr "Alinear a la izquierda en el modo «deskbar»" + +#: ../panel-plugin/indicator-dialog.glade.h:3 +msgid "Appearance" +msgstr "Apariencia" + +#: ../panel-plugin/indicator-dialog.glade.h:4 +msgid "C_lear known indicators" +msgstr "_Limpiar indicadores conocidos" + +#: ../panel-plugin/indicator-dialog.glade.h:5 +msgid "" +"Controls the indicator button layout when the panel is in a Deskbar mode. " +"Possible choices are \"centered\" or \"aligned left\"." +msgstr "" +"Controla la disposición del botón indicador cuando el panel está en el modo " +"«deskbar». Las opciones posibles son «centrado» o «alineado a la izquierda»." + +#: ../panel-plugin/indicator-dialog.glade.h:6 +msgid "Hidden" +msgstr "Oculto" + +#: ../panel-plugin/indicator-dialog.glade.h:7 +msgid "Hide indicators by default" +msgstr "Ocultar los indicadores de manera predeterminada" + +#: ../panel-plugin/indicator-dialog.glade.h:8 +msgid "" +"Icons are scaled to fit a single row of the panel. Use this option to " +"restrict the maximum size of the icon." +msgstr "" +"Los iconos se redimensionan para que quepan en una sola fila del panel. Use " +"esta opción para restringir el tamaño máximo del icono." + +#: ../panel-plugin/indicator-dialog.glade.h:9 +msgid "Indicator" +msgstr "Indicador" + +#: ../panel-plugin/indicator-dialog.glade.h:10 +msgid "Indicators" +msgstr "Indicadores" + +#: ../panel-plugin/indicator-dialog.glade.h:11 +msgid "Known Indicators" +msgstr "Indicadores conocidos" + +#: ../panel-plugin/indicator-dialog.glade.h:12 +msgid "Move the selected indicator one row down." +msgstr "Mover el indicador seleccionado una fila hacia abajo." + +#: ../panel-plugin/indicator-dialog.glade.h:13 +msgid "Move the selected indicator one row up." +msgstr "Mover el indicador seleccionado una fila hacia arriba." + +#: ../panel-plugin/indicator-dialog.glade.h:14 +msgid "Resets the list of indicators and their visibility settings." +msgstr "Restablece la lista de indicadores y su configuración de visibilidad." + +#: ../panel-plugin/indicator-dialog.glade.h:15 +msgid "Visible" +msgstr "Visible" + +#: ../panel-plugin/indicator-dialog.glade.h:16 +msgid "" +"When enabled, only indicators marked \"Visible\" are shown. Otherwise, all " +"indicators not marked \"Hidden\" are displayed." +msgstr "" +"Cuando se activa, solo se muestran los indicadores marcados como «visibles». " +"Si no, se muestran todos los indicadores no marcados como «ocultos»." + +#: ../panel-plugin/indicator-dialog.glade.h:17 +msgid "_Maximum icon size (px):" +msgstr "Tamaño _máximo de los iconos (px):" === modified file 'po/fr.po' --- po/fr.po 2010-06-13 17:14:30 +0000 +++ po/fr.po 2013-08-14 19:58:39 +0000 @@ -1,31 +1,152 @@ # French translations for xfce4-indicator-plugin -# Traductions franaises de xfce4-indicator-plugin +# Traductions françaises de xfce4-indicator-plugin # Copyright (C) 2009 Mark Trompell # This file is distributed under the same license as the xfce4-indicator-plugin package. # Alexandre Franke , 2009. # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 13:40+0200\n" -"PO-Revision-Date: 2009-06-10 16:25+0200\n" -"Last-Translator: Alexandre Franke \n" +"POT-Creation-Date: 2013-04-06 04:39+0000\n" +"PO-Revision-Date: 2013-04-06 10:01+0100\n" +"Last-Translator: \n" "Language-Team: French\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#. A label to allow for click through -#: ../panel-plugin/indicator.c:209 +"X-Generator: Poedit 1.5.4\n" +"Language: french\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: ../panel-plugin/indicator.desktop.in.h:1 ../panel-plugin/indicator.c:157 +msgid "An indicator of something that needs your attention on the desktop" +msgstr "Un indicateur de quelque chose qui nécessite votre attention" + +#: ../panel-plugin/indicator.desktop.in.h:2 +msgid "Indicator Plugin" +msgstr "Indicateur greffon" + +#: ../panel-plugin/indicator.c:159 +msgid "Copyright (c) 2009-2013\n" +msgstr "Copyright (c) 2009-2013\n" + +#: ../panel-plugin/indicator.c:288 msgid "No Indicators" msgstr "Aucun indicateur" -#: ../panel-plugin/indicator.desktop.in.in.h:1 -msgid "An indicator of something that needs your attention on the desktop" -msgstr "Un indicateur de quelque chose qui ncessite votre attention" - -#: ../panel-plugin/indicator.desktop.in.in.h:2 -msgid "Indicator Plugin" -msgstr "Greffon indicateur" +#. raw name, pretty name, icon-name(?) +#: ../panel-plugin/indicator-dialog.c:57 +msgid "Application Indicators" +msgstr "Indicateur application" + +#: ../panel-plugin/indicator-dialog.c:58 +msgid "Sound Menu" +msgstr "Menu son" + +#: ../panel-plugin/indicator-dialog.c:59 +msgid "Printers Menu" +msgstr "Menu imprimantes" + +#: ../panel-plugin/indicator-dialog.c:60 +msgid "Power Management" +msgstr "Gestion de l'énergie" + +#: ../panel-plugin/indicator-dialog.c:61 +msgid "Application Menus (Global Menu)" +msgstr "Menus application (menu global)" + +#: ../panel-plugin/indicator-dialog.c:62 +msgid "Session Management" +msgstr "Gestion de la session" + +#: ../panel-plugin/indicator-dialog.c:63 +msgid "Messaging Menu" +msgstr "Menu messagerie" + +#: ../panel-plugin/indicator-dialog.c:64 +msgid "Date and Time" +msgstr "Date et heure" + +#: ../panel-plugin/indicator-dialog.c:436 +msgid "Are you sure you want to clear the list of known indicators?" +msgstr "Êtes-vous sûr de vouloir effacer la liste des indicateurs connus ?" + +#: ../panel-plugin/indicator-dialog.c:572 +#, c-format +msgid "Unable to open the following url: %s" +msgstr "Impossible d'ouvrir l'url suivante : %s" + +#: ../panel-plugin/indicator-dialog.glade.h:1 +msgid "Please restart the panel for visibility changes to take effect." +msgstr "" +"S'il vous plaît redémarrer le panneau pour que les changements de " +"visibilité prennent effet." + +#: ../panel-plugin/indicator-dialog.glade.h:2 +msgid "Align left in deskbar mode" +msgstr "Aligner à gauche en mode barre de bureau" + +#: ../panel-plugin/indicator-dialog.glade.h:3 +msgid "Appearance" +msgstr "Apparence" + +#: ../panel-plugin/indicator-dialog.glade.h:4 +msgid "C_lear known indicators" +msgstr "Effacer les indicateur connus" + +#: ../panel-plugin/indicator-dialog.glade.h:5 +msgid "" +"Controls the indicator button layout when the panel is in a Deskbar mode. " +"Possible choices are \"centered\" or \"aligned left\"." +msgstr "" +"Contrôle la disposition des boutons indicateur lorsque le panneau est en " +"mode barre de bureau. Les choix possibles sont « centré » ou « aligné à " +"gauche »." + +#: ../panel-plugin/indicator-dialog.glade.h:6 +msgid "Hide indicators by default" +msgstr "Masquer les indicateurs par défaut" + +#: ../panel-plugin/indicator-dialog.glade.h:7 +msgid "" +"Icons are scaled to fit a single row of the panel. Use this option to " +"restrict the maximum size of the icon." +msgstr "" +"Les icônes sont mis à l'échelle pour s'adapter à une seule rangée de " +"l'écran. Utiliser cette option pour définir la taille maximale de l'icône." + +#: ../panel-plugin/indicator-dialog.glade.h:8 +msgid "Indicators" +msgstr "Indicateurs" + +#: ../panel-plugin/indicator-dialog.glade.h:9 +msgid "Known Indicators" +msgstr "Indicateur connus" + +#: ../panel-plugin/indicator-dialog.glade.h:10 +msgid "Move the selected indicator one row down." +msgstr "Déplacer l'indicateur sélectionné une ligne vers le bas." + +#: ../panel-plugin/indicator-dialog.glade.h:11 +msgid "Move the selected indicator one row up." +msgstr "Déplacer l'indicateur sélectionné une ligne vers le haut." + +#: ../panel-plugin/indicator-dialog.glade.h:12 +msgid "Resets the list of indicators and their visibility settings." +msgstr "" +"Réinitialise la liste des indicateurs et de leurs paramètres de visibilité." + +#: ../panel-plugin/indicator-dialog.glade.h:13 +msgid "" +"When enabled, only indicators marked \"Visible\" are shown. Otherwise, all " +"indicators not marked \"Hidden\" are displayed." +msgstr "" +"Lorsqu'elle est activée, seuls les indicateurs marqués « Visible » sont " +"affichés. Dans le cas contraire, tous les indicateurs non marqués « Caché » " +"sont affichés." + +#: ../panel-plugin/indicator-dialog.glade.h:14 +msgid "_Maximum icon size (px):" +msgstr "Taille maximale d'une icône (pixel) :" === added file 'po/gl.po' --- po/gl.po 1970-01-01 00:00:00 +0000 +++ po/gl.po 2013-08-14 19:58:39 +0000 @@ -0,0 +1,35 @@ +# Galician translation of xfce4-indicator-plugin +# Copyright (C) 2012 Leandro Regueiro +# This file is distributed under the same license as the Xfce package. +# +# Leandro Regueiro , 2012. +# +# Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas +# colaborar connosco, podes atopar máis información en +# +msgid "" +msgstr "" +"Project-Id-Version: xfce4-indicator-plugin\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-05-04 08:30+0000\n" +"PO-Revision-Date: 2012-05-04 12:46+0100\n" +"Last-Translator: Leandro Regueiro \n" +"Language-Team: Galician \n" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../panel-plugin/indicator.c:175 +msgid "No Indicators" +msgstr "Sen indicadores" + +#: ../panel-plugin/indicator.desktop.in.in.h:1 +msgid "An indicator of something that needs your attention on the desktop" +msgstr "Un indicador de algo no escritorio que precisa a súa atención" + +#: ../panel-plugin/indicator.desktop.in.in.h:2 +msgid "Indicator Plugin" +msgstr "Engadido de indicadores" + === modified file 'po/hr.po' --- po/hr.po 2011-07-15 15:27:20 +0000 +++ po/hr.po 2013-08-14 19:58:39 +0000 @@ -2,33 +2,141 @@ # Copyright (C) 2009 Mark Trompell # This file is distributed under the same license as the xfce4-indicator-plugin package. # -# +# msgid "" msgstr "" "Project-Id-Version: xfce-indicator-plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-21 10:19+0000\n" +"POT-Creation-Date: 2013-04-06 04:39+0000\n" "PO-Revision-Date: 2011-05-21 13:02+0100\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Croatian\n" +"X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Country: CROATIA\n" -"X-Poedit-SourceCharset: utf-8\n" - -#: ../panel-plugin/indicator.c:120 -msgid "No Indicators" -msgstr "Nema indikatora" - -#: ../panel-plugin/indicator.desktop.in.in.h:1 + +#: ../panel-plugin/indicator.desktop.in.h:1 ../panel-plugin/indicator.c:157 msgid "An indicator of something that needs your attention on the desktop" msgstr "Indikator nečega što zahtjeva vašu pozornost na radnoj površini" -#: ../panel-plugin/indicator.desktop.in.in.h:2 +#: ../panel-plugin/indicator.desktop.in.h:2 msgid "Indicator Plugin" msgstr "Priključak indikatora" +#: ../panel-plugin/indicator.c:159 +msgid "Copyright (c) 2009-2013\n" +msgstr "" + +#: ../panel-plugin/indicator.c:288 +msgid "No Indicators" +msgstr "Nema indikatora" + +#. raw name, pretty name, +#. icon-name(?) +#: ../panel-plugin/indicator-dialog.c:57 +msgid "Application Indicators" +msgstr "Indikatori programa" + +#: ../panel-plugin/indicator-dialog.c:58 +msgid "Sound Menu" +msgstr "" + +#: ../panel-plugin/indicator-dialog.c:59 +msgid "Printers Menu" +msgstr "" + +#: ../panel-plugin/indicator-dialog.c:60 +msgid "Power Management" +msgstr "" + +#: ../panel-plugin/indicator-dialog.c:61 +msgid "Application Menus (Global Menu)" +msgstr "" + +#: ../panel-plugin/indicator-dialog.c:62 +msgid "Session Management" +msgstr "" + +#: ../panel-plugin/indicator-dialog.c:63 +msgid "Messaging Menu" +msgstr "" + +#: ../panel-plugin/indicator-dialog.c:64 +msgid "Date and Time" +msgstr "" + +#: ../panel-plugin/indicator-dialog.c:436 +msgid "Are you sure you want to clear the list of known indicators?" +msgstr "" + +#: ../panel-plugin/indicator-dialog.c:572 +#, c-format +msgid "Unable to open the following url: %s" +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:1 +msgid "Please restart the panel for visibility changes to take effect." +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:2 +msgid "Align left in deskbar mode" +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:3 +msgid "Appearance" +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:4 +msgid "C_lear known indicators" +msgstr "O_čisti poznate indikatore" + +#: ../panel-plugin/indicator-dialog.glade.h:5 +msgid "" +"Controls the indicator button layout when the panel is in a Deskbar mode. " +"Possible choices are \"centered\" or \"aligned left\"." +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:6 +msgid "Hide indicators by default" +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:7 +msgid "" +"Icons are scaled to fit a single row of the panel. Use this option to " +"restrict the maximum size of the icon." +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:8 +msgid "Indicators" +msgstr "Indikatori" + +#: ../panel-plugin/indicator-dialog.glade.h:9 +msgid "Known Indicators" +msgstr "Poznati indikatori" + +#: ../panel-plugin/indicator-dialog.glade.h:10 +msgid "Move the selected indicator one row down." +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:11 +msgid "Move the selected indicator one row up." +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:12 +msgid "Resets the list of indicators and their visibility settings." +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:13 +msgid "" +"When enabled, only indicators marked \"Visible\" are shown. Otherwise, all " +"indicators not marked \"Hidden\" are displayed." +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:14 +msgid "_Maximum icon size (px):" +msgstr "" === modified file 'po/hu.po' --- po/hu.po 2012-05-05 15:54:41 +0000 +++ po/hu.po 2013-08-14 19:58:39 +0000 @@ -2,31 +2,142 @@ # Copyright (C) 2011. Free Software Foundation, Inc. # This file is distributed under the same license as the xfce4-indicator-plugin package. # -# Gabor Kelemen , 2011. +# Gabor Kelemen , 2011, 2013. msgid "" msgstr "" "Project-Id-Version: xfce4-indicator-plugin master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-04 23:13+0000\n" -"PO-Revision-Date: 2011-11-05 00:59+0100\n" +"POT-Creation-Date: 2013-04-14 16:24+0000\n" +"PO-Revision-Date: 2013-04-15 00:58+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" -"Language: \n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/indicator.c:182 -msgid "No Indicators" -msgstr "Nincsenek indikátorok" - -#: ../panel-plugin/indicator.desktop.in.in.h:1 +#: ../panel-plugin/indicator.desktop.in.h:1 ../panel-plugin/indicator.c:157 msgid "An indicator of something that needs your attention on the desktop" msgstr "Ez az indikátor jelzi, hogy valami a figyelmét igényli az asztalon" -#: ../panel-plugin/indicator.desktop.in.in.h:2 +#: ../panel-plugin/indicator.desktop.in.h:2 msgid "Indicator Plugin" msgstr "Indikátor bővítmény" +#: ../panel-plugin/indicator.c:159 +msgid "Copyright (c) 2009-2013\n" +msgstr "Copyright (c) 2009-2013\n" + +#: ../panel-plugin/indicator.c:288 +msgid "No Indicators" +msgstr "Nincsenek indikátorok" + +#. raw name, pretty name, icon-name(?) +#: ../panel-plugin/indicator-dialog.c:57 +msgid "Application Indicators" +msgstr "Alkalmazásindikátorok" + +#: ../panel-plugin/indicator-dialog.c:58 +msgid "Sound Menu" +msgstr "Hang menü" + +#: ../panel-plugin/indicator-dialog.c:59 +msgid "Printers Menu" +msgstr "Nyomtatók menü" + +#: ../panel-plugin/indicator-dialog.c:60 +msgid "Power Management" +msgstr "Energiagazdálkodás" + +#: ../panel-plugin/indicator-dialog.c:61 +msgid "Application Menus (Global Menu)" +msgstr "Alkalmazásmenük (globális menü)" + +#: ../panel-plugin/indicator-dialog.c:62 +msgid "Session Management" +msgstr "Munkamenet-kezelés" + +#: ../panel-plugin/indicator-dialog.c:63 +msgid "Messaging Menu" +msgstr "Üzenetkezelési menü" + +#: ../panel-plugin/indicator-dialog.c:64 +msgid "Date and Time" +msgstr "Dátum és idő" + +#: ../panel-plugin/indicator-dialog.c:436 +msgid "Are you sure you want to clear the list of known indicators?" +msgstr "Biztos törölni akarja az ismert indikátorok listáját?" + +#: ../panel-plugin/indicator-dialog.c:572 +#, c-format +msgid "Unable to open the following url: %s" +msgstr "Nem nyitható meg a következő URL: %s" + +#: ../panel-plugin/indicator-dialog.glade.h:1 +msgid "Please restart the panel for visibility changes to take effect." +msgstr "" +"Indítsa újra a panelt a láthatósági változások életbe lépéséhez." + +#: ../panel-plugin/indicator-dialog.glade.h:2 +msgid "Align left in deskbar mode" +msgstr "Balra igazítás asztali sáv módban" + +#: ../panel-plugin/indicator-dialog.glade.h:3 +msgid "Appearance" +msgstr "Megjelenés" + +#: ../panel-plugin/indicator-dialog.glade.h:4 +msgid "C_lear known indicators" +msgstr "_Ismert indikátorok törlése" + +#: ../panel-plugin/indicator-dialog.glade.h:5 +msgid "" +"Controls the indicator button layout when the panel is in a Deskbar mode. " +"Possible choices are \"centered\" or \"aligned left\"." +msgstr "" +"Az indikátor gombelrendezést vezérli amikor a panel asztali sáv módban van. A " +"lehetséges értékek a „középre igazított” és a „balra igazított”." + +#: ../panel-plugin/indicator-dialog.glade.h:6 +msgid "Hide indicators by default" +msgstr "Indikátorok elrejtése alapértelmezésben" + +#: ../panel-plugin/indicator-dialog.glade.h:7 +msgid "" +"Icons are scaled to fit a single row of the panel. Use this option to " +"restrict the maximum size of the icon." +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:8 +msgid "Indicators" +msgstr "Indikátorok" + +#: ../panel-plugin/indicator-dialog.glade.h:9 +msgid "Known Indicators" +msgstr "Ismert indikátorok" + +#: ../panel-plugin/indicator-dialog.glade.h:10 +msgid "Move the selected indicator one row down." +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:11 +msgid "Move the selected indicator one row up." +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:12 +msgid "Resets the list of indicators and their visibility settings." +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:13 +msgid "" +"When enabled, only indicators marked \"Visible\" are shown. Otherwise, all " +"indicators not marked \"Hidden\" are displayed." +msgstr "" + +#: ../panel-plugin/indicator-dialog.glade.h:14 +msgid "_Maximum icon size (px):" +msgstr "_Maximális ikonméret (képpont):" + === modified file 'po/it.po' --- po/it.po 2011-07-15 15:27:20 +0000 +++ po/it.po 2013-08-14 19:58:39 +0000 @@ -3,32 +3,147 @@ # Copyright (C) 2009 Mark Trompell # This file is distributed under the same license as the xfce4-indicator-plugin package. # Cristian Marchi , 2011" -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-indicator-plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-29 04:19+0000\n" +"POT-Creation-Date: 2013-04-07 07:24+0000\n" "PO-Revision-Date: 2011-05-29 11:44+0100\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: it\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Language: Italian\n" +"X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Country: ITALY\n" -"X-Poedit-SourceCharset: utf-8\n" - -#: ../panel-plugin/indicator.c:119 -msgid "No Indicators" -msgstr "Nessun indicatore" - -#: ../panel-plugin/indicator.desktop.in.in.h:1 + +#: ../panel-plugin/indicator.desktop.in.h:1 ../panel-plugin/indicator.c:157 msgid "An indicator of something that needs your attention on the desktop" msgstr "Un indicatore per qualsiasi cosa richieda attenzione sulla scrivania" -#: ../panel-plugin/indicator.desktop.in.in.h:2 +#: ../panel-plugin/indicator.desktop.in.h:2 msgid "Indicator Plugin" msgstr "Plugin indicatore" +#: ../panel-plugin/indicator.c:159 +msgid "Copyright (c) 2009-2013\n" +msgstr "Copyright (c) 2009-2013\n" + +#: ../panel-plugin/indicator.c:288 +msgid "No Indicators" +msgstr "Nessun indicatore" + +#. raw name, pretty name, +#. icon-name(?) +#: ../panel-plugin/indicator-dialog.c:57 +msgid "Application Indicators" +msgstr "Indicatori applicazione" + +#: ../panel-plugin/indicator-dialog.c:58 +msgid "Sound Menu" +msgstr "Menu suono" + +#: ../panel-plugin/indicator-dialog.c:59 +msgid "Printers Menu" +msgstr "Menu stampanti" + +#: ../panel-plugin/indicator-dialog.c:60 +msgid "Power Management" +msgstr "Gestione dell'energia" + +#: ../panel-plugin/indicator-dialog.c:61 +msgid "Application Menus (Global Menu)" +msgstr "Menu applicazione (menu globale)" + +#: ../panel-plugin/indicator-dialog.c:62 +msgid "Session Management" +msgstr "Gestione sessione" + +#: ../panel-plugin/indicator-dialog.c:63 +msgid "Messaging Menu" +msgstr "Menu messaggistica" + +#: ../panel-plugin/indicator-dialog.c:64 +msgid "Date and Time" +msgstr "Data e ora" + +#: ../panel-plugin/indicator-dialog.c:436 +msgid "Are you sure you want to clear the list of known indicators?" +msgstr "Svuotare davvero l'elenco degli indicatori conosciuti?" + +#: ../panel-plugin/indicator-dialog.c:572 +#, c-format +msgid "Unable to open the following url: %s" +msgstr "Impossibile aprire il seguente indirizzo: %s" + +#: ../panel-plugin/indicator-dialog.glade.h:1 +msgid "Please restart the panel for visibility changes to take effect." +msgstr "" +"Riavviare il pannello per rendere effettive le modifiche di visibilità" + +#: ../panel-plugin/indicator-dialog.glade.h:2 +msgid "Align left in deskbar mode" +msgstr "Allinea a sinistra in modalità deskbar" + +#: ../panel-plugin/indicator-dialog.glade.h:3 +msgid "Appearance" +msgstr "Aspetto" + +#: ../panel-plugin/indicator-dialog.glade.h:4 +msgid "C_lear known indicators" +msgstr "Elimina gli indicatori conosci_uti" + +#: ../panel-plugin/indicator-dialog.glade.h:5 +msgid "" +"Controls the indicator button layout when the panel is in a Deskbar mode. " +"Possible choices are \"centered\" or \"aligned left\"." +msgstr "Controlla il posizionamento di pulsante dell'indicatore quando il pannello è nella modalità deskbar; le scelte disponibili sono \"centrato\" o \"allineato a sinistra\"" + +#: ../panel-plugin/indicator-dialog.glade.h:6 +msgid "Hide indicators by default" +msgstr "Nascondi gli indicatori" + +#: ../panel-plugin/indicator-dialog.glade.h:7 +msgid "" +"Icons are scaled to fit a single row of the panel. Use this option to " +"restrict the maximum size of the icon." +msgstr "" +"Le icone sono scalate per adattarsi a una singola riga del pannello. Usare " +"questa opzione per diminuire la dimensione dell'icona" + +#: ../panel-plugin/indicator-dialog.glade.h:8 +msgid "Indicators" +msgstr "Indicatori" + +#: ../panel-plugin/indicator-dialog.glade.h:9 +msgid "Known Indicators" +msgstr "Indicatori conosciuti" + +#: ../panel-plugin/indicator-dialog.glade.h:10 +msgid "Move the selected indicator one row down." +msgstr "Sposta l'indicatore selezionato alla riga sotto" + +#: ../panel-plugin/indicator-dialog.glade.h:11 +msgid "Move the selected indicator one row up." +msgstr "Sposta l'indicatore selezionato alla riga sopra" + +#: ../panel-plugin/indicator-dialog.glade.h:12 +msgid "Resets the list of indicators and their visibility settings." +msgstr "Ripristina l'elenco degli indicatori e la loro visibilità." + +#: ../panel-plugin/indicator-dialog.glade.h:13 +msgid "" +"When enabled, only indicators marked \"Visible\" are shown. Otherwise, all " +"indicators not marked \"Hidden\" are displayed." +msgstr "" +"Se abilitata, solo gli indicatori marcati come \"Visibili\" verranno " +"mostrati. Diversamente verranno visualizzati solo quelli marcati come " +"\"Nascosti\"" + +#: ../panel-plugin/indicator-dialog.glade.h:14 +msgid "_Maximum icon size (px):" +msgstr "_Dimensione massima dell'icona (px):" === added file 'po/ja.po' --- po/ja.po 1970-01-01 00:00:00 +0000 +++ po/ja.po 2013-08-14 19:58:39 +0000 @@ -0,0 +1,145 @@ +# Japanese translations for xfce4-indicator-plugin package +# xfce4-indicator-plugin パッケージに対する英訳. +# Copyright (C) 2013 THE xfce4-indicator-plugin'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xfce4-indicator-plugin package. +# Masato HASHIMOTO , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: xfce4-indicator-plugin 0.5.0git-2052561\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-04-13 22:02+0900\n" +"PO-Revision-Date: 2013-04-13 22:04+0900\n" +"Last-Translator: Masato HASHIMOTO \n" +"Language-Team: Japanese\n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../panel-plugin/indicator.desktop.in.h:1 +msgid "Indicator Plugin" +msgstr "インジケータープラグイン" + +#: ../panel-plugin/indicator.desktop.in.h:2 ../panel-plugin/indicator.c:157 +msgid "An indicator of something that needs your attention on the desktop" +msgstr "デスクトップ上であなたの注目を引きたいなにがしかのインジケーターです" + +#: ../panel-plugin/indicator.c:159 +msgid "Copyright (c) 2009-2013\n" +msgstr "Copyright (c) 2009-2013\n" + +#: ../panel-plugin/indicator.c:288 +msgid "No Indicators" +msgstr "インジケーターなし" + +#. raw name, pretty name, icon-name(?) +#: ../panel-plugin/indicator-dialog.c:57 +msgid "Application Indicators" +msgstr "アプリケーションインジケーター" + +#: ../panel-plugin/indicator-dialog.c:58 +msgid "Sound Menu" +msgstr "サウンドメニュー" + +#: ../panel-plugin/indicator-dialog.c:59 +msgid "Printers Menu" +msgstr "プリンターメニュー" + +#: ../panel-plugin/indicator-dialog.c:60 +msgid "Power Management" +msgstr "電源管理" + +#: ../panel-plugin/indicator-dialog.c:61 +msgid "Application Menus (Global Menu)" +msgstr "アプリケーションメニュー (グローバルメニュー)" + +#: ../panel-plugin/indicator-dialog.c:62 +msgid "Session Management" +msgstr "セッション管理" + +#: ../panel-plugin/indicator-dialog.c:63 +msgid "Messaging Menu" +msgstr "メッセージングメニュー" + +#: ../panel-plugin/indicator-dialog.c:64 +msgid "Date and Time" +msgstr "日付と時刻" + +#: ../panel-plugin/indicator-dialog.c:436 +msgid "Are you sure you want to clear the list of known indicators?" +msgstr "既知のインジケーターのリストをクリアしてよろしいですか?" + +#: ../panel-plugin/indicator-dialog.c:572 +#, c-format +msgid "Unable to open the following url: %s" +msgstr "次の URL を開けません: %s" + +#: ../panel-plugin/indicator-dialog.glade.h:1 +msgid "Indicators" +msgstr "インジケーター" + +#: ../panel-plugin/indicator-dialog.glade.h:2 +msgid "_Maximum icon size (px):" +msgstr "最大アイコンサイズ (px)(_M):" + +#: ../panel-plugin/indicator-dialog.glade.h:3 +msgid "Icons are scaled to fit a single row of the panel. Use this option to restrict the maximum size of the icon." +msgstr "アイコンはパネルの 1 行に合わせて拡大縮小します。このオプションでアイコンの最大サイズを制限できます。" + +#: ../panel-plugin/indicator-dialog.glade.h:4 +msgid "Align left in deskbar mode" +msgstr "デスクバーモードで左に寄せる" + +#: ../panel-plugin/indicator-dialog.glade.h:5 +msgid "Controls the indicator button layout when the panel is in a Deskbar mode. Possible choices are \"centered\" or \"aligned left\"." +msgstr "パネルがデスクバーモードの時のインジケーターボタンのレイアウトを制御します。\"中央揃え\" か \"左寄せ\" を選択出来ます。" + +#: ../panel-plugin/indicator-dialog.glade.h:6 +msgid "Appearance" +msgstr "外観" + +#: ../panel-plugin/indicator-dialog.glade.h:7 +msgid "Hide indicators by default" +msgstr "デフォルトでインジケーターを表示しない" + +#: ../panel-plugin/indicator-dialog.glade.h:8 +msgid "When enabled, only indicators marked \"Visible\" are shown. Otherwise, all indicators not marked \"Hidden\" are displayed." +msgstr "このオプションを有効にすると、\"表示\" 指定されたインジケーターのみ表示します。無効にすると、\"非表示\" 指定されたものを除く全インジケーターが表示されます。" + +#: ../panel-plugin/indicator-dialog.glade.h:9 +msgid "Indicator" +msgstr "インジケーター" + +#: ../panel-plugin/indicator-dialog.glade.h:10 +msgid "Hidden" +msgstr "非表示" + +#: ../panel-plugin/indicator-dialog.glade.h:11 +msgid "Visible" +msgstr "表示" + +#: ../panel-plugin/indicator-dialog.glade.h:12 +msgid "Move the selected indicator one row up." +msgstr "選択したインジケーターを 1 行上に移動します。" + +#: ../panel-plugin/indicator-dialog.glade.h:13 +msgid "Move the selected indicator one row down." +msgstr "選択したインジケーターを 1 行下に移動します。" + +#: ../panel-plugin/indicator-dialog.glade.h:14 +msgid "Please restart the panel for visibility changes to take effect." +msgstr "表示上の変更を即座に反映させたい場合はパネルを再起動してください。" + +#: ../panel-plugin/indicator-dialog.glade.h:15 +msgid "C_lear known indicators" +msgstr "既知のインジケーターのクリア(_L)" + +#: ../panel-plugin/indicator-dialog.glade.h:16 +msgid "Resets the list of indicators and their visibility settings." +msgstr "インジケーターのリストとそれらの表示設定をリセットします。" + +#: ../panel-plugin/indicator-dialog.glade.h:17 +msgid "Known Indicators" +msgstr "既知のインジケーター" === modified file 'po/ko.po' --- po/ko.po 2012-05-05 15:54:41 +0000 +++ po/ko.po 2013-08-14 19:58:39 +0000 @@ -1,34 +1,146 @@ # Korean translation for the xfce4-indicator-plugin package. # Copyright (C) 2009-2012 Mark Trompell et al. # This file is distributed under the same license as the xfce4-indicator-plugin package. -# Seong-ho, Cho , 2012. +# Seong-ho Cho , 2012, 2013 # msgid "" msgstr "" "Project-Id-Version: xfce4-indicator-plugin\n" -"Report-Msgid-Bugs-To: xfce4-users-kr-i18n \n" -"POT-Creation-Date: 2012-02-28 04:06+0000\n" -"PO-Revision-Date: 2012-02-28 19:02+0900\n" -"Last-Translator: Seong-ho, Cho \n" -"Language-Team: xfce4-users-kr-i18n \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-04-12 15:48+0000\n" +"PO-Revision-Date: 2013-04-13 01:34+0900\n" +"Last-Translator: Seong-ho Cho \n" +"Language-Team: xfce-i18n \n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Poedit-Language: Korean\n" -"X-Poedit-Country: KOREA, REPUBLIC OF\n" "X-Poedit-SourceCharset: utf-8\n" - -#: ../panel-plugin/indicator.c:182 -msgid "No Indicators" -msgstr "표시기 없음" - -#: ../panel-plugin/indicator.desktop.in.in.h:1 +"X-Generator: Poedit 1.5.5\n" + +#: ../panel-plugin/indicator.desktop.in.h:1 ../panel-plugin/indicator.c:157 msgid "An indicator of something that needs your attention on the desktop" -msgstr "데스크톱에서 주목할 필요가 있는 것에 대한 표시기" +msgstr "데스크톱에서 주목해야 하는 요소를 표시합니다" -#: ../panel-plugin/indicator.desktop.in.in.h:2 +#: ../panel-plugin/indicator.desktop.in.h:2 msgid "Indicator Plugin" msgstr "표시기 플러그인" +#: ../panel-plugin/indicator.c:159 +msgid "Copyright (c) 2009-2013\n" +msgstr "Copyright (c) 2009-2013\n" + +#: ../panel-plugin/indicator.c:288 +msgid "No Indicators" +msgstr "표시기 없음" + +#. raw name, pretty name, icon-name(?) +#: ../panel-plugin/indicator-dialog.c:57 +msgid "Application Indicators" +msgstr "프로그램 표시기" + +#: ../panel-plugin/indicator-dialog.c:58 +msgid "Sound Menu" +msgstr "사운드 메뉴" + +#: ../panel-plugin/indicator-dialog.c:59 +msgid "Printers Menu" +msgstr "프린터 메뉴" + +#: ../panel-plugin/indicator-dialog.c:60 +msgid "Power Management" +