--- gnome-panel-2.18.0.orig/debian/rules +++ gnome-panel-2.18.0/debian/rules @@ -0,0 +1,48 @@ +#!/usr/bin/make -f + +# Gnome Team +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk + +include /usr/share/cdbs/1/rules/debhelper.mk +# Including this file gets us a simple patch system. You can just +# drop patches in debian/patches, and they will be automatically +# applied and unapplied. +include /usr/share/cdbs/1/rules/simple-patchsys.mk +# Including this gives us a number of rules typical to a GNOME +# program, including setting GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1. +# Note that this class inherits from autotools.mk and docbookxml.mk, +# so you don't need to include those too. +include /usr/share/cdbs/1/class/gnome.mk + +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed" +DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper --with-in-process-applets=all +ifneq ($(DEB_BUILD_GNU_SYSTEM),gnu) + DEB_CONFIGURE_EXTRA_FLAGS += --enable-eds +endif + +# tight versioning +DEB_NOREVISION_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-[^-]*$$/\1/p') +DEB_DH_MAKESHLIBS_ARGS_libpanel-applet2-0 := -V"libpanel-applet2-0 (>= $(DEB_NOREVISION_VERSION))" +DEB_SHLIBDEPS_LIBRARY_gnome-panel:= libpanel-applet2-0 +DEB_SHLIBDEPS_INCLUDE_gnome-panel := debian/libpanel-applet2-0/usr/lib/ + + +binary-install/gnome-panel:: + chmod a+x debian/gnome-panel/usr/lib/gnome-panel/* + cd po; intltool-update -p --verbose + +binary-install/gnome-panel-data:: + chmod a+x debian/gnome-panel-data/etc/menu-methods/gnome-panel-data + find debian/gnome-panel-data/usr/share -type f -exec chmod -R a-x {} \; + cp debian/panel-default-setup-laptop.entries debian/gnome-panel-data/usr/share/gconf/schemas/ + uudecode debian/application-default-icon.png.uue -o debian/application-default-icon.png + mkdir -p debian/gnome-panel-data/usr/share/icons + cp debian/application-default-icon.png debian/gnome-panel-data/usr/share/icons/ + +binary-install/libpanel-applet2-doc:: + find debian/libpanel-applet2-doc/usr/share/doc/libpanel-applet2-doc/ -name ".arch-ids" -depth -exec rm -rf {} \; + +clean:: + # GNOME Team 'uploaders.mk' should not override this behavior, here is a workarround : + sed -i "s/@cdbs@/$(CDBS_BUILD_DEPENDS)/g" debian/control + -rm -f debian/application-default-icon.png --- gnome-panel-2.18.0.orig/debian/gnome-panel.install +++ gnome-panel-2.18.0/debian/gnome-panel.install @@ -0,0 +1,8 @@ +debian/tmp/usr/bin usr/ +debian/tmp/usr/lib/gnome-panel/ usr/lib/ +debian/tmp/usr/lib/gnome-panel/libfish-applet-2.so +debian/tmp/usr/lib/gnome-panel/libfish-applet-2.so.0.* +debian/tmp/usr/lib/gnome-panel/libnotification-area-applet.so +debian/tmp/usr/lib/gnome-panel/libnotification-area-applet.so.0.* +debian/tmp/usr/lib/gnome-panel/libwnck-applet.so +debian/tmp/usr/lib/gnome-panel/libwnck-applet.so.0.* --- gnome-panel-2.18.0.orig/debian/gnome-panel-data.menu-method.experimental +++ gnome-panel-2.18.0/debian/gnome-panel-data.menu-method.experimental @@ -0,0 +1,71 @@ +#!/usr/bin/install-menu +compat="menu-1" + +!include menu.h + +function findicon($filename)= \ + ifelsefile($filename, $filename, \ + iffile("/usr/X11R6/include/X11/pixmaps/" $filename, \ + "/usr/X11R6/include/X11/pixmaps/" $filename)) + +function AppEntry($var)= \ + "[Desktop Entry]\n" \ + "Encoding=UTF-8\n" \ + "Name=" title() "\n" \ + "Comment=" ifelse($longtitle,$longtitle,"") "\n" \ + "Exec=" $command "\n" \ + $var \ + ifnempty($icon,"Icon=" findicon($icon) "\n") \ + "Type=Application\n" \ + "Categories=Application" replacewith($basesection, "/", ";") ";\n" + +# To add a default icon if no icon are provided (ugly) +# ifelse($icon,"Icon="findicon($icon) "\n","Icon=gnome-debian.png\n") \ + +#function SubmenuEntry()= \ +# "[Desktop Entry]\n" \ +# "Name=" $title "\n" \ +# "Icon=gnome-fs-directory\n" \ +# "Type=Directory\n" + +supported + x11= AppEntry("Terminal=false\n") + text= AppEntry("Terminal=true\n") +endsupported + +#genmenu=ifeqelse(parent($title),"",parent($section),parent(parent($section))) "/" replacewith($title,"/","_") ifeqelse($needs, "", "/.directory", ".desktop") "" + +#genmenu=ifeqelse(parent($title),"",parent($section),\ +#parent(parent($section))) "/" replacewith($title,"/","_")\ +#ifeqelse($needs, "", +# "/.directory", +# ".desktop") "" + +#genmenu=ifelse($needs, "Debian_"$title".desktop", "") + +genmenu=ifelse($needs, $title".desktop", "") + +startmenu="" +endmenu="" + +rootsection="" + +rootprefix="/var/lib/gnome/Debian/" + +#rootprefix="/usr/share/applications/" + +userprefix=".gnome/apps" + +treewalk="M" + +#submenutitle="SUBMENUTITLE section=[" $section "] title=[" $title "]" + +#submenutitle=SubmenuEntry() + +prerun="rm -f " prefix() "/*" + +#prerun="rm -f " prefix() "/Debian_*" + +preoutput="" + +outputencoding="UTF-8" --- gnome-panel-2.18.0.orig/debian/README.Debian +++ gnome-panel-2.18.0/debian/README.Debian @@ -0,0 +1,18 @@ +gnome-panel for Debian +---------------------- + + +--- vfolder user menu --- +(Thanks to Bill Allombert) + +If you want to get a customisable copy of the Debian menu, +you just need to to the following : + 1) apt-get install menu-xdg + 2) chmod +x /etc/menu-methods/gnome-vfolder-user + 3) put your custom menu file in ~/.menu/ + 4) run update-menus as user (and rerun it each time you + make modifications to your menu files) + + + -- Marc Dequènes (Duck) Fri, 11 Mar 2005 02:59:43 +0100 + --- gnome-panel-2.18.0.orig/debian/maintfiles/changelog_unreleased +++ gnome-panel-2.18.0/debian/maintfiles/changelog_unreleased @@ -0,0 +1,2 @@ + + modified gnomezilla patch to fix opening evolution at the selected + date (also partially fix opening tasks) (Closes: #272777). --- gnome-panel-2.18.0.orig/debian/maintfiles/09_open_drawers_on_right_screen.patch.NOTWORKING +++ gnome-panel-2.18.0/debian/maintfiles/09_open_drawers_on_right_screen.patch.NOTWORKING @@ -0,0 +1,17 @@ +diff -p -u -5 -r1.82 panel-toplevel.c +--- gnome-panel/gnome-panel/panel-toplevel.c 2004/12/22 18:09:19 1.82 ++++ gnome-panel/gnome-panel/panel-toplevel.c 2005/01/06 04:12:41 +@@ -2468,10 +2468,13 @@ panel_toplevel_attach_to_widget (PanelTo + panel_toplevel_reverse_arrows (toplevel); + panel_toplevel_set_expand (toplevel, FALSE); + panel_toplevel_update_attach_orientation (toplevel); + panel_toplevel_update_hide_buttons (toplevel); + ++ gtk_window_set_screen (GTK_WINDOW (toplevel), ++ gtk_widget_get_screen (GTK_WIDGET (toplevel->priv->attach_toplevel))); ++ + if (toplevel->priv->state == PANEL_STATE_NORMAL) + panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel); + + gtk_widget_queue_resize (GTK_WIDGET (toplevel)); + } --- gnome-panel-2.18.0.orig/debian/maintfiles/improved_open_recent_doc_in_term.patch.NEEDTESTING +++ gnome-panel-2.18.0/debian/maintfiles/improved_open_recent_doc_in_term.patch.NEEDTESTING @@ -0,0 +1,34 @@ +--- gnome-panel/panel-recent.c.orig 2005-01-26 00:32:36.000000000 +0100 ++++ gnome-panel/panel-recent.c 2005-01-26 00:39:22.000000000 +0100 +@@ -49,6 +49,8 @@ + char *path; + char *quoted; + gboolean ret = TRUE; ++ GConfClient *client; ++ gchar *terminal_exec, *terminal_exec_arg; + + /* Don't allow suspicious looking URIs */ + if (uri [0] == '-') +@@ -62,13 +64,18 @@ + return FALSE; + } + ++ + str = g_string_new (""); + + if (app->requires_terminal) { +- /* FIXME: we should use their preferred terminal +- * maybe a multiscreen variant of gnome_execcute_terminal_shell? +- */ +- g_string_append_printf (str, "gnome-terminal -x %s", app->command); ++ client = panel_gconf_get_client (); ++ terminal_exec = gconf_client_get_string(client, "/desktop/gnome/applications/terminal/exec", NULL); ++ terminal_exec_arg = gconf_client_get_string(client, "/desktop/gnome/applications/terminal/exec_arg", NULL); ++ ++ g_string_append_printf (str, "%s %s %s", terminal_exec, terminal_exec_arg, app->command); ++ ++ g_free(terminal_exec); ++ g_free(terminal_exec_arg); + } else + str = g_string_append (str, app->command); + --- gnome-panel-2.18.0.orig/debian/maintfiles/clock_applet_evo_open.patch +++ gnome-panel-2.18.0/debian/maintfiles/clock_applet_evo_open.patch @@ -0,0 +1,200 @@ +diff -u -r1.10 calendar-client.c +--- applets/clock/calendar-client.c 31 Aug 2004 08:18:34 -0000 1.10 ++++ applets/clock/calendar-client.c 27 Dec 2004 09:07:15 -0000 +@@ -529,18 +529,6 @@ + return g_strdup (icalproperty_get_description (prop)); + } + +-static char * +-get_ical_url (icalcomponent *ical) +-{ +- icalproperty *prop; +- +- prop = icalcomponent_get_first_property (ical, ICAL_URL_PROPERTY); +- if (!prop) +- return NULL; +- +- return g_strdup (icalproperty_get_url (prop)); +-} +- + static inline GTime + get_ical_start_time (icalcomponent *ical, + icaltimezone *default_zone) +@@ -832,7 +820,6 @@ + null_safe_strcmp (a->summary, b->summary) == 0 && + null_safe_strcmp (a->description, b->description) == 0 && + null_safe_strcmp (a->color_string, b->color_string) == 0 && +- null_safe_strcmp (a->url, b->url) == 0 && + a->start_time == b->start_time && + a->due_time == b->due_time && + a->percent_complete == b->percent_complete && +@@ -850,7 +837,6 @@ + task_copy->summary = g_strdup (task->summary); + task_copy->description = g_strdup (task->description); + task_copy->color_string = g_strdup (task->color_string); +- task_copy->url = g_strdup (task->url); + task_copy->start_time = task->start_time; + task_copy->due_time = task->due_time; + task_copy->percent_complete = task->percent_complete; +@@ -872,9 +858,6 @@ + g_free (task->color_string); + task->color_string = NULL; + +- g_free (task->url); +- task->url = NULL; +- + task->percent_complete = 0; + } + +@@ -888,7 +871,6 @@ + task->summary = get_ical_summary (ical); + task->description = get_ical_description (ical); + task->color_string = get_source_color (source->source); +- task->url = get_ical_url (ical); + task->start_time = get_ical_start_time (ical, default_zone); + task->due_time = get_ical_due_time (ical, default_zone); + task->percent_complete = get_ical_percent_complete (ical); +@@ -1980,25 +1962,3 @@ + e_cal_modify_object (esource, ical, CALOBJ_MOD_ALL, NULL); + } + +-gboolean +-calendar_client_launch_editor (CalendarClient *client, +- CalendarEventType event_type, +- GdkScreen *screen, +- GError **error) +-{ +- char *command_line; +- gboolean retval; +- +- g_return_val_if_fail (CALENDAR_IS_CLIENT (client), FALSE); +- g_return_val_if_fail (event_type == CALENDAR_EVENT_APPOINTMENT || +- event_type == CALENDAR_EVENT_TASK, FALSE); +- +- command_line = g_strdup_printf ("evolution -c %s", +- event_type == CALENDAR_EVENT_APPOINTMENT ? "calendar" : "tasks"); +- +- retval = gdk_spawn_command_line_on_screen (screen, command_line, error); +- +- g_free (command_line); +- +- return retval; +-} +diff -u -r1.4 calendar-client.h +--- applets/clock/calendar-client.h 19 Jul 2004 19:11:14 -0000 1.4 ++++ applets/clock/calendar-client.h 27 Dec 2004 09:07:15 -0000 +@@ -27,7 +27,6 @@ + #define __CALENDAR_CLIENT_H__ + + #include +-#include + + G_BEGIN_DECLS + +@@ -90,7 +89,6 @@ + char *summary; + char *description; + char *color_string; +- char *url; + GTime start_time; + GTime due_time; + guint percent_complete; +@@ -139,10 +137,6 @@ + char *task_uid, + gboolean task_completed, + guint percent_complete); +-gboolean calendar_client_launch_editor (CalendarClient *client, +- CalendarEventType event_type, +- GdkScreen *screen, +- GError **error); + + void calendar_event_free (CalendarEvent *event); + +--- applets/clock/clock.c 2005-01-25 01:37:50.000000000 +0100 ++++ applets/clock/clock.c.mod 2005-01-25 01:42:25.000000000 +0100 +@@ -545,7 +545,6 @@ + TASK_COLUMN_COMPLETED_TIME, + TASK_COLUMN_OVERDUE_ATTR, + TASK_COLUMN_COLOR, +- TASK_COLUMN_URL, + N_TASK_COLUMNS + }; + +@@ -625,7 +624,6 @@ + TASK_COLUMN_COMPLETED, task->percent_complete == 100, + TASK_COLUMN_COMPLETED_TIME, task->completed_time, + TASK_COLUMN_COLOR, task->color_string, +- TASK_COLUMN_URL, task->url, + -1); + + g_free (percent_complete_text); +@@ -808,17 +806,21 @@ + GtkTreeViewColumn *column, + ClockData *cd) + { +- GError *err = NULL; + GtkTreeIter iter; +- char *uri; +- ++ gchar *command_line; ++ gchar *uid; ++ + gtk_tree_model_get_iter (GTK_TREE_MODEL (cd->tasks_model), &iter, path); + gtk_tree_model_get (GTK_TREE_MODEL (cd->tasks_model), &iter, +- TASK_COLUMN_URL, &uri, -1); +- +- if (uri) +- gnome_url_show (uri, &err); +- ++ TASK_COLUMN_UID, &uid, -1); ++ ++ command_line = g_strdup_printf ("evolution task:%s", uid); ++ ++ gdk_spawn_command_line_on_screen (gtk_widget_get_screen (cd->calendar), command_line, NULL); ++ ++ g_free (command_line); ++ g_free (uid); ++ + return TRUE; + } + +@@ -909,7 +911,6 @@ + G_TYPE_LONG, /* completed time */ + PANGO_TYPE_ATTR_LIST, /* summary text attributes */ + G_TYPE_STRING, /* color */ +- G_TYPE_STRING /* url */ + }; + + cd->tasks_model = gtk_list_store_newv (N_TASK_COLUMNS, column_types); +@@ -1137,14 +1138,23 @@ + + static void + calendar_day_activated (ClockData *cd) +-{ +- /* FIXME: should be able to launch the editor for +- * the specific day +- */ +- calendar_client_launch_editor (cd->client, +- CALENDAR_EVENT_APPOINTMENT, +- gtk_widget_get_screen (cd->calendar), +- NULL); ++{ ++ guint day; ++ guint year; ++ guint month; ++ ++ GDate *date; ++ gchar command_line[40]; ++ ++ gtk_calendar_get_date (GTK_CALENDAR(cd->calendar), &year, &month, &day); ++ date = g_date_new (); ++ g_date_set_dmy (date, day, month + 1, year); ++ ++ g_date_strftime (command_line, sizeof (command_line), "evolution -c calendar date:%x", date); ++ gdk_spawn_command_line_on_screen (gtk_widget_get_screen (cd->calendar), command_line, NULL); ++ g_date_free (date); ++ ++ return; + } + + static void --- gnome-panel-2.18.0.orig/debian/changelog +++ gnome-panel-2.18.0/debian/changelog @@ -0,0 +1,2130 @@ +gnome-panel (2.18.0-0ubuntu3) feisty; urgency=low + + * debian/patches/01_layout.patch: + - added Edubuntu docs entry. + * debian/control.in: + - dropped duplicate libgnome-menu-dev Build-Dep. + + -- Daniel Holbach Mon, 26 Mar 2007 18:31:44 +0200 + +gnome-panel (2.18.0-0ubuntu2) feisty; urgency=low + + * debian/control, debian/rules: + - don't list libpanel-applet2-0-dbg, fix gnome-panel having no + .gnu_debuglink set and gdb not loading the debug symbols then + + -- Sebastien Bacher Wed, 14 Mar 2007 13:04:12 +0100 + +gnome-panel (2.18.0-0ubuntu1) feisty; urgency=low + + * New upstream version: + Panel: + - Fix large height of the menubar, which forced the panel size to + be at least 28. + - Fix alignment of widgets in the Run button (Ubuntu: #89421) + Clock Applet: + - Fix crash when using internet time (Ubuntu: #88939) + Misc: + - Add a .desktop file for bug-buddy integration + - Require pango 1.15.4 for the clock applet too + * debian/patches/12_autoconf.patch: + - updated + * debian/patches/90_from_svn_fix_panel_width_when_using_menu.patch: + - dropped, fixed with the new version + + -- Sebastien Bacher Tue, 13 Mar 2007 00:49:32 +0100 + +gnome-panel (2.17.92-0ubuntu4) feisty; urgency=low + + * debian/patches/17_change_socket_directory.patch: + - use the correct location and updated logic to use the new path, + fix upstream session mode (Ubuntu: #85340) + + -- Sebastien Bacher Mon, 5 Mar 2007 19:16:41 +0100 + +gnome-panel (2.17.92-0ubuntu3) feisty; urgency=low + + * debian/panel-default-setup-laptop.entries: + - don't list wireless applet to the default profile to not duplicate the + feature with network-manager (Ubuntu: #82825) + * debian/patches/17_change_socket_directory.patch: + - updated gdm socket path, useful for upstream mode + + -- Sebastien Bacher Wed, 28 Feb 2007 12:36:06 +0100 + +gnome-panel (2.17.92-0ubuntu2) feisty; urgency=low + + * debian/patches/90_from_svn_fix_panel_width_when_using_menu.patch: + - patch from SVN, fix panel width when a menu is used (Ubuntu: #88313) + + -- Sebastien Bacher Tue, 27 Feb 2007 11:18:55 +0100 + +gnome-panel (2.17.92-0ubuntu1) feisty; urgency=low + + * New upstream version: + Panel: + - Fix wrong initial position of menu (Ubuntu: #30146) + - Code cleanups + - Add missing mnemonics in main menu + - Don't show multiple times a dialog about an applet failing to load + - Don't try to load again in the same session an applet that failed to + load before + - Get localized names when starting a launcher so that the startup + notification use the translated name + - Fix image size on the run dialog so that it's always the correct size + - Set automatic gravity for the labels in the menubar, so that japanese + and other scripts are correctly displayed on vertical panels + Workspace Switcher Applet: + - Make mouse scrolling correctly work in RTL environments + - Performance improvement when a workspace is renamed/added/removed. + This has an important impact when accessibility is turned on. + - Fix speed of the spin button for number of workspaces (Ubuntu: #83334) + Clock Applet: + - Set automatic gravity for the clock label, so that japanese and other + scripts are correctly displayed on vertical panels + - Make it possible to use markup for the clock text, which is useful + with custom format + - Don't wake up every second if it's not necessary + Misc: + - Add missing check for gconf for libpanel-applet + - Require pango 1.15.4 + - Distribute MAINTAINERS + Docs: + - Update fish screenshot + * debian/control.in: + - Build-Depends on libgconf2-dev (>= 2.6.1), libpango1.0-dev (>= 1.15.4) + - package maintainer by the Ubuntu Desktop Team + * debian/patches/07_use_beagle.patch: + - dropped the patch changing the search menu item, beagle users want to + use gnome-search-tools also and beagle is to the applications menu + * debian/patches/09_lpi_src.patch: + - updated + * debian/patches/11_panel_addto_dialog.patch: + - updated + * debian/patches/12_autoreconf.patch: + - renamed to reflect the right command and updated + + -- Sebastien Bacher Tue, 27 Feb 2007 01:22:11 +0100 + +gnome-panel (2.17.91-0ubuntu1) feisty; urgency=low + + * New upstream version: + Panel: + - Make the main menu usable with a11y tools + - Revert changes related to settings menu + - Fix crash when saving a new Link launcher (Ubuntu: #81726) + - Improve a lot the panel in RTL environments + Misc: + - Optional check for libedataserver for the clock + * debian/control.in: + - Build-Depends on libedataserver1.2-dev + * debian/patches/01_layout.patch: + - updated and add menu separator after the apport item + * debian/patches/12_autoconf.patch: + - updated + + -- Sebastien Bacher Tue, 13 Feb 2007 11:33:58 +0100 + +gnome-panel (2.17.90-0ubuntu2) feisty; urgency=low + + * debian/patches/01_layout.patch: + - list apport-gtk.desktop + - renamed yelp item "Help and Support" + * debian/patches/09_help_submenu.patch: + - drop, the menu is replaced by a new item + + -- Sebastien Bacher Wed, 7 Feb 2007 21:51:49 +0100 + +gnome-panel (2.17.90-0ubuntu1) feisty; urgency=low + + * New upstream version: + Panel: + - Remove code warning + - Change text of some menu items + - Use GTK_STOCK_MISSING_IMAGE when the icon of a launcher can't be + found and remove useless error dialog + - Use better filenames when creating launchers + - Simplify system menu code thanks to new control center shell + - Fix "Add to panel" dialog to correctly display capplets + - Migrate settings menu buttons to a control center shell launcher + - Use 22 as default icon sizes for menus + - Force size of launchers to 16, 22, 32 or 48 + - Use new launcher icon + - Fix compilation on darwin + - Fix disappearing launcher on drag and drop (and other related issues) + - Fix transparency broken when screen size changes (bugreports@nn7.de) + - Don't accept every command line option, but only the deprecated + --profile + - Check for the logout_prompt gconf key to know whether we should show + the logout dialog or just log out + - Do not start dragging an applet when it's not possible because a grab + is active, fix change of cursor icon in this case + - Do not hardcode invisible_char in glade files + - Correctly position applet menu in RTL environments + - Really remove launcher file when deleting a launcher, and do it only + when possible + - Fix main menu not completely reloading when the menu is update + gnome-desktop-item-edit: + - Make it possible to create a .directory file with a name instead of + forcing the name to $(dir)/.directory + - Use new launcher icon + - Make --create-new usage more logical + libpanel-applet: + - Do not hardcode invisible_char in glade files + - Correctly position applet menu in RTL environments + Clock Applet: + - Look for evolution binary before trying to run it + - Make sure that the last day of a multi-day events is marked in the + calendar + - Don't mark multiple days on the calendar if the event is an all day + event + - Fix compilation on some systems + - Launch evolution when double-clicking on a task + Fish Applet: + - HIG fix + - Do not hardcode invisible_char in glade files + Notification Area Applet: + - Add a test-tray program + Workspace Switcher Applet: + - Slow down speed of the spin button for number of workspaces + Misc: + - New launcher icon + - Build fixes + Documentation: + - Add a link to the user guide + * debian/patches/01_layout.patch: + - updated + * debian/patches/09_help_submenu.patch: + - updated + * debian/patches/09_lpi_src.patch: + - updated + * debian/patches/10_panel-transparency-after-resolution-change.patch: + - dropped, fixed with the new version + * debian/patches/11_applet_use_session_dialog.patch: + - updated + * debian/patches/11_panel_addto_dialog.patch: + - updated + * debian/patches/12_autoconf.patch: + - updated + * debian/patches/15_clock_start_evo_midday.patch: + - updated + + -- Sebastien Bacher Mon, 22 Jan 2007 09:48:13 +0100 + +gnome-panel (2.16.2-0ubuntu4) feisty; urgency=low + + * debian/patches/05_submenus.patch: + - dropped, deprecated with the new gnome-menus categorisation + + -- Sebastien Bacher Thu, 11 Jan 2007 17:30:38 +0100 + +gnome-panel (2.16.2-0ubuntu3) feisty; urgency=low + + * Add 16_gksu_time_admin.patch: + - patch uploaded to edgy-proposed by Martin Pitt + - clock-applet: Run time-admin through gksudo. + - New system-tools-backends confines frontends to root user, see LP#59946. + + -- Sebastien Bacher Wed, 20 Dec 2006 11:59:52 +0100 + +gnome-panel (2.16.2-0ubuntu2) feisty; urgency=low + + * debian/control.in: + - Build-Depends on libdbus-glib-1-dev + + -- Sebastien Bacher Mon, 11 Dec 2006 17:45:07 +0100 + +gnome-panel (2.16.2-0ubuntu1) feisty; urgency=low + + * New upstream version: + Panel: + - Fix error when removing launcher + - HIG fixes + - Fix leaks + - Fix a warning string + Notification Area Applet: + - Fix use of uninitialized memory + Misc: + - Check for libXau + - Fix doc build + * Sync with Debian + * debian/application-default-icon.png.uue: + - default icon for the menu entries. + * debian/control.in: + - Build-Depends on libnspr-dev, liblpint-bonobo-dev, + liblaunchpad-integration-dev + - gnome-panel Recommends menu-xdg instead of Depends on it + and Recommends alacarte + - gnome-panel Suggests fortunes-mod, it's used by the fish applet + - updated the GTK requirement to 2.10 + - updated the libpanel dbg package name + * debian/gnome-panel.install: + - update list of applets to install + * debian/gnome-panel-data.install: + - install the "About Ubuntu" menu item. + * debian/gnome-panel-data.postinst, debian/gnome-panel-data.postrm: + - updated profiles transition version for Ubuntu + - use laptop-detect to determine the default configuration to copy, + clean the default on removal + * debian/panel-default-setup-laptop.entries: + - laptop profile. + * debian/patches/01_distrologo.patch: + - use the distribution logo. + * debian/patches/01_layout.patch: + - rename the Desktop menu, list the Documents item. + * debian/patches/04_default_panel_config.patch: + - change to the default configuration. + * debian/patches/05_submenus.patch: + - change the order of the administration and preferences menus. + * debian/patches/06_applets_category.patch: + - fix applets categories. + * debian/patches/07_use_beagle.patch: + - use beagle for the places menu search item if available (Ubuntu: #38986) + * debian/patches/08_default_clock_setting.patch: + - display the date with the panel clock by default + * debian/patches/09_default_icons.patch: + - shows an icon if the .desktop hasn't one. + * debian/patches/09_help_submenu.patch: + - make a "help" submenu for support (Ubuntu: #31775 + * debian/patches/09_lpi_src.patch, + - Launchpad Integration. + * debian/patches/11_applet_use_session_dialog.patch: + - Ubuntu session dialog + * debian/patches/11_panel_addto_dialog.patch: + - new 'add to panel' dialog. + * debian/patches/12_autoconf.patch: + - update the build files. + * debian/patches/14_remove_separators.patch: + - patch by Gary Coady + - removed unneeded menu separators, fix the separator being displayed + to the application menu for non admin users by example (Ubuntu: #34363) + * debian/patches/15_clock_start_evo_midday.patch: + - patch by Tollef Fog Heen, "always use 120000Z when calling evo", fix the + evolution calendar being opened shifted from one day sometimes depending + on the timezone (Ubuntu: #42115) + * debian/patches/99_about-ubuntu-translation.patch: + - list ubuntu-about.desktop as to translate + * debian/rules: + - don't copy default config, Ubuntu has a laptop profile + and the config choice is dynamic at installation + - install the default menu icon. + - run intltool-update + - updated for ubuntu dbg packages. + - use "--with-in-process-applets=all" configure option + * debian/ubuntu-about.desktop, debian/ubuntu-about.desktop.in: + - "About Ubuntu" menu item. + * debian/watch: + - updated. + + -- Sebastien Bacher Mon, 11 Dec 2006 11:44:22 +0100 + +gnome-panel (2.14.3-4) unstable; urgency=low + + * Remove 04_menus_rename.patch. + * Build-depend on libgnome-menu-dev 2.16.1-1. + + -- Josselin Mouette Mon, 4 Dec 2006 22:58:48 +0100 + +gnome-panel (2.14.3-3) unstable; urgency=low + + * Sync with overrides: set libpanel-applet2-dbg's priority to extra. + * Fix upstream version computation to allow "-" in upstream versions. + * New patch, 10_panel-transparency-after-resolution-change, to fix wrong + geometry calculation of the root window after a resolution change which + broke gnome-panel transparency; taken from GNOME #353781; patch by + bugreports@nn7.de; thanks Soeren Sonnenburg. + + -- Loic Minier Fri, 24 Nov 2006 14:31:19 +0100 + +gnome-panel (2.14.3-2) unstable; urgency=low + + [ Josselin Mouette ] + * Move menu-xdg to a Depends: instead of a Recommends: + (closes: #322517). + Rationale: people who don't want the Debian menu can remove "menu" + and the "empty menu" bug has been fixed some time ago. + + [ Loic Minier ] + * Only update-gconf-defaults on removal, not on purge. (Closes: #387925) + * Cleanup postinst and postrm. + + -- Loic Minier Sun, 17 Sep 2006 21:11:15 +0200 + +gnome-panel (2.14.3-1) unstable; urgency=low + + * New upstream release; no API changes. + + -- Loic Minier Tue, 8 Aug 2006 11:05:53 +0200 + +gnome-panel (2.14.2-2) unstable; urgency=low + + * Install default entries properly (closes: #369858). + + rules: move the entries to /usr/share/gconf/defaults. + + control.in: depend on gconf2 2.14.0-2 instead of ${misc:Depends}. + + Call update-gconf-defaults in postinst and postrm. + + gnome-panel-data.postinst: recursively unset the entries in /etc. + From now on, the administrator will be able to use this place to + customize the default panel layout. + + -- Josselin Mouette Thu, 3 Aug 2006 00:01:42 +0200 + +gnome-panel (2.14.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * Remove the dependency on this broken gamin package, and remove fam + as well as gnome-menus now use gnome-vfs as a backend + (closes: #349835, #367094, #351093). + + [ Loic Minier ] + * Make gnome-panel Recommend evolution-data-server. (Closes: #372567) + * Drop the useless libnspr4-dev build-dep, thanks Steve Langasek. + [debian/control, debian/control.in] + * New upstream release. + - Bump up libgnomevfs2-dev build-dep to >= 2.14.2. + [debian/control, debian/control.in] + * Use ${binary:Version} instead of ${Source-Version}. + * Add ${misc:Depends}. + * Update watch file to track stable series. + + -- Loic Minier Sat, 24 Jun 2006 11:14:15 +0200 + +gnome-panel (2.14.1-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release. + + * debian/control.in, debian/control: + - updated e-mail address. + - updated Standards-Version to 3.7.2. + - updated build dependencies according to configure.in. + - changed build-dep on libnspr-dev to libnspr4-dev to use xulrunner. + + * debian/patches/06_sync_clear_documents.patch: + - dropped; libegg updated upstream. + + * debian/patches/99_reautogenization.patch: + - dropped; the gnome-panel maintainer runs a Debian derivative. + + [ Marco Cabizza ] + * debian/control.in: + - changed build-dep on deprecated libpng3-dev to libpng12-dev. + + [ Ross Burton ] + * Build-depend on libecal1.2-dev, not libedata-cal1.2-dev + + [ Josselin Mouette ] + * Make the package binNMU-safe. + - Build-depend on dpkg-dev 1.13.19. + - Use ${source:Version}. + * Remove a useless ${Source-Version}. + + -- Guilherme de S. Pastore Mon, 8 May 2006 15:54:43 -0300 + +gnome-panel (2.12.3-2) unstable; urgency=low + + * Simple rebuild to get rid of references to Xcursor.la and Xrender.la. + + -- Loic Minier Sun, 23 Apr 2006 21:31:36 +0200 + +gnome-panel (2.12.3-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * debian/control.in: + - General cleanups + - Added the alternative on x-terminal-emulator back, as gnome-panel + obeys the GNOME prefered applications settings. + + [ Loic Minier ] + * Depend on gamin | fam since gnome-vfs deps are not enough to ensure it's + there. (Closes: #353164) + [debian/control, debian/control.in] + + [ Sjoerd Simons ] + * New upstream release + * Let libpanel-applet2-dev depend on liborbit2-dev >= 2.12.4. It defines the + new ORBIT2_MAYBE_CONS macro the code generator uses. (Closes: #350883) + * debian/patches/99_reautogenization.patch + + Updated. + + -- Sjoerd Simons Mon, 20 Feb 2006 22:56:36 +0100 + +gnome-panel (2.12.2-3) unstable; urgency=low + + * Upload to unstable (Closes: #347881) + + [ Josselin Mouette ] + * Suggest gnome-terminal only, as x-terminal-emulator won't be used + (closes: #291058). + + -- Guilherme de S. Pastore Fri, 13 Jan 2006 13:40:37 -0200 + +gnome-panel (2.12.2-2) experimental; urgency=low + + * Build-depend on libedataserverui1.2-dev (>= 1.3.0), so control-center and + gnome-panel can't be build with conflicting e-d-s libraries. + + -- Sjoerd Simons Tue, 27 Dec 2005 19:54:59 +0100 + +gnome-panel (2.12.2-1) experimental; urgency=low + + * New upstream release + * debian/patches/02_panel-menu-items.c.patch: + - dropped; applied upstream + * Don't build on a separate directory, it breaks gnome-doc-utils + + -- Guilherme de S. Pastore Wed, 30 Nov 2005 14:30:20 -0200 + +gnome-panel (2.12.1-2) experimental; urgency=low + + * New maintainer + Thanks for all your work, Marc! + + * debian/patches/06_sync_clear_documents.patch: + - patch from upstream CVS to force update when Gamin/FAM + notification is not available (Closes: #319800, #330847) + + -- Guilherme de S. Pastore Fri, 11 Nov 2005 20:54:11 -0200 + +gnome-panel (2.12.1-1) experimental; urgency=low + + [ Gustavo Noronha Silva ] + * New upstream release + * debian/patches/01_defaults_add_notifarea.patch, + debian/patches/02_clockapplet_reload_timezone.patch, + debian/patches/03_libpanel-applet_X11_link_missing.patch + - removed, applied upstream or fixed otherwise + * debian/patches/02_panel-menu-items.c.patch: + - added, from Ubuntu's package packaging patch, which added it + from GNOME's bugzilla #315322 + * debian/patches/99_reautogenization.patch: + - updated with: + libtoolize -c -f --automake && aclocal-1.9 && autoheader && \ + automake-1.9 -acf && autoconf && rm -rf autom4te.cache + * debian/patches/04_menus_rename.patch: + - updated + * debian/rules: + - disable scrollkeeper on build, based on Ubuntu's change + * debian/watch: + - updated for 2.12 major + * debian/control.in: + - updated Build-Depends according to Ubuntu's package and on the + upstream package's configure.in pkgconfig stuff + + [ Guilherme de S. Pastore ] + * debian/control.in: + - moved menu-xdg from Suggests to Recommends (Closes: #315782) + + [ Loic Minier ] + * Clarify "Copyright" versus "License". + + -- Gustavo Noronha Silva Sat, 29 Oct 2005 19:54:10 -0200 + +gnome-panel (2.10.2-2) UNRELEASED; urgency=low + + * Menu transition, part 1 and 2: move from #!/usr/sbin/install-menu to + #!/usr/bin/install-menu. [debian/gnome-vfolder-user, + debian/gnome-panel-data.menu-method.experimental, + debian/gnome-panel-data.menu-method] + + -- Loic Minier Thu, 20 Oct 2005 16:33:49 +0200 + +gnome-panel (2.10.2-1) unstable; urgency=low + + * New upstream release + * Removed 06_fr_po_fix.patch now included upstream. + * Re-autogen-ized. + * Increased Standards-Version (no changes needed). + + -- Marc Dequènes (Duck) Tue, 28 Jun 2005 23:30:00 +0200 + +gnome-panel (2.10.1-5) unstable; urgency=medium + + * Don't overwrite DEB_CONFIGURE_SCRIPT_ENV completely. + * Remove most replaces and conflicts fields, they are unused now. + * gnome-panel only Recommends: gnome-session. + * gnome-panel-data only Recommends: gnome-panel (breaking a dependency + cycle). + + -- Josselin Mouette Sat, 25 Jun 2005 19:45:52 +0200 + +gnome-panel (2.10.1-4) unstable; urgency=low + + * Replaced Suggests on menu by menu-xdg (Closes: #313011). + * Added patch to fix missing includes from Dann Frazier (Closes: + #314692). + * Fix fr translation s/Environnement de bureau/Bureau/ (from GNOME + CVS) (Closes: #313351). + * Now building in 'debian/build/' directory (cleaner). + * Pass --as-needed to LDFLAGS to reduce dependencies if possible. + * Disabled evolution-data-server support on Hurd (thanks to Michael + Banck). + + -- Marc Dequènes (Duck) Sun, 19 Jun 2005 11:51:40 +0200 + +gnome-panel (2.10.1-3) unstable; urgency=low + + * Upload to unstable (Closes: #312609). + * Added patch to solve menu files conflicts with other desktop + environnements (Closes: #307098) (thanks to seb128). + * Removed clean rule hack to work around #299010. + + -- Marc Dequènes (Duck) Tue, 7 Jun 2005 23:44:00 +0200 + +gnome-panel (2.10.1-2) experimental; urgency=low + + * Some more build-depends, depends, and suggests update (gnome-about + and new gnome-menus are now dependencies). + * Fixed in 2.10 branch : + + drawer does not open at the right place on dual-screen display + (Closes: #260480). + + click repeat rate in calendar view for clock applet is too fast + (Closes: #272885). + + panel won't scale some SVGs properly (Closes: #275215). + + translation error in pt-BR (Closes: #293656). + * Removed 'gnome-panel-screenshot' man page (command moved to gnome- + utils). + * Fixed stupid cut-and-paste mistake in 'debian/copyright'. + + -- Marc Dequènes (Duck) Sun, 17 Apr 2005 02:25:16 +0200 + +gnome-panel (2.10.1-1) experimental; urgency=low + + * New upstream release + * Removed the following patches now included upstream : + + 03_french_typo.patch + + 06_translation_silliness.patch + + 08_improved_run_in_term_speed.patch + * Mass build-depends and depends update. + * Patched libpanel-applet to correctly link with X11. + * Re-autogen-ized. + * Removed '/usr/share/gnome-panel' not used anymore in 'debian/gnome- + panel-data.install'. + * Updated 'debian/watch'. + + -- Marc Dequènes (Duck) Sun, 10 Apr 2005 21:06:35 +0200 + +gnome-panel (2.8.3-1) unstable; urgency=medium + + * Marc Dequènes: + + Rebuilt with fixed libgnomeui without non-free howl stuff + (Closes: #298887) (thus urgency). + + Used revised timezone patch for clock applet made by Stephen Gildea + (Closes: #294591). + + Made load of gconf config quiet (Closes: #293204). + + Readded 'userprefix' in menu-method as it broke 'favorites://' in + nautilus (Closes: #295091). + + Added a menu-method to produce a customisable Debian menu made by + Bill Allombert (not activated by default, see README.Debian) + (Closes: #259400). + * Sjoerd Simons: + + New upstream release + + debian/patches/07_empty_desktop_keys.patch + - Removed. Merged upstream. + + -- Marc Dequènes (Duck) Sun, 13 Mar 2005 11:01:55 +0100 + +gnome-panel (2.8.2-2) unstable; urgency=medium + + * urgency high because menu bug is very bad for sarge, and custom + lauchers are an important feature which is unfortunatly broken. + * menu : (thanks to Bill Allombert) + + updated suggests and added conflicts for nice woody transition + (Closes: #291085). + + removed unuseful 'userprefix' in menu-method. + * Added patches : + + custom lauchers fix from Sjoerd Simons (Closes: #291185). + + run-application typing completion speed improvements (from + gnomezilla) (Closes: #287120). + * Corrected doc-base index location (Closes: #285650). + * Corrected descriptions to please lintian. + + -- Marc Dequènes (Duck) Fri, 28 Jan 2005 23:58:50 +0100 + +gnome-panel (2.8.2-1) unstable; urgency=low + + * New upstream release : + + no longer respond to delete event (Closes: #254972). + * CDBS Tweaks. + * Regenerated '05_clockapplet_reload_timezone.patch'. + * Regenerated relibtoolize patch. + * Updated policy to 3.6.1.1 (no changes needed). + * Patched or and uk translations : some translators should _really_ + learn how to read english. + + -- Marc Dequènes (Duck) Fri, 10 Dec 2004 02:31:05 +0100 + +gnome-panel (2.8.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastien Bacher Fri, 19 Nov 2004 13:14:18 +0100 + +gnome-panel (2.8.1-1) experimental; urgency=low + + * New upstream release. + * Removed '03_define_types.patch' not necessary anymore. + * Regenerated relibtoolize patch. + * Reintroduced '04_french_typo.patch' removed by mistake. + + -- Marc Dequènes (Duck) Thu, 14 Oct 2004 01:28:31 +0200 + +gnome-panel (2.8.0.1-1) experimental; urgency=low + + * New upstream release : + + clock applet : fixed padding on a 24px panel (Closes: #258323). + + fix panel orientation badly set/remembered (Closes: #216997). + + fix freakiness with autohiding and snap-to-screen-edge + (Closes #255608). + * [JHM] Added devhelp doc symlink (Closes: #273491) + * Dropped '04_french_typo.patch' now included upstream. + + -- Marc Dequènes (Duck) Sun, 3 Oct 2004 15:09:48 +0200 + +gnome-panel (2.8.0-2) experimental; urgency=low + + * Version 2.8.0 corrects : + + run in terminal works again (Closes: #262487). + + custom launcher command browser was lacking navigation entries + (Closes: #254443). + * Enabled evolution-data-server support (Closes: #272061). + * Updated versions in 'debian/control'. + + -- Marc Dequènes (Duck) Wed, 22 Sep 2004 00:50:02 +0200 + +gnome-panel (2.8.0-1) experimental; urgency=low + + * New upstream release. + * Updated watch file. + * Regenerated relibtoolize patch. + * Made build idempotent (typo patch for 'po/fr.po' was causing + problems) + * Added 'autotools-dev' to build dependencies to take advantage of the + CDBS automatic 'config.*' management. + + -- Marc Dequènes (Duck) Tue, 14 Sep 2004 21:16:42 +0200 + +gnome-panel (2.7.92-1) experimental; urgency=low + + * New upstream release : + + correct pointer detection problem on multiscreen causing several + problems like autihiding not always working (Closes: #178710) + + new add applet dialog (Closes: #247982) (bug obsoleted) + * NOTICE : panel settings dialog was removed upstream, use gconf + editor instead. + * Build-Depends/Depends versions update (Closes: #261327). + * Ported changes from 2.6.2-2 & 2.6.2-3. + * Removed 03_po_gu_fix.patch now included upstream. + * Patch added to correct a typo in french translation (Closes: + #268618). + * Corrected quoting problem in description (Closes: #244071). + * Patch from gnomezilla to reload timezone in clock applet (Closes: + #61611). + * Regenerated relibtoolize patch. + + -- Marc Dequènes (Duck) Sun, 12 Sep 2004 17:57:49 +0200 + +gnome-panel (2.7.91.1-1) experimental; urgency=low + + * New upstream development release. + * [debian/control.in] Bumped libwnck build dependency as per configure.in. + * [debian/patches/02_relibtoolise.patch] Regenerated. + * [debian/gnome-panel-data.install] Removed + debian/tmp/usr/share/control-center-2.0 . + * [debian/rules] Ensure at build time that all symbols are resolvable; make + the linker work a bit harder to speed up dynamic loading. + + -- J.H.M. Dassen (Ray) Sat, 21 Aug 2004 13:22:47 +0200 + +gnome-panel (2.7.4.1-1) experimental; urgency=low + + * New upstream release : + + updated translations (Closes: #247982, #247984). + * Regenerated relibtoolize patch. + + -- Marc Dequènes (Duck) Wed, 21 Jul 2004 18:24:00 +0200 + +gnome-panel (2.7.3-1) experimental; urgency=low + + * New upstream release + * Regenerated relibtoolize patch. + + -- Marc Dequènes (Duck) Tue, 6 Jul 2004 14:38:10 +0200 + +gnome-panel (2.7.1-1) experimental; urgency=low + + * New upstream release + + -- Marc Dequènes (Duck) Thu, 24 Jun 2004 20:30:55 +0200 + +gnome-panel (2.6.2-1) unstable; urgency=low + + * New upstream release. + * Updated some Build-Depends versions. + * Regenerated '02_relibtoolise.patch'. + + -- Marc Dequènes (Duck) Sat, 19 Jun 2004 11:14:06 +0200 + +gnome-panel (2.6.1-4) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable. + * debian/control.in: + + Don't Build-Depends on evolution-data-server since this package is + not in unstable + + -- Sebastien Bacher Wed, 26 May 2004 16:38:41 +0200 + +gnome-panel (2.6.1-3) experimental; urgency=low + + * GNOME Team Upload. + * Rebuilt with new evolution-data-server (Closes: #250807). + + -- Sebastien Bacher Tue, 25 May 2004 19:38:22 +0200 + +gnome-panel (2.6.1-2) experimental; urgency=low + + * Added missing Build-Depends on 'libxmu-dev' (Closes: #247285). + + -- Marc Dequènes (Duck) Thu, 20 May 2004 18:39:24 +0200 + +gnome-panel (2.6.1-1) experimental; urgency=low + + * New upstream release : + - fixed visibility problem with solid-color background + (Closes: #179871). + * Recreated and split relibtoolize patch. + * Improved tight versioning rules. + * Deactivated gtk-doc documentation regeneration (see GNOME Policy on + Alioth for details). + * Removing all remaining 'Makefile' files in clean rule. + + -- Marc Dequènes (Duck) Wed, 21 Apr 2004 02:47:43 +0200 + +gnome-panel (2.6.0-5) experimental; urgency=low + + * Gustavo Noronha Silva: + - debian/gnome-panel-data.postinst: + + add a call to gconftool-2 to --load the .entries file which + contains the default panel configuration + + -- Gustavo Noronha Silva Thu, 15 Apr 2004 22:14:40 -0300 + +gnome-panel (2.6.0-4) experimental; urgency=low + + * Added missing Replaces for 'libpanel-applet2-dev' on 'gnome-panel- + data' for 2.4->2.6 transition. + * J.H.M. Dassen (Ray): + - [debian/patches/01_relibtoolise.patch] New. Cut down direct + dependencies. + * Jordi Mallach: + - debian/control.in: build-depend on an epoched libglade2-dev. + - debian/rules: don't let clean fail if find returns error. + + -- Marc Dequènes (Duck) Fri, 9 Apr 2004 04:02:26 +0200 + +gnome-panel (2.6.0-3) experimental; urgency=low + + * Rebuilt to use 'evolution-data-server'. + + -- Marc Dequènes (Duck) Mon, 29 Mar 2004 23:56:27 +0200 + +gnome-panel (2.6.0-2) experimental; urgency=low + + * Corrected 'gnome-applet' tight dependency on 'libpanel-applet2-0'. + * Corrected missing Build-Depends on 'cdbs'. + * Updated Depends & Recommends. + + -- Marc Dequènes (Duck) Sun, 28 Mar 2004 23:29:52 +0200 + +gnome-panel (2.6.0-1) experimental; urgency=low + + * New Maintainer (Closes: 238884). + * New upstream release: + + fix X resource leak (Closes: #235903). + + fix auto-open behaviour for drawers (Closes: #216577). + * Switched to CDBS. + * Updated Uploaders and using the 'gnome-pkg-tools' pkg. + * Added some Replaces/Conflicts for smoother upgrade. + * Compatibility level switched to 4, and old patches were deactivated. + * Cleaned dirty 'debian/*' made by CM, now using simple and clean CDBS + rules and '*.install' files. + * Improved 'debian/copyright'. + * Removed now unused 'go.uue' to genrate 'go.png'. + * 'debian/control', 'debian/changelog' and 'debian/copyright' are now + UTF-8 encoded. + + -- Marc Dequènes (Duck) Sun, 28 Mar 2004 23:21:32 +0200 + +gnome-panel (2.4.2-4) unstable; urgency=low + + * the right + + -- Christian Marillat Fri, 19 Mar 2004 15:39:39 +0100 + +gnome-panel (2.4.2-3) unstable; urgency=low + + * Remove DTD hack and update scrollkeeper dependency to 0.3.14-5 + * Add outputencoding="UTF-8" in menu-method file (Closes: #230804) + + -- Christian Marillat Sun, 8 Feb 2004 11:09:26 +0100 + +gnome-panel (2.4.2-2) unstable; urgency=low + + * Suggests gnome-system-tools for gnome-panel, needed if you want to set + up the system time (Closes: #229043) + + -- Christian Marillat Fri, 23 Jan 2004 11:52:49 +0100 + +gnome-panel (2.4.2-1) unstable; urgency=low + + * New upstream release. + * Remove 05_manpage patch, included by upstream + + -- Christian Marillat Fri, 16 Jan 2004 10:22:17 +0100 + +gnome-panel (2.4.1-7) unstable; urgency=low + + * debian/prerm Unregister schemas file from the database. + + -- Christian Marillat Fri, 9 Jan 2004 15:48:01 +0100 + +gnome-panel (2.4.1-6) unstable; urgency=low + + * Add a version (>= 2.4.0) to the gnome-applets recommends (Closes: #223550) + + -- Christian Marillat Wed, 31 Dec 2003 09:21:18 +0100 + +gnome-panel (2.4.1-5) unstable; urgency=low + + * Add a -dbg package for libpanel-applet2 library (Closes: #220734) + * Add missing manpages. + + -- Christian Marillat Sun, 7 Dec 2003 11:05:31 +0100 + +gnome-panel (2.4.1-4) unstable; urgency=low + + * Panel should conflicts with metacity <= 2.6.0 (Closes: #217122) + * Patch from bugzilla to fix duplicate entries in the help message (Closes: #183130) + * debian/control update build-dependecies to GNOME 2.4 packages (Closes: #217497) + + -- Christian Marillat Sat, 25 Oct 2003 09:54:07 +0200 + +gnome-panel (2.4.1-3) unstable; urgency=low + + * Register default panel configuration with gconftool (Closes: #216600) + + -- Christian Marillat Mon, 20 Oct 2003 01:19:20 +0200 + +gnome-panel (2.4.1-2) unstable; urgency=low + + * gnome-panel-data should replaces gnome-desktop-data (Closes: #216458) + * Rebuild to remove liblinc dependency in the -dev package + + -- Christian Marillat Sun, 19 Oct 2003 10:01:36 +0200 + +gnome-panel (2.4.1-1) unstable; urgency=low + + * New upstream release. + * Should suggest a terminal emulator for the run program dialog (Closes: #214650) + * Don't need to depends on xbase-clients + + -- Christian Marillat Sat, 18 Oct 2003 10:36:24 +0200 + +gnome-panel (2.2.2.2-2) unstable; urgency=low + + * Change userprefix in menu-method. You can access user generated Debian + menus with favorites:/// in nautilus + * Use theme folder icons for Debian menus (Closes: #207494) + * New patch to fix manpage entry for gnome-panel (Closes: #212037) + + -- Christian Marillat Sun, 21 Sep 2003 23:33:11 +0200 + +gnome-panel (2.2.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 15 Jul 2003 15:28:51 +0200 + +gnome-panel (2.2.2.1-2) unstable; urgency=low + + * Patch 04_drawer.c to fix a panel crash when a new drawer is added + (Closes: #198695) + + -- Christian Marillat Sat, 28 Jun 2003 14:35:49 +0200 + +gnome-panel (2.2.2.1-1) unstable; urgency=low + + * New upstream release + * Add a gnome-control-center (>= 2.2.2) dependency (Closes: #198371) + * New patch (01) to fix broken translation in bn.po (Closes: #193635) + + -- Christian Marillat Sun, 22 Jun 2003 15:44:58 +0200 + +gnome-panel (2.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 16 May 2003 17:45:28 +0200 + +gnome-panel (2.2.1-2) unstable; urgency=low + + * Only add longtitle as tooltip in Debian menu (Closes: #186697) + * Update section + * Add go icon + + -- Christian Marillat Sun, 13 Apr 2003 08:29:10 +0200 + +gnome-panel (2.2.1-1.1) unstable; urgency=low + + * zero source change NMU to resolve problems on ia64 that binary NMU caused + + -- Bdale Garbee Fri, 11 Apr 2003 02:13:24 -0600 + +gnome-panel (2.2.1-1) unstable; urgency=low + + * New upstream release. + * Remove notification applet patch + + -- Christian Marillat Tue, 11 Mar 2003 15:51:00 +0100 + +gnome-panel (2.2.0.1-2) unstable; urgency=low + + * Patch to fix the notification applet crash (Closes: #180133) + + -- Christian Marillat Mon, 17 Feb 2003 16:04:23 +0100 + +gnome-panel (2.2.0.1-1) unstable; urgency=low + + * New upstream release. + * Remove replaces libpanel-applet-dev in the -dev package. + + -- Christian Marillat Tue, 4 Feb 2003 14:36:28 +0100 + +gnome-panel (2.2.0-2) unstable; urgency=low + + * Conflicts with system-tray-applet (Closes: #178278) + * Add versioned conflicts for gnome-core (Closes: #178401) + + -- Christian Marillat Sat, 25 Jan 2003 23:52:18 +0100 + +gnome-panel (2.2.0-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 21 Jan 2003 15:33:47 +0100 + +gnome-panel (2.1.90.1-1) unstable; urgency=low + + * New upstream release. + * Add a quick-lounge-applet (<= 0.98-1) conflicts, this applet crash the panel. + * Launcher are restored properly (Closes: #172385) + * Menu panel doesn't disappears (Closes: #172848) + * Fixes panel hogging the CPU when hide_delay and show_delay are zero (Closes: #174002) + * Fix inbox monitor randomly displays wildly inaccurate info (Closes: #168877) + * debian/control Add yelp and gnome2-user-guide in Suggests for the panel + + -- Christian Marillat Sat, 18 Jan 2003 17:12:02 +0100 + +gnome-panel (2.0.11-3) unstable; urgency=low + + * Bump Standards-Version to 3.5.8 + + -- Christian Marillat Sat, 28 Dec 2002 17:55:58 +0100 + +gnome-panel (2.0.11-2) unstable; urgency=low + + * Move libpanel documentation in a -doc package (Closes: #171007) + + -- Christian Marillat Fri, 20 Dec 2002 16:18:00 +0100 + +gnome-panel (2.0.11-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 15 Nov 2002 14:40:58 +0100 + +gnome-panel (2.0.10-2) unstable; urgency=low + + * Upload to unstable + * Gnome-hints has been removed (Closes: #152335) + * Fix in clock update (Closes: #156401) + * Applets save their properties (Closes: #135569) + * No more buttons in the tasklist applet (Closes: #116205) + * Docklet has been removed (Closes: #137450) + * Launcher properties are now saved (Closes: #139827) + * Now menus are always sorted (Closes: #150649) + * kmail doesn't crash the panel (Closes: #146706) + * The tasklist isn't dynamic resizable (Closes: #89752) + * No more problem with windowmaker and the panel (Closes: #94592) + * No more duplicate entrie in the main menu (Closes: #97473) + * No more memory leak in the tasklist applet (Closes: #103880) + * Tasklist doen't display app titles (Closes: #112059) + * Netscape entry menu is fixed (Closes: #135992) + * No more "Fill window thumbnails" option in tasklist (Closes: #151134) + * Tooltips in the arrows panel are correctly displayed (Closes: #113642) + * Completion in run dialog work with ctrl-TAB (Closes: #75665) + * gmenu has been removed (Closes: #95014) + * menu have a mozilla entry (if mozilla is present) (Closes: #135993) + * Xemacs.desktop has been removed (Closes: #148500) + + -- Christian Marillat Mon, 28 Oct 2002 16:08:15 +0100 + +gnome-panel (2.0.10-1) experimental; urgency=low + + * New upstream release. + * gnome-panel should depends on xbase-clients for xrdb + * Add build-dependency for xbase-clients + + -- Christian Marillat Mon, 14 Oct 2002 16:47:55 +0200 + +gnome-panel (2.0.9-4) experimental; urgency=low + + * Upload with original tarball + + -- Christian Marillat Sun, 29 Sep 2002 17:45:08 +0200 + +gnome-panel2 (2.0.9-3) experimental; urgency=low + + * Upload without the 2 suffix + + -- Christian Marillat Sat, 28 Sep 2002 18:46:17 +0200 + +gnome-panel2 (2.0.9-2) experimental; urgency=low + + * Add libmpg3-dev in build-depends (Closes: #160758) + * Update to standards version 3.5.7 + * -dev package should depends on the same lib version + + -- Christian Marillat Mon, 16 Sep 2002 11:35:00 +0200 + +gnome-panel2 (2.0.9-1) experimental; urgency=low + + * New upstream release. + * Update lignome-ui-dev dependencies to 2.0.5-2 + + -- Christian Marillat Fri, 6 Sep 2002 13:50:51 +0200 + +gnome-panel2 (2.0.8-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 5 Sep 2002 19:00:46 +0200 + +gnome-panel2 (2.0.7-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 27 Aug 2002 11:19:52 +0200 + +gnome-panel2 (2.0.6-2) experimental; urgency=low + + * Add scrollkeeper in build-depends + * Build against the latest libgnomevfs2-dev 2.0.2-4 + + -- Christian Marillat Fri, 16 Aug 2002 17:36:42 +0200 + +gnome-panel2 (2.0.6-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 12 Aug 2002 19:44:49 +0200 + +gnome-panel2 (2.0.5-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 8 Aug 2002 16:46:21 +0200 + +gnome-panel2 (2.0.4-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 5 Aug 2002 19:35:26 +0200 + +gnome-panel2 (2.0.3-2) experimental; urgency=low + + * Recompiled against the latest lignome-vfs to remove libssl dependency. + + -- Christian Marillat Fri, 2 Aug 2002 17:14:51 +0200 + +gnome-panel2 (2.0.3-1) experimental; urgency=low + + * New upstream release. + * Remove gmenu entry in menu file (Closes: #153213) + * debian/menu s/panel/gnome-panel/ + + -- Christian Marillat Tue, 30 Jul 2002 17:08:21 +0200 + +gnome-panel2 (2.0.2-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 15 Jul 2002 15:31:05 +0200 + +gnome-panel2 (2.0.1-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 17 Jun 2002 16:07:40 +0200 + +gnome-panel2 (2.0.0-1) experimental; urgency=low + + * New upstream release. + * Replace "Distribution menu" by "Debian menu" + + -- Christian Marillat Mon, 10 Jun 2002 16:51:50 +0200 + +gnome-panel2 (1.5.24-2) experimental; urgency=low + + * Build against the latest libraries. + + -- Christian Marillat Sun, 9 Jun 2002 18:29:23 +0200 + +gnome-panel2 (1.5.24-1) experimental; urgency=low + + * New upstream release. + * Remove call to Internet DTD (Closes: #148899) + * Call scrollkeeper-update in gnome-panel-data2.postrm + + -- Christian Marillat Tue, 4 Jun 2002 17:22:35 +0200 + +gnome-panel2 (1.5.23-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 28 May 2002 15:51:18 +0200 + +gnome-panel2 (1.5.22-2) experimental; urgency=low + + * debian/rules Add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 in install target. + * gnome-panel2 should depends on gnome-desktop-data + * debian/gnome-panel-data2.postinst check if schemas files are present + before calling gconftool-2 + + -- Christian Marillat Mon, 27 May 2002 16:01:57 +0200 + +gnome-panel2 (1.5.22-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 20 May 2002 21:58:18 +0200 + +gnome-panel2 (1.5.21-1) experimental; urgency=low + + * New upstream release. + * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and + DEB_BUILD_OPTIONS + + -- Christian Marillat Wed, 15 May 2002 20:39:24 +0200 + +gnome-panel2 (1.5.20-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 12 May 2002 14:25:08 +0200 + +gnome-panel2 (1.5.19-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 29 Apr 2002 20:51:20 +0200 + +gnome-panel2 (1.5.18-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 22 Apr 2002 16:41:41 +0200 + +gnome-panel2 (1.5.17-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 17 Apr 2002 15:46:23 +0200 + +gnome-panel2 (1.5.16-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 1 Apr 2002 22:40:37 +0200 + +gnome-panel2 (1.5.15-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 29 Mar 2002 17:01:04 +0100 + +gnome-panel2 (1.5.12-2) experimental; urgency=low + + * Add libwnck-dev in build-depends (Closes: #137954) + + -- Christian Marillat Wed, 13 Mar 2002 10:51:00 +0100 + +gnome-panel2 (1.5.12-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 5 Mar 2002 14:47:36 +0100 + +gnome-panel2 (1.5.11-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 26 Feb 2002 15:37:43 +0100 + +gnome-panel2 (1.5.10-2) experimental; urgency=low + + * Replace gettext by intltoo in build-depends + + -- Christian Marillat Mon, 25 Feb 2002 15:40:43 +0100 + +gnome-panel2 (1.5.10-1) experimental; urgency=low + + * new upstream release. + + -- Christian Marillat Mon, 18 Feb 2002 22:06:48 +0100 + +gnome-panel2 (1.5.9-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 15 Feb 2002 00:38:51 +0100 + +gnome-panel2 (1.5.7-1) experimental; urgency=low + + * New upstrema release. + + -- Christian Marillat Tue, 5 Feb 2002 14:41:01 +0100 + +gnome-core2 (1.5.4-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 20 Jan 2002 16:21:40 +0100 + +gnome-core (1.4.0.4-16) unstable; urgency=low + + * Fix typo in gnome-terminal.wrapper (Closes: #127768) + * Remove gnome-hint patche (Closes: #121390, #129184) + * debian/control Replace libpng-dev by libpng2-dev in Build-Depends + (Closes: #128377) + + -- Christian Marillat Mon, 14 Jan 2002 15:04:52 +0100 + +gnome-core (1.4.0.4-15) unstable; urgency=low + + * Build against the latest gnome-libs to update the libzvt2 dependency + (Closes: #127309, #127271) + * debian/control Replace libpng2-dev by libpng-dev in Build-Depends. + * debian/control Build-depends on libzvt-dev (>= 1.4.1.2-9) + + -- Christian Marillat Tue, 1 Jan 2002 15:27:43 +0100 + +gnome-core (1.4.0.4-14) unstable; urgency=low + + * Fix typo in gnome-terminal.1 (Closes: #123073) + * Fix base page for doc-base in libpanel-applet-dev package. + * Fix typo in gnome-help documentation (Closes: #126566) + * Apply patch to allows meta functionnality in gnome-terminal (Closes: #50427) + + -- Christian Marillat Thu, 27 Dec 2001 14:47:36 +0100 + +gnome-core (1.4.0.4-13) unstable; urgency=low + + * Default font for gnome-terminal is "fixed" only (Closes: #117126) + * Patch against gnome-hint.c Don't use gettext for font descriptor + (Closes: #116606) + * Patch against gnome-about/Makefile.am to use new gdk_pixbuf include path + (Closes: #120312) + * Revert my change on logout.c Only root can shutdown/reboot from the + panel (Closes: #119316, #120127) + + -- Christian Marillat Tue, 20 Nov 2001 11:36:05 +0100 + +gnome-core (1.4.0.4-12) unstable; urgency=low + + * gnome-wm honour --default-wm (Closes: #115668) + * Build against the latest gnome-libs + + -- Christian Marillat Sun, 21 Oct 2001 14:11:19 +0200 + +gnome-core (1.4.0.4-11) unstable; urgency=low + + * debian/control lynx comeback in Recommends (Closes: #114142) + * debian/control replaces xml-i18n-tools by intltool (Closes: #115024) + * Fix automake 1.5 errors. Thanks to Denis Barbier (Closes: #114369) + * Build against the latest orbit (Closes: #115309) + + -- Christian Marillat Fri, 12 Oct 2001 10:46:49 +0200 + +gnome-core (1.4.0.4-10) unstable; urgency=low + + * Fix typo in panel/panel.hints (Closes: #113590) + * Replace lynx by w3m (Closes: #113613) + * Move gnome-terminal.desktop in gnome-terminal package (Closes: #113736) + * Move gnome-help.desktop in gnome-help package + * debian:control Add Replaces: gnome-panel-data (<= 1.4.0.4-9) for above + * Patch against gsm/logout.c Now you can reboot/halt your machine from the + panel. This only work for root, because shutdown doesn't understand the + -a option. Read README.debian in gnome-panel package. + * debian/rules Remove less files in clean target (Closes: #114020) + + -- Christian Marillat Mon, 1 Oct 2001 11:34:06 +0200 + +gnome-core (1.4.0.4-9) unstable; urgency=low + + * Add Debian menu for panel and gmenu (Closes: #112176) + * Remove /var/lib/gnome on purge (Closes: #113005) + * Remove /etc/gnome/config on purge (Closes: #112994) + * Remove /etc/gnome on purge (Closes: #112995) + * debian/control replace cygnus-stylesheets by docbook-utils + + -- Christian Marillat Mon, 24 Sep 2001 18:39:19 +0200 + +gnome-core (1.4.0.4-8) unstable; urgency=high + + * High urgency, because the current release in testing has a missing + dependency on libpanel-applet0 and the panel package doesn't work if + libpanel-applet0 isn't installed (Closes: #111517) + * debian/control for gnome-help, move lynx from depends to recommends + (Closes: #109652) + * debian/control gnome-panel suggests fortune-mod (Closes: #110865) + * debian/control gnome-help suggests gnome-users-guide not + gnome-users-guide-en (Closes: #111200) + * Don't change cursor color (Closes: #97697) + * Change default font for gnome-terminal (Closes: #111319) + + -- Christian Marillat Fri, 7 Sep 2001 15:06:07 +0200 + +gnome-core (1.4.0.4-7) unstable; urgency=low + + * Fix path in gnome-session.1 (Closes: #107724) + * debian/*.sgml Use docbook 4.1 + * debian/control gnome-help-data Replaces gnome-terminal (<= 1.0.55-2) + (CLoses: #107948) + + -- Christian Marillat Wed, 8 Aug 2001 08:07:56 +0200 + +gnome-core (1.4.0.4-6) unstable; urgency=low + + * debian/rules for dh_makeshlibs replace libcapplet0 by libpanel-applet0 + (Closes: #105772) + + -- Christian Marillat Wed, 18 Jul 2001 19:02:59 +0200 + +gnome-core (1.4.0.4-5) unstable; urgency=low + + * Patch against gnome-edit to use EDITOR if the default gnome editor is + unavailable. + * Remove gnome-wm patch, and move the patched file in debian/ + * debian/gnome-wm Try to exec $WINDOW_MANAGER before x-window-manager + (Closes: #103430 + * New patch from Michael Urman to hide task names in tasklist_applet + (Closes: #104587) + + -- Christian Marillat Sat, 14 Jul 2001 16:58:12 +0200 + +gnome-core (1.4.0.4-4) unstable; urgency=low + + * Gnome-help Provides: man-browser, www-browser, info-browser + * Switch to debhelper V3 + * Change libraries versionning to (>= 1.4.0.2-3) instead of the latest + package number. + * Build-depends on groff-base instead of groff + + -- Christian Marillat Fri, 22 Jun 2001 17:02:37 +0200 + +gnome-core (1.4.0.4-3) unstable; urgency=low + + * New patch: Allows to save/load the keyboard secure state (Closes: #83028) + * New patch: Remove a warning in configure + * gnome-help replace gnome-panel-data (Closes: #99499) + * Build-depends on xml-i18n-tools (>= 0.8.4.cvs.20010530-1) (Close: #98784) + + -- Christian Marillat Sat, 2 Jun 2001 14:41:45 +0200 + +gnome-core (1.4.0.4-2) unstable; urgency=low + + * New patch: Replace Distribution by Debian in configuration dialog box. + * New patch: Upstream patch to allow Debian menu in default configuration. + * New patch: Fix some wrong path. + * Move gnome-feedback doc from gnome-help-data to gnome-core. + + -- Christian Marillat Tue, 15 May 2001 15:36:51 +0200 + +gnome-core (1.4.0.4-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 9 May 2001 23:56:27 +0200 + +gnome-core (1.4.0.3-2) unstable; urgency=low + + * Remove debugging code (/tmp/languages file) + + -- Christian Marillat Mon, 7 May 2001 16:48:18 +0200 + +gnome-core (1.4.0.3-1) unstable; urgency=low + + * New upstream release. + * New: tooltips for long task names in tasklist_applet (Closes: #63898) + + -- Christian Marillat Thu, 3 May 2001 15:51:58 +0200 + +gnome-core (1.4.0.2-3) unstable; urgency=low + + * Fix wrong dif.gz file (Closes: #94499) + * Build against the latest lignome-dev (Closes: #95301, #95691) + * gnome-terminal should depends on gnome-bin (Closes: #95498) + * Doesn't build against gtkhtml this break fonts displaying (Closes: #92187) + + -- Christian Marillat Tue, 1 May 2001 11:03:14 +0200 + +gnome-core (1.4.0.2-2) unstable; urgency=low + + * New/old patch against manpages, never applied by upstream. + * gnome-help depends on lynx. + * Use x-terminal-emulator in gnome-download instead of xterm. + * Move gnome-convert and gnome-download from gnome-core to gnome-help. + * Move gnome-login-check from gnome-core to gnome-session. + * Move gnome-panel-add-launcher from gnome-core to gnome-panel. + * Move sesion-properties* from gnome-core to gnome-session. + * debian/control Add Replaces for the changes above. + * Write manpages (Closes: #87085) + + -- Christian Marillat Tue, 17 Apr 2001 18:54:15 +0200 + +gnome-core (1.4.0.2-1) unstable; urgency=low + + * New upstream release. + * Build-depends on latest gettext (Closes: #93198) + * Icon box in menu editor is back (Closes: #91938) + * Build-depends on latest xml-i18n-tools and libgnome-dev + + -- Christian Marillat Wed, 11 Apr 2001 15:16:20 +0200 + +gnome-core (1.4.0.1-2) unstable; urgency=low + + * Build depends on versionned gettext 0.10.35-17 (Closes: #93198) + * Write manpage for gnome-session and add docbook-to-man in build-depnds + * Write manpages for gnome-help (Closes: #87089) + + -- Christian Marillat Sat, 7 Apr 2001 15:52:40 +0200 + +gnome-core (1.4.0.1-1) unstable; urgency=low + + * New upstream release. + * debian/gnome-terminal.wrapper change -T by -t (Closes: #90847) + * debian/gnome-session.README.debian remove references to .xsession. This + is now obsolete by the new x-session-manager scheme. + + -- Christian Marillat Sun, 1 Apr 2001 15:01:51 +0200 + +gnome-core (1.4.0-2) unstable; urgency=low + + * Build depends on libglade-gnome0-dev (>= 0.16-1) (Closes: #90416) + * debian/control Add Build-Conflicts: libgtkhtml-dev (>= 0.7-1) (Closes: #90700) + + -- Christian Marillat Thu, 22 Mar 2001 16:44:12 +0100 + +gnome-core (1.4.0-1) unstable; urgency=low + + * New upstream release. + * Gnome-core replaces gnome-control-center 1.2.3-1 (Closes: #90124) + * Remove manpages patche included by upstream. + * gnome-session don't always saves session on logout (Closes: #89630) + * Can add a launcher in the panel (Closes: #90018) + * Deskguide don't crashes on Fill with mini-images (Closes: #86952) + * Deskguide don't fail to run (Closes: #89769) + * Pager applet don't fail to run (Closes: #89025) + + -- Christian Marillat Mon, 19 Mar 2001 13:01:26 +0100 + +gnome-core (1.3.1-2) unstable; urgency=low + + * Remove taslisk-applet manpage (Closes: #88994) + * New patch against gnome-terminal.1 (Closes: #89005) + * Move /usr/lib/libtasklist_applet.so in libpanel-applet0 + (Closes: #89053, #89008, #89012, #89091, #89003) + * Gnome-terminal replace gnome-help-data (<= 1.0.55-2) (Closes: #87910) + + -- Christian Marillat Sat, 10 Mar 2001 10:45:14 +0100 + +gnome-core (1.3.1-1) unstable; urgency=low + + * New upstream release. + * Removed default.session patch + * debian/control Add Replaces: gnome-control-center (<= 1.2.2-10), because + the session-properties-capplet is now in this package. + * debian/{postinst,prerm} Call scrollkeeper + * debian/control Add scrollkeeper, xml-i18n-tools and libglade-gnome0-dev in + build-depends and scrollkeeper in depends for gnome-core + * Menu and laucnh keys works now (Closes: #86955) + * Dead keys work in gnome-terminal (Closes: #63102) + * Gnome-terminal isn't broken (Closes: #86752) + * New patch htmlurl.h (This file was broken by upstream author) + * XFMail doesn't crash the tasklist applet in this release (Closes: #88515) + * debian/gnome-core.menu New file for the session properties capplet + + -- Christian Marillat Mon, 5 Mar 2001 11:40:15 +0100 + +gnome-core (1.2.4-11) unstable; urgency=low + + * Update (again) the Build-depends field (Closes: #87419) + * Add a debian directory for the gnome-help-browser and add suggest doc-base + for gnome-help. Now we can watch debian documentation registered with doc-base. + * Add a lintian override file for libpanel-applet0 + + -- Christian Marillat Sun, 25 Feb 2001 16:14:09 +0100 + +gnome-core (1.2.4-10) unstable; urgency=low + + * Update the Build-depends field (Closes: #86441, #87419) + * Call update-alternatives only in remove (gnome-terminal, gnome-session) (Closes: #87327, #87328) + + -- Christian Marillat Sat, 24 Feb 2001 18:03:20 +0100 + +gnome-core (1.2.4-9) unstable; urgency=low + + * Remove abandonned /etc/CORBA/servers/bad-applet.goad (Closes: #84950) + * Build against the latest gnome-libs (1.2.11) (Close: #85932) + + -- Christian Marillat Wed, 14 Feb 2001 13:49:26 +0100 + +gnome-core (1.2.4-8) unstable; urgency=low + + * debian/control Add Replaces: gnome-help-data (<< 1.0.55-2) for + gnome-help (Closes: #80974) + * debian/gnome-help.mime Rewrote (Closes: #82891) + * debian/control gnome-core depends on gnome-bin (Closes: #82951) + * Wrote gnome-panel.README.Debian (Closes: #82954) + + -- Christian Marillat Mon, 22 Jan 2001 16:04:58 +0100 + +gnome-core (1.2.4-7) unstable; urgency=low + + * Added gnome-bin (>= 1.2.0) in gnome-session Depends field (Closes: #80589, #80595, #80733) + + -- Christian Marillat Wed, 27 Dec 2000 19:24:08 +0100 + +gnome-core (1.2.4-6) unstable; urgency=low + + * Apply patch to gnome-run to call x-terminal-emulator (Closes: #80219) + * debian/gnome-terminal.wrapper This is -t not -T close (Closes: #80405) + + -- Christian Marillat Sun, 24 Dec 2000 03:27:12 +0100 + +gnome-core (1.2.4-5) unstable; urgency=low + + * Install gnome-terminal.wrapper as x-terminal-emulator and remove + debian/patches/gnome-terminal.dpatch (Closes: 64326) + Thanks to Eric Gillespie, Jr. + * Add Recommends: gnome-applets on gnome-panel (Closes: #72208) + * gnome-sesion provides x-session-manager and install alternative (Closes: #60667) + * Added hints=Gnome for all menu files. + + -- Christian Marillat Wed, 20 Dec 2000 23:19:55 +0100 + +gnome-core (1.2.4-4) unstable; urgency=low + + * Call x-terminal-emulator in gnome-wm and add depends on the latest debianutils + for gnome-session. Thanks to Joseph Carter for the file + (Closes: #79776) + * Rewrote default.session patch + * Add patch form Doug Larrick for gwmthumbnail.c (Closes: #78550) + + -- Christian Marillat Sun, 17 Dec 2000 12:04:54 +0100 + +gnome-core (1.2.4-3) unstable; urgency=low + + * Change gnome-help.mime to call the right file (Closes: #77986) + Thanks Malcolm Parsons for the patch. + * Patch gsm/default.in (two entries with same id) (Closes: #78276) + Thanks to Normal User (Nice name) + * Move gnome-control-center from Depends to Suggests. + * Remove libgtkhtml-dev from Build-Depends (Closes: #79527) + + -- Christian Marillat Wed, 13 Dec 2000 18:01:34 +0100 + +gnome-core (1.2.4-2) unstable; urgency=low + + * Remove README and NEWS files (Closes: #77250) + * Disable thumbnails by default in deskguide_applet (Closes: #77205) + * debian/rules --with-window-manager is now sawfish (was x-window-manager) + and rewrote debian/patches/gnome-wm.dpatch to remove x-window-manager (Closes: #77401) + * Should close this old bug (Closes: #51198) + * Patch gnome-edit to use x-terminal-emulator instead of xterm. + + -- Christian Marillat Mon, 20 Nov 2000 11:35:55 +0100 + +gnome-core (1.2.4-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 16 Nov 2000 00:43:15 +0100 + +gnome-core (1.2.3.1-1) unstable; urgency=low + + * New upstream release. + * Add gnome-help example and manpage in gnome-help package (Closes: #49977) + * This release should close these old bugs (Closes: #60561, #60768, #45053) + * Gnome-panel don't use all CPU time (Closes: #75251, #60209) + * Remove gmenu patch included by upstream. + + -- Christian Marillat Wed, 8 Nov 2000 17:09:42 +0100 + +gnome-core (1.2.3-1) unstable; urgency=low + + * New upstream release. + * Debian menus aren't empty (Closes: #70470) + * Launcher can find icon (Closes: #62502) + + -- Christian Marillat Tue, 24 Oct 2000 15:51:11 +0200 + +gnome-core (1.2.2.1-3) unstable; urgency=low + + * Add gnome-terminal.prerm for update-alternatives --remove (Closes: #74451) + * Patch gnome-terminal to accept -T option (Closes: #74450) + * Move README.debian in gnome-session package (Closes: #60440) + * mesg work in gnome-terminal (Closes: #71728) + * Upstream fix these old bugs in Gnome-terminal + Problem with menubar (Closes: #57516) + Problem with console-apt Closes: #60079) + Problem with screen (Closes: #50156) + * Binaries don't should go in /usr/X11R6/bin (Closes: #24031) + Quoting Debian policy : + "Packages using the X Window System should abide by the FHS standard" + "whenever possible; they should install binaries, libraries, manual" + "pages, and other files in FHS-mandated locations wherever possible." + "This means that files must not be installed into /usr/X11R6/bin/'" + * hostname isn't harcoded (Closes: #72536) + * Error messages mention Lynx (Closes: #62216) + * Display correctly deskuse.html (Closes: #49974) + * Add patch from malcolm (Closes: #64820) + + -- Christian Marillat Sat, 14 Oct 2000 23:39:49 +0200 + +gnome-core (1.2.2.1-2) unstable; urgency=low + + * Typo in debian/gnome-terminal.postinst + * Add gnome-terminal manpage (Closes: #69188) + * Closes: #63103 already closed in 1.2.1-0.2 (typo in debian/changelog) + * Gnome-terminal write to /var/run/utmp (Closes: #59053) + * delete/backspace keys works (Closes: #57198) + * Install GnomeHelp file in /etc/gnome/config (Closes: #73012) + * Convert png icons in xpm for Debian menu. + * Rearange documentation for dhelp (Closes: #56672) + + -- Christian Marillat Thu, 5 Oct 2000 00:59:44 +0200 + +gnome-core (1.2.2.1-1) unstable; urgency=low + + * New upstream release. + * Patch all manpages (Closes: #70009) + * gnome-panel 1.0.55-2.0.1 (sparc) is now installable (Closes: #69075, #71570) + * gmenu don't jam up all translations (Closes: #46446) + * panel remember its configuration between session + (Closes: #47734, #54190) + * Icons are now centered (Closes: #63868) + * Bugs closed by previous NMU in gnome-panel (Closes: #40036, #52584, #54755, + #58278, #61083, #69428)) + * libgen_util_applet.so installed in 1.2.1-0.2 (Closes: #69463) + * debian/control remove Conflicts: asclock (Closes: #52077) + * gnome-help 1.0.55-2.0.1 (sparc) is now installable (Closes: #69356) + * Bugs closed by previous NMU in gnome-help (Closes: #49734, #56081, #58679, #58973) + * debian/control move gmc from Recommends to Suggests (Closes: #59415) + * The first search in gnome-wm search is x-window-manager + (Closes: #50940, #65969, #62143) + * Bug closed in 1.2.2-1 (README.debian in gnome-session package) (Closes: #66219) + * Bugs closed by previous NMU in gnome-terminal + (Closes: #64579, #63592, #63332, #56584, #55477, #54428) + * gnome-terminal provide x-terminal-emulator (Closes: #61805, #53994, #56225) + + -- Christian Marillat Wed, 27 Sep 2000 16:02:16 +0200 + +gnome-core (1.2.2-1) unstable; urgency=low + + * New maintainer, thanks James. + * New upstream release. + * Switch to debhelper V2 + * Move README.debian in gnome-session package (Closes: #65235) and + update this file (Closes: #71339) + * Bug closed in 1.2.1-0.2 (Install missing libraries) (Closes: #69590, #70483) + * Bugs closed in 1.2.1-0.1 (typo close instead closes) (Closes: #53764, #54050) + * Remove gtkhtml patch. + * The desk guide show thumbnail (Closes: #72359) + * Missing package under sparc (Closes: #71438) + * debian/control add Conflicts: libgnome32 (<< 1.2.0-1) for gnome-panel (Closes: #72039) + * Added icons in Debian menu. + * Eject in drivemount check if '-u' is available (Closes: #63954) + * Patch gmenu to find Debian menu. + + -- Christian Marillat Tue, 26 Sep 2000 17:34:23 +0200 + +gnome-core (1.2.1-0.2) unstable; urgency=low + + * NMU. + * Install these libraries libfish_applet.so libgen_util_applet.so + libpanel_status.so (Closes: #69428, #69590) + * Copy latest gnome aclocal in macros/ and run macros/autogen.sh + This is needed to build gnome-help-browser against libgtkhtml4. + * In debian/control + gnome-session depends on gnome-panel (>= ${Source-Version}). + gnome-help depends on gnome-core (>= 1.2.0-0.1) no Source-Version. + gnome-terminal don't depends on gnome-core. + * URL's are clickable in gnome-terminal (Closes: 63103). + * debian/gnome-panel.undocumented removed printer_applet.1 + * Cut and paste work in gnome-terminal (Closes: #63592). + + -- Christian Marillat Wed, 23 Aug 2000 21:23:36 +0200 + +gnome-core (1.2.1-0.1) unstable; urgency=low + + * New upstream release (Closes: #58806, #66467) + * NMU. + * Standards-Version to 3.1.1.1 Added Build-depends field. + * Removed patches: dialer, drivemount-floppy, modemlights, term, + help-browser, debian-menu, url-match. + * Added patches: gtkhtml. + * Build against libgtkhtml3. Closes: #58679, #36806, #49734 + * Default manpath and infopath are wrong. Closes: #56081 + * gmenu segfaults. Close: #53764, #54050 + * gnome-panel: panel no longer works. Closes: #58278 + * gnome-panel: gnomepager-applet should put braces around. Closes: #52584 + * Backspace and delete work correctly. Closes: #54428 + * TERM never select xterm-debian. Closes: #56584, #55477, #64579 + * Disable arrows option is now saved. Closes: #54755 + * No more files in /usr/share. Closes: #61083 + * Show debian menus. Closes #66214 + * New help documentation for panel. Closes: #40036 + * Gnome-terminal write to /var/run/utmp. Closes #59053 + * gnome-terminal provide x-terminal-emulator. Closes #61805, #56225 + * README.Debian is here. Closes: #65235 + + -- Christian Marillat Tue, 25 Jul 2000 19:09:21 +0200 + +gnome-core (1.0.55-2) frozen unstable; urgency=low + + * Make x-window-manager run first by gnome-wm script to conform to + debian policy (Closes: #61617) (This is an important bug) + + -- James LewisMoss Sun, 21 May 2000 19:31:19 -0400 + +gnome-core (1.0.55-1) unstable; urgency=low + + * New upstream. + + -- James LewisMoss Sun, 2 Jan 2000 07:32:36 -0500 + +gnome-core (1.0.54-2) unstable; urgency=low + + * Fix the gnome-pager forgets size settings bug (was saved to wrong + section). Closes: #49839, #46845. + + -- James LewisMoss Fri, 12 Nov 1999 07:54:46 -0500 + +gnome-core (1.0.54-1) unstable; urgency=low + + * New upstream. + + -- James LewisMoss Thu, 4 Nov 1999 23:20:14 -0500 + +gnome-core (1.0.53-4) unstable; urgency=low + + * New maintainer. + + -- James LewisMoss Mon, 25 Oct 1999 23:17:31 -0400 + +gnome-core (1.0.53-3) unstable; urgency=low + + * Ok, I made a mistake by setgiding gnome-terminal to + utmp. Reverted the change. Closes: #47960 + + -- Raphael Hertzog Mon, 18 Oct 1999 19:17:27 +0200 + +gnome-core (1.0.53-2) unstable; urgency=low + + * gnome-session does launch a default window-manager. It does launch + gnome-wm if no other information has been found. gnome-wm now + reads the list of window managers from /etc/X11/window-managers + once it has tried gnome compliant wm. Closes: #38347, #47370 + * Patched gnome-terminal. TERM=xterm-debian again ... actually this + closes: #47552, #44960, #41065 + * gnome-terminal is now setgid utmp and can thus register itself + in the UTMP database. Closes: #40507 + * The URL match does now accept % characters. Closes: #47281 + * libpanel-applet0.postinst check for the changelog.gz mysteriously + staying around. Closes: #45871 + * Unreproducable bugs without answer from the submitter. + Closes: #41195, #42865 + + -- Raphael Hertzog Sat, 16 Oct 1999 19:52:38 +0200 + +gnome-core (1.0.53-1) unstable; urgency=low + + * New upstream version. + * gnome-session does now depend on gnome-panel and recommends + gmc (both are needed for a full Gnome desktop). + * gnome-terminal does not have a border. Closes: #38972 + + -- Raphael Hertzog Tue, 12 Oct 1999 21:17:58 +0200 + +gnome-core (1.0.52-1) unstable; urgency=low + + * New maintainer. Steve said that he wanted to give away some of + his packages. I've asked to take gnome-core, he never replied, so + I'm taking it but I will give it back to him if he wanted to + keep it. In the meantime I can better manage bugs with my name + in the Maintainer field. + * New upstream version. + + -- Raphael Hertzog Mon, 4 Oct 1999 21:28:18 +0200 + +gnome-core (1.0.50-0.1) unstable; urgency=low + + * New upstream version. + * NMU again. + + -- Raphael Hertzog Thu, 30 Sep 1999 22:10:03 +0200 + +gnome-core (1.0.41-0.1) unstable; urgency=low + + * New upstream version. + * NMU again. + + -- Raphael Hertzog Mon, 27 Sep 1999 13:10:31 +0200 + +gnome-core (1.0.9-0.1) unstable; urgency=low + + * New upstream version. Closes: #43253, #44098 + * Apply patches before configuring (and relaunch automake && autoconf + because one of the patches is applied on Makefile.am). + * NMU. Thanks to Christian Marillat for his work. + * Imlib bug corrected: closes: #39085 + * X11 binaries don't have to go /usr/X11R6/bin. Closes: #24031 + * The panel does start correctly wihout complaining about a + missing name service. Closes: #39380, #39634, #40478 + * The panel doesn't consume all CPU resources. Closes: #30654 + * The panel launches apps from where it has been launched itself. + Closes: #32319 + * The panel keeps the settings. Closes: #37052, #40579, #43496 + * Old core dump corrected upstream. Closes: #39400, #40328, #42167 + Closes: #44344, #44724, #44732, #44759, #44773 + * Bug in menu-method, not in gnome-panel. Already reported against + menu. Closes: #40089 + * cdplayer_applet works again. Closes: #42192 + * gnome pager works well: Closes: #42499, #42610 + * modem_lights draws itself correctly. Closes: #43861, #45055 + * The dialer applets doesn't exit when stopping while + not yet connected. Closes: #45287 + * No more Debian menu in the panel. Closes: #41040 + * GnomeICU works with this panel. Closes: #39626, #39515 + * gnome-panel-data conflicts with asclock. + Closes: #40712, #40715, #40808, #41430 + A better solution will be needed. Maybe put asclock in his own + package or create a asclock-data package that will be shared. + * Updated the modemlights patch. Closes: #43512 + * Added a patch for gnome-wm. Closes: #38366 + * Move lib{gkb,fish}_applet.so files to libgnome-applet0 (those are + not libraries to be linked with, just simple modules). Closes: #38596 + * Asclock works well without xearth (the code still mentions xearth + however). Closes: #40530 + * New patch (help-browser) for changing the default MANPATH and INFOPATH in + gnome-help-browser.c Closes: #41452 + * Moved help-browser to the new "Help" menu section. + * Added gnome-help.mime. Closes: #42205 + * Gnome-session does launch gnome-panel ! (I suppose that it failed + to launch since panel was broken). Closes: #42937 + * gnome-sesion doesn't core dump. Closes: #36640 + * The terminal does remember the TERM var. Closes: #43067 + * The terminal keeps its size when dragging the manu bar in and out. + Closes: #44762 + * The menu section of gnome-terminal corrected. Closes: #37635 + + -- Raphael Hertzog Wed, 22 Sep 1999 13:24:34 +0200 + +gnome-core (1.0.7-1) unstable; urgency=low + + * New upstream version. + * Removed "term" patch + + -- Steve Haslam Mon, 28 Jun 1999 01:36:31 +0100 + +gnome-core (1.0.6-2) unstable; urgency=low + + * debian-menu.dpatch: created to fix guessing Debian menus + (/etc/menu-methods/gnome-panel now) and to make Debian menus the default + instead of GNOME system menus. + * gnome-help now suggests gnome-users-guide-en (closes: #35724) + * /etc/menu-methods/gnome-panel now creates .directory files and searches + /usr/X11R6/include/X11/pixmaps for menu icons + + -- Steve Haslam Sun, 13 Jun 1999 15:28:52 +0100 + +gnome-core (1.0.6-1) unstable; urgency=low + + * New upstream version. + + -- Steve Haslam Sat, 5 Jun 1999 12:57:08 +0100 + +gnome-core (1.0.5-3) unstable; urgency=low + + * debian/gnome-terminal.menu: managed to lose change mentioned in last + revision. Replaced. + * debian/gnome-core.undocumented: removed gnome-wm.1 (it was in + gnome-session.undocumented too). + + -- Steve Haslam Mon, 31 May 1999 19:15:54 +0100 + +gnome-core (1.0.5-2) unstable; urgency=low + + * debian/gnome-terminal.menu: changed section to XShells (Bug#37635) + * debian/rules: added gnome-wm and gnome-edit to dh_undocumented call + (Bug#37632) + * debian/gnome.menu-method: added patch to honour needs=text (Bug#36928) + from Decklin Foster + * Call dh_strip when making libpanel-applet-dev (Closes Bug#31244) + * Removed /usr/share/gnome/apps/Debian symlink, (closes #38100) + * Sanified build system a la gnome-libs + * debian/control: made gnome-help, gnome-help-data and gnome-panel-data + packages. + + -- Steve Haslam Sun, 23 May 1999 14:35:44 +0100 + +gnome-core (1.0.5-1) unstable; urgency=low + + * New maintainer. + + -- Steve Haslam Tue, 11 May 1999 01:01:12 +0100 + +gnome-core (1.0.5-0.2) unstable; urgency=low + + * gnome-panel.files.in: added asclock themes, libgkb_applet.a + * gnome-core.files.in: added gnome-wm, gnome-edit + * term.dpatch: gnome-terminal TERM to xterm-debian rather than xterm + * gsm/Makefile.am: put default.session, default.wm in /etc/gnome + * debian/gnome-session.conffiles.in: added above two files + * debian/gnome-session.files.in: updated this too + + -- Steve Haslam Sun, 18 Apr 1999 16:47:23 +0100 + +gnome-core (1.0.5-0.1) unstable; urgency=low + + * Non-maintainer upload + * New upstream version + + -- Steve Haslam Thu, 15 Apr 1999 23:22:23 +0100 + +gnome-core (1.0.1-0.3) unstable; urgency=low + + * Weehay! More broken dependencies. This one libghttp -1.1, + a bogus package that only ever existed on my machine. + + -- Jules Bean Mon, 8 Mar 1999 08:24:00 +0000 + +gnome-core (1.0.1-0.2) unstable; urgency=low + + * Another NMU, this time to fix bogus dependencies on libgtop0 + and libglib1.1 + + -- Jules Bean Sun, 7 Mar 1999 14:21:12 +0000 + +gnome-core (1.0.1-0.1) unstable; urgency=low + + * NMU for GNOME-1.0 + * Hacked to patch SIGPIPE bug + * Don't delete GIFs in rules + + -- Jules Bean Fri, 5 Mar 1999 18:36:29 +0100 + +gnome-core (0.99.99pre1.0.0-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Fri, 26 Feb 1999 23:18:10 -0800 + +gnome-core (0.99.3.2-4) unstable; urgency=low + + * Recompiled yet again - dual dependency on libglib. + Fixes: BUG#32510 + + -- Jim Pick Thu, 28 Jan 1999 00:00:22 -0800 + +gnome-core (0.99.3.2-3) unstable; urgency=low + + * Recompiled again to due to dependencies. + + -- Jim Pick Sun, 24 Jan 1999 01:10:07 -0800 + +gnome-core (0.99.3.2-2) unstable; urgency=low + + * Recompiled with libgnome 0.99.4. + + -- Jim Pick Fri, 22 Jan 1999 16:44:45 -0800 + +gnome-core (0.99.3.2-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Wed, 20 Jan 1999 11:42:46 -0800 + +gnome-core (0.30-2) frozen unstable; urgency=low + + * Recompiled with new libs. + * Fixed reference to /usr/X11R6 in README.Debian. + * Added warnings (Gnome is ALPHA). + * Patched dialer_applet to use pon/poff. + * Patched drivemount_applet to default to /floppy. + + -- Jim Pick Tue, 24 Nov 1998 10:56:08 -0800 + +gnome-core (0.30-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 24 Sep 1998 21:28:02 -0700 + +gnome-core (0.28.1-1) unstable; urgency=low + + * New upstream release. + * Hopefully fixes panel applet bug. + + -- Jim Pick Wed, 19 Aug 1998 20:12:25 -0700 + +gnome-core (0.28-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 17 Aug 1998 12:59:26 -0700 + +gnome-core (0.27-1) unstable; urgency=low + + * New upstream release. + * Added /usr/doc/gnome + + -- Jim Pick Sat, 15 Aug 1998 14:21:06 -0700 + +gnome-core (0.25-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 6 Aug 1998 22:51:22 -0700 + +gnome-core (0.20-2) unstable; urgency=low + + * Added Debian menu-method for gnome-panel. Fixed Bug #24025 + (Thanks to Ray Dassen for reporting the bug, and Riku Voipio + who wrote the menu method for Gnome 0.12) + + -- Jim Pick Wed, 22 Jul 1998 20:22:00 -0700 + +gnome-core (0.20-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 8 Jun 1998 12:00:08 -0700 + +gnome-core (0.13-1) unstable; urgency=low + + * Initial Release. + + -- Jim Pick Mon, 16 Mar 1998 15:27:43 -0800 --- gnome-panel-2.18.0.orig/debian/gnome-panel-data.postinst +++ gnome-panel-2.18.0/debian/gnome-panel-data.postinst @@ -0,0 +1,43 @@ +#!/bin/sh + +set -e + +self="$(basename "$0")" + +action="$1" + +#DEBHELPER# + +case "$action" in + configure) + version="$2" + + if [ -n "$version" ] \ + && dpkg --compare-versions "$version" lt "2.16.2-0ubuntu1"; then + config_source=$(gconftool-2 --get-default-source) + tmp_dir=$(mktemp -t -d gconf.XXXXXXXXXX) + HOME="$tmp_dir" gconftool-2 --direct \ + --config-source="$config_source" \ + --recursive-unset \ + /apps/panel/default_setup \ + >/dev/null + kill -s HUP `pidof gconfd-2` >/dev/null 2>&1 || true + rm -rf "$tmp_dir" + fi + + if [ -x /usr/sbin/laptop-detect ] && /usr/sbin/laptop-detect; then + echo "laptop configuration" + cp /usr/share/gconf/schemas/panel-default-setup-laptop.entries /usr/share/gconf/defaults/05_panel-default-setup.entries + else + echo "desktop configuration" + cp /usr/share/gconf/schemas/panel-default-setup.entries /usr/share/gconf/defaults/05_panel-default-setup.entries + fi + + update-gconf-defaults + ;; + abort-upgrade|abort-remove|abort-remove|abort-deconfigure) + ;; + *) + echo "$self: W: unknown action \`$action'" >&2 + ;; +esac --- gnome-panel-2.18.0.orig/debian/ubuntu-about.desktop.in +++ gnome-panel-2.18.0/debian/ubuntu-about.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=About Ubuntu +_Comment=Learn more about Ubuntu +Exec=yelp ghelp:about-ubuntu +Icon=distributor-logo +Terminal=false +Type=Application +Categories=GNOME;Application;Core; +StartupNotify=true --- gnome-panel-2.18.0.orig/debian/control +++ gnome-panel-2.18.0/debian/control @@ -0,0 +1,54 @@ +Source: gnome-panel +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Guilherme de S. Pastore +Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Kilian Krause , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej Surý , Ross Burton , Sebastien Bacher , Sjoerd Simons +Standards-Version: 3.7.2 +Build-Depends: , cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.2.0), patchutils (>= 0.2.25), debhelper (>= 5.0.7ubuntu4), liborbit2-dev (>= 1:2.12.1-1), libgconf2-dev (>= 2.6.1), libpango1.0-dev (>= 1.15.4), intltool, gnome-pkg-tools, dpkg-dev (>= 1.13.19), libgtk2.0-dev (>= 2.10), libglade2-dev (>= 1:2.5.1), libwnck-dev (>= 2.13.5), scrollkeeper (>= 0.3.14-9.1), libgnome-desktop-dev (>= 2.11.1), libpng12-dev, libbonobo2-dev (>= 2.8.1-2), libxmu-dev, libecal1.2-dev (>= 1.2.1-1) [!hurd-i386], libgnomevfs2-dev (>= 2.14.2), libxres-dev, sharutils, gnome-doc-utils, libedataserver1.2-dev, libedataserverui1.2-dev (>= 1.3.0), libxau-dev, libcairo2-dev (>= 1.0.0), libgnome-menu-dev (>= 2.16.1-1), libnspr-dev, liblpint-bonobo-dev, liblaunchpad-integration-dev, libdbus-glib-1-dev + +Package: gnome-panel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-panel-data (= ${source:Version}), gnome-desktop-data (>= 2.10.0-1), gnome-control-center (>= 1:2.8.2-3), gnome-menus (>= 2.11.1-1), gnome-about (>= 2.10.0-1) +Recommends: gnome-applets (>= 2.12.1-1), gnome-session, evolution-data-server, menu-xdg (>= 0.2), alacarte +Suggests: yelp, gnome2-user-guide, gnome-terminal | x-terminal-emulator , gnome-system-tools, nautilus, fortunes-mod +Description: launcher and docking facility for GNOME 2 + This package contains toolbar-like “panels” which can be attached to + the sides of your X desktop, or left “floating”. It is designed to be + used in conjunction with the Gnome Desktop Environment. Many features + are provided for use with the panels – including an application menu, + clock, mail checker, network monitor, quick launch icons and the like. + +Package: libpanel-applet2-0 +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: library for GNOME 2 panel applets + This library is used by GNOME 2 panel applets. + +Package: libpanel-applet2-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, libpanel-applet2-0 (= ${binary:Version}), libgnomeui-dev (>= 2.10.0-1), liborbit2-dev (>= 1:2.12.4-1) +Description: library for GNOME 2 panel applets - development files + This packages provides the include files and static library for the GNOME 2 + panel applet library functions. + +Package: libpanel-applet2-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: doc-base +Description: library for GNOME 2 panel applets - documentation files + This packages provides the documentation files for the GNOME 2 panel applet + library functions. + +Package: gnome-panel-data +Section: gnome +Architecture: all +Depends: scrollkeeper (>= 0.3.14-9.1), gconf2 (>= 2.14.0-2) +Recommends: gnome-panel +Description: common files for GNOME 2 panel + This package includes some files that are needed by the GNOME 2 panel + (Pixmaps, .desktop files and internationalization files). + --- gnome-panel-2.18.0.orig/debian/gnome-desktop-item-edit.sgml +++ gnome-panel-2.18.0/debian/gnome-desktop-item-edit.sgml @@ -0,0 +1,107 @@ +Christian"> + Marillat"> + december 7, 2003"> + 1"> + marillat@debian.org"> + + gnome-desktop-item-edit"> + + Debian GNU/Linux"> + GNU"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2001 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + tool to edit .desktop file + + + + &dhpackage; + + + + + + + + DESCRIPTION + + &dhpackage; allows you to edit .desktop file. + + + + + OPTIONS + + + + + + + Create new file in the given directory. + + + + + + + Display help + + + + + + + SEE ALSO + + gnome-options(7) + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). + + + + + --- gnome-panel-2.18.0.orig/debian/libpanel-applet2-doc.links +++ gnome-panel-2.18.0/debian/libpanel-applet2-doc.links @@ -0,0 +1 @@ +usr/share/doc/libpanel-applet2-doc/html/ usr/share/gtk-doc/html/panel-applet --- gnome-panel-2.18.0.orig/debian/compat +++ gnome-panel-2.18.0/debian/compat @@ -0,0 +1 @@ +4 --- gnome-panel-2.18.0.orig/debian/gnome-panel-data.menu-method +++ gnome-panel-2.18.0/debian/gnome-panel-data.menu-method @@ -0,0 +1,52 @@ +#!/usr/bin/install-menu +compat="menu-1" + +!include menu.h + +function findicon($filename)= \ + ifelsefile($filename, $filename, \ + iffile("/usr/X11R6/include/X11/pixmaps/" $filename, \ + "/usr/X11R6/include/X11/pixmaps/" $filename)) + +function AppEntry($var)= \ + "[Desktop Entry]\n" \ + "Encoding=UTF-8\n" \ + "Name=" title() "\n" \ + "Comment=" ifelse($longtitle,$longtitle,"") "\n" \ + "Exec=" $command "\n" \ + $var \ + ifnempty($icon,"Icon=" findicon($icon) "\n") \ + "Type=Application\n" + +# To add a default icon if no icon are provided (ugly) +# ifelse($icon,"Icon="findicon($icon) "\n","Icon=gnome-debian.png\n") \ + +function SubmenuEntry()= \ + "[Desktop Entry]\n" \ + "Name=" $title "\n" \ + "Icon=gnome-fs-directory\n" \ + "Type=Directory\n" + +supported + x11= AppEntry("Terminal=false\n") + text= AppEntry("Terminal=true\n") +endsupported + +genmenu=ifeqelse(parent($title),"",parent($section),parent(parent($section))) "/" replacewith($title,"/","_") ifeqelse($needs, "", "/.directory", ".desktop") "" +startmenu="" +endmenu="" + +rootsection="" + +rootprefix="/var/lib/gnome/Debian/" +userprefix=".gnome/apps" + +treewalk="M" +submenutitle=SubmenuEntry() + +prerun="rm -rf " prefix() "/*" + +preoutput="" + +outputencoding="UTF-8" + --- gnome-panel-2.18.0.orig/debian/libpanel-applet2-dbg.install +++ gnome-panel-2.18.0/debian/libpanel-applet2-dbg.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpanel-applet-2.so.* usr/lib/debug/ --- gnome-panel-2.18.0.orig/debian/gnome-panel-data.install +++ gnome-panel-2.18.0/debian/gnome-panel-data.install @@ -0,0 +1,7 @@ +debian/tmp/etc/gconf/ usr/share/ +debian/tmp/usr/lib/bonobo/ usr/lib/ +debian/tmp/usr/share/gnome-panelrc usr/share/gnome/ +debian/tmp/usr/share/gnome debian/tmp/usr/share/gnome-2.0/ debian/tmp/usr/share/locale/ debian/tmp/usr/share/omf/ debian/tmp/usr/share/icons/ usr/share/ +debian/applications.template etc/gnome-vfs-2.0/vfolders/ +debian/gnome-vfolder-user etc/menu-methods/ +debian/ubuntu-about.desktop usr/share/applications/ --- gnome-panel-2.18.0.orig/debian/copyright +++ gnome-panel-2.18.0/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Jim Pick jim@jimpick.com on Sat, 14 Mar +1998 20:12:23 -0800. Taken over by Raphael Hertzog + on Wed, 22 Sep 1999 13:24:34 +0200, and taken +over again by James LewisMoss on October 26, 1999. +and again by Marc Dequènes (Duck) on 2003-03-26. + +It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/gnome-panel/ + +Upstream Authors and Copyright holders: + Too many to list here, but the full list is in: + /usr/share/doc/gnome-panel/AUTHORS + +License: + + This package 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; version 2 dated June, 1991. + + This package 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- gnome-panel-2.18.0.orig/debian/applications.template +++ gnome-panel-2.18.0/debian/applications.template @@ -0,0 +1,9 @@ + + + + Root + applications-all-users:/// + +include-menu-defs + + --- gnome-panel-2.18.0.orig/debian/panel-test-applets.1 +++ gnome-panel-2.18.0/debian/panel-test-applets.1 @@ -0,0 +1,28 @@ +.\" This manpage has been automatically generated by docbook2man +.\" from a DocBook document. This tool can be found at: +.\" +.\" Please send any bug reports, improvements, comments, patches, +.\" etc. to Steve Cheng . +.TH "PANEL-TEST-APPLETS" "1" "07 dcembre 2003" "" "" + +.SH NAME +panel-test-applets \- display installed applets +.SH SYNOPSIS + +\fBpanel-test-applets\fR [ \fB--help \fR ] + +.SH "DESCRIPTION" +.PP +\fBpanel-test-applets\fR display installed applets and does +nothing else. +.SH "OPTIONS" +.TP +\fB--help\fR +Display help +.SH "SEE ALSO" +.PP +gnome-options(7) +.SH "AUTHOR" +.PP +This manual page was written by Christian Marillat for +the Debian GNU/Linux system (but may be used by others). --- gnome-panel-2.18.0.orig/debian/libpanel-applet2-0.install +++ gnome-panel-2.18.0/debian/libpanel-applet2-0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpanel-applet-2.so.* usr/lib/ --- gnome-panel-2.18.0.orig/debian/application-default-icon.png.uue +++ gnome-panel-2.18.0/debian/application-default-icon.png.uue @@ -0,0 +1,17 @@ +begin 644 application-default-icon.png +MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX````!F)+1T0`^`#U +M`/)ANX+H````"7!(67,```L3```+$P$`FIP8````!W1)344'U0,7#B4`YB3/ +M)P```@!)1$%42,?ME;UNU%`0A;\9>Z,D)!)%1$,7*BAYD!1(O!*T=$B\`$*( +MAL<)-%0@(44BFV03^\X<"J^]3EAO$`JB823[_LCWG/&9<^^%__&OPP#V]_=U +MU\#S^?P!<%+W$^\^?.33EZ\LFH*Y81@IH4PR"Q%)1*`,,A.IRZEO`91)"VBZPX;P)W!P,E2$:D$T5D&)*1:4@@6+ZZR#3:UOKA(V!K +M(+BX;+AJ6IK28.88AB2D)#/)*$0&DLA,D)8$PCJER4PB$X"JJJJ(\('@Z9-# +M#A\>T$8`X&;#0HQ5'S`S1D,,!R"R,#\]Y>WKE\QF,T6$!H*]W6UJ[[(PLQ40 +M=)*-P4?MN!\1;-=VK3;U+[8:`8R!-X&/Y_M^*<4!KB'T@'\"?C,BP@"K[RKS +M-6L-4'T3:)W>4^#K"$;?:6T--H%/@4ZLER3Y;;\\]6S(O-\'#M2^R453#OF= +MNE15E8!\2IY-;KE-GE$-5D4^.SNC;5LD;=3YMHVV6"S&+JH&@N/C8THIPPZ< +M\OBZ^7Z`':!(*DMP7Q:N[?4U +JLRU@V\SJ[F@79G8N:2[I.W#RU^_DGR$L`JH&B.Y>`````$E%3D2N0F"" +` +end --- gnome-panel-2.18.0.orig/debian/watch +++ gnome-panel-2.18.0/debian/watch @@ -0,0 +1,3 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/([\d\.]+)[02468]/gnome-panel-(.*)\.tar\.gz \ + debian uupdate --- gnome-panel-2.18.0.orig/debian/gnome-vfolder-user +++ gnome-panel-2.18.0/debian/gnome-vfolder-user @@ -0,0 +1,43 @@ +#!/usr/bin/install-menu +# gnome-vfolder based on: +# Also used as /etc/menu-methods/menu-xdg +# Copyright 2004 - Chris Cheney +# Licensed under the GNU General Public License, version 2. + +!include menu.h + +compat="menu-2" +outputencoding="UTF-8"; +outputlanguage="C"; + +function DirEntry() = + " " translate("",title()) "\n" + " " "debian" replacewith(tolower($section),"/","-") ".directory" "\n"; + +function desktop() = prefix() "/../../.local/share/applications/menu-xdg/X-Debian" replacewith($basesection,"/","-") "-" tolower(replacewith($title,"/ ","__") ".desktop"); + +supported; + x11 = "" desktop() "\n"; + text = "" desktop() "\n"; +endsupported; + +startmenu = " \n" DirEntry(); +endmenu = " \n"; +submenutitle = ""; + +treewalk = "(M)"; + +genmenu = "applications.debmenu"; +rcfile = "applications.vfolder-info"; +examplercfile="applications.template"; +mainmenutitle="Debian-user"; + +rootsection = ""; + +onlyrunasuser=true; +userprefix = ".gnome2/vfolders"; +rootprefix = "/etc/gnome-vfs-2.0/vfolders"; + +preoutput = ""; +postoutput = ""; + --- gnome-panel-2.18.0.orig/debian/gnome-desktop-item-edit.1 +++ gnome-panel-2.18.0/debian/gnome-desktop-item-edit.1 @@ -0,0 +1,30 @@ +.\" This manpage has been automatically generated by docbook2man +.\" from a DocBook document. This tool can be found at: +.\" +.\" Please send any bug reports, improvements, comments, patches, +.\" etc. to Steve Cheng . +.TH "GNOME-DESKTOP-ITEM-EDIT" "1" "07 dcembre 2003" "" "" + +.SH NAME +gnome-desktop-item-edit \- tool to edit .desktop file +.SH SYNOPSIS + +\fBgnome-desktop-item-edit\fR [ \fB--create-new \fR ] [ \fB--help \fR ] + +.SH "DESCRIPTION" +.PP +\fBgnome-desktop-item-edit\fR allows you to edit .desktop file. +.SH "OPTIONS" +.TP +\fB--create-new\fR +Create new file in the given directory. +.TP +\fB--help\fR +Display help +.SH "SEE ALSO" +.PP +gnome-options(7) +.SH "AUTHOR" +.PP +This manual page was written by Christian Marillat for +the Debian GNU/Linux system (but may be used by others). --- gnome-panel-2.18.0.orig/debian/libpanel-applet2-doc.doc-base +++ gnome-panel-2.18.0/debian/libpanel-applet2-doc.doc-base @@ -0,0 +1,11 @@ +Document: libpanel-applet2-doc +Title: Panel Applet Writer's Reference Manual +Author: Mark McLoughlin +Abstract: This manual documents the interfaces of the panel applet writing + library for GNOME 2.x and a short guide to porting applets from the GNOME + 1.x interfaces. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libpanel-applet2-doc/html/index.html +Files: /usr/share/doc/libpanel-applet2-doc/html/*.html --- gnome-panel-2.18.0.orig/debian/panel-default-setup-laptop.entries +++ gnome-panel-2.18.0/debian/panel-default-setup-laptop.entries @@ -0,0 +1,892 @@ + + + + + + + + general/toplevel_id_list + /schemas/apps/panel/general/toplevel_id_list + + + + top_panel + + + bottom_panel + + + + + + + + + general/object_id_list + /schemas/apps/panel/general/object_id_list + + + + menu_bar + + + firefox_launcher + + + evolution_launcher + + + yelp_launcher + + + session_dialog + + + + + + + + + general/applet_id_list + /schemas/apps/panel/general/applet_id_list + + + + notificationarea + + + mixer + + + clock + + + show_desktop_button + + + window_list + + + workspace_switcher + + + trashapplet + + + + + + general/enable_program_list/schemas/apps/panel/general/enable_program_list + general/show_program_list/schemas/apps/panel/general/show_program_list + + + + + toplevels/top_panel/name + /schemas/apps/panel/toplevels/name + + Top Panel + + + + toplevels/top_panel/expand + /schemas/apps/panel/toplevels/expand + + true + + + + toplevels/top_panel/orientation + /schemas/apps/panel/toplevels/orientation + + top + + + + toplevels/top_panel/size + /schemas/apps/panel/toplevels/size + + 24 + + + + toplevels/top_panel/screen/schemas/apps/panel/toplevels/screen + toplevels/top_panel/monitor/schemas/apps/panel/toplevels/monitor + toplevels/top_panel/x/schemas/apps/panel/toplevels/x + toplevels/top_panel/y/schemas/apps/panel/toplevels/y + toplevels/top_panel/x_centered/schemas/apps/panel/toplevels/x_centered + toplevels/top_panel/y_centered/schemas/apps/panel/toplevels/y_centered + toplevels/top_panel/auto_hide/schemas/apps/panel/toplevels/auto_hide + toplevels/top_panel/enable_animations/schemas/apps/panel/toplevels/enable_animations + toplevels/top_panel/enable_buttons/schemas/apps/panel/toplevels/enable_buttons + toplevels/top_panel/enable_arrows/schemas/apps/panel/toplevels/enable_arrows + toplevels/top_panel/hide_delay/schemas/apps/panel/toplevels/hide_delay + toplevels/top_panel/unhide_delay/schemas/apps/panel/toplevels/unhide_delay + toplevels/top_panel/auto_hide_size/schemas/apps/panel/toplevels/auto_hide_size + toplevels/top_panel/background/type/schemas/apps/panel/toplevels/background/type + toplevels/top_panel/background/color/schemas/apps/panel/toplevels/background/color + toplevels/top_panel/background/opacity/schemas/apps/panel/toplevels/background/opacity + toplevels/top_panel/background/image/schemas/apps/panel/toplevels/background/image + toplevels/top_panel/background/fit/schemas/apps/panel/toplevels/background/fit + toplevels/top_panel/background/stretch/schemas/apps/panel/toplevels/background/stretch + toplevels/top_panel/background/rotate/schemas/apps/panel/toplevels/background/rotate + + + + + toplevels/bottom_panel/name + /schemas/apps/panel/toplevels/name + + Bottom Panel + + + + toplevels/bottom_panel/expand + /schemas/apps/panel/toplevels/expand + + true + + + + toplevels/bottom_panel/orientation + /schemas/apps/panel/toplevels/orientation + + bottom + + + + toplevels/bottom_panel/size + /schemas/apps/panel/toplevels/size + + 24 + + + + toplevels/bottom_panel/screen/schemas/apps/panel/toplevels/screen + toplevels/bottom_panel/monitor/schemas/apps/panel/toplevels/monitor + toplevels/bottom_panel/x/schemas/apps/panel/toplevels/x + toplevels/bottom_panel/y/schemas/apps/panel/toplevels/y + toplevels/bottom_panel/x_centered/schemas/apps/panel/toplevels/x_centered + toplevels/bottom_panel/y_centered/schemas/apps/panel/toplevels/y_centered + toplevels/bottom_panel/auto_hide/schemas/apps/panel/toplevels/auto_hide + toplevels/bottom_panel/enable_animations/schemas/apps/panel/toplevels/enable_animations + toplevels/bottom_panel/enable_buttons/schemas/apps/panel/toplevels/enable_buttons + toplevels/bottom_panel/enable_arrows/schemas/apps/panel/toplevels/enable_arrows + toplevels/bottom_panel/hide_delay/schemas/apps/panel/toplevels/hide_delay + toplevels/bottom_panel/unhide_delay/schemas/apps/panel/toplevels/unhide_delay + toplevels/bottom_panel/auto_hide_size/schemas/apps/panel/toplevels/auto_hide_size + toplevels/bottom_panel/background/type/schemas/apps/panel/toplevels/background/type + toplevels/bottom_panel/background/color/schemas/apps/panel/toplevels/background/color + toplevels/bottom_panel/background/opacity/schemas/apps/panel/toplevels/background/opacity + toplevels/bottom_panel/background/image/schemas/apps/panel/toplevels/background/image + toplevels/bottom_panel/background/fit/schemas/apps/panel/toplevels/background/fit + toplevels/bottom_panel/background/stretch/schemas/apps/panel/toplevels/background/stretch + toplevels/bottom_panel/background/rotate/schemas/apps/panel/toplevels/background/rotate + + + + + objects/menu_bar/object_type + /schemas/apps/panel/objects/object_type + + menu-bar + + + + objects/menu_bar/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + + objects/menu_bar/position + /schemas/apps/panel/objects/position + + 0 + + + + objects/menu_bar/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + false + + + + objects/menu_bar/locked + /schemas/apps/panel/objects/locked + + true + + + + objects/menu_bar/bonobo_iid/schemas/apps/panel/objects/bonobo_iid + objects/menu_bar/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + objects/menu_bar/tooltip/schemas/apps/panel/objects/tooltip + objects/menu_bar/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + objects/menu_bar/custom_icon/schemas/apps/panel/objects/custom_icon + objects/menu_bar/use_menu_path/schemas/apps/panel/objects/use_menu_path + objects/menu_bar/menu_path/schemas/apps/panel/objects/menu_path + objects/menu_bar/launcher_location/schemas/apps/panel/objects/launcher_location + objects/menu_bar/action_type/schemas/apps/panel/objects/action_type + + + + + objects/nautilus_launcher/object_type + /schemas/apps/panel/objects/object_type + + launcher-object + + + + objects/nautilus_launcher/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + + objects/nautilus_launcher/position + /schemas/apps/panel/objects/position + + 1 + + + + objects/nautilus_launcher/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + false + + + + objects/nautilus_launcher/locked + /schemas/apps/panel/objects/locked + + true + + + + objects/nautilus_launcher/launcher_location + /schemas/apps/panel/objects/launcher_location + + applications:///nautilus.desktop + + + + objects/nautilus_launcher/bonobo_iid/schemas/apps/panel/objects/bonobo_iid + objects/nautilus_launcher/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + objects/nautilus_launcher/tooltip/schemas/apps/panel/objects/tooltip + objects/nautilus_launcher/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + objects/nautilus_launcher/custom_icon/schemas/apps/panel/objects/custom_icon + objects/nautilus_launcher/use_menu_path/schemas/apps/panel/objects/use_menu_path + objects/nautilus_launcher/menu_path/schemas/apps/panel/objects/menu_path + objects/nautilus_launcher/action_type/schemas/apps/panel/objects/action_type + + + + + objects/firefox_launcher/object_type + /schemas/apps/panel/objects/object_type + + launcher-object + + + + objects/firefox_launcher/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + + objects/firefox_launcher/position + /schemas/apps/panel/objects/position + + 2 + + + + objects/firefox_launcher/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + false + + + + objects/firefox_launcher/locked + /schemas/apps/panel/objects/locked + + true + + + + objects/firefox_launcher/launcher_location + /schemas/apps/panel/objects/launcher_location + + file:///usr/share/applications/firefox.desktop + + + + objects/firefox_launcher/bonobo_iid/schemas/apps/panel/objects/bonobo_iid + objects/firefox_launcher/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + objects/firefox_launcher/tooltip/schemas/apps/panel/objects/tooltip + objects/firefox_launcher/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + objects/firefox_launcher/custom_icon/schemas/apps/panel/objects/custom_icon + objects/firefox_launcher/use_menu_path/schemas/apps/panel/objects/use_menu_path + objects/firefox_launcher/menu_path/schemas/apps/panel/objects/menu_path + objects/firefox_launcher/action_type/schemas/apps/panel/objects/action_type + + + + + objects/evolution_launcher/object_type + /schemas/apps/panel/objects/object_type + + launcher-object + + + + objects/evolution_launcher/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + + objects/evolution_launcher/position + /schemas/apps/panel/objects/position + + 3 + + + + objects/evolution_launcher/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + false + + + + objects/evolution_launcher/locked + /schemas/apps/panel/objects/locked + + true + + + + objects/evolution_launcher/launcher_location + /schemas/apps/panel/objects/launcher_location + + file:///usr/share/applications/evolution-mail.desktop + + + + objects/evolution_launcher/bonobo_iid/schemas/apps/panel/objects/bonobo_iid + objects/evolution_launcher/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + objects/evolution_launcher/tooltip/schemas/apps/panel/objects/tooltip + objects/evolution_launcher/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + objects/evolution_launcher/custom_icon/schemas/apps/panel/objects/custom_icon + objects/evolution_launcher/use_menu_path/schemas/apps/panel/objects/use_menu_path + objects/evolution_launcher/menu_path/schemas/apps/panel/objects/menu_path + objects/evolution_launcher/action_type/schemas/apps/panel/objects/action_type + + + + + objects/yelp_launcher/object_type + /schemas/apps/panel/objects/object_type + + launcher-object + + + + objects/yelp_launcher/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + + objects/yelp_launcher/position + /schemas/apps/panel/objects/position + + 4 + + + + objects/yelp_launcher/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + false + + + + objects/yelp_launcher/locked + /schemas/apps/panel/objects/locked + + true + + + + objects/yelp_launcher/launcher_location + /schemas/apps/panel/objects/launcher_location + + file:///usr/share/applications/yelp.desktop + + + + objects/yelp_launcher/bonobo_iid/schemas/apps/panel/objects/bonobo_iid + objects/yelp_launcher/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + objects/yelp_launcher/tooltip/schemas/apps/panel/objects/tooltip + objects/yelp_launcher/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + objects/yelp_launcher/custom_icon/schemas/apps/panel/objects/custom_icon + objects/yelp_launcher/use_menu_path/schemas/apps/panel/objects/use_menu_path + objects/yelp_launcher/menu_path/schemas/apps/panel/objects/menu_path + objects/yelp_launcher/action_type/schemas/apps/panel/objects/action_type + + + + + applets/mixer/object_type + /schemas/apps/panel/objects/object_type + + bonobo-applet + + + + applets/mixer/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + + applets/mixer/position + /schemas/apps/panel/objects/position + + 1 + + + + applets/mixer/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + true + + + + applets/mixer/locked + /schemas/apps/panel/objects/locked + + true + + + + applets/mixer/bonobo_iid + /schemas/apps/panel/objects/bonobo_iid + + OAFIID:GNOME_MixerApplet + + + + applets/mixer/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + applets/mixer/tooltip/schemas/apps/panel/objects/tooltip + applets/mixer/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + applets/mixer/custom_icon/schemas/apps/panel/objects/custom_icon + applets/mixer/use_menu_path/schemas/apps/panel/objects/use_menu_path + applets/mixer/menu_path/schemas/apps/panel/objects/menu_path + applets/mixer/launcher_location/schemas/apps/panel/objects/launcher_location + applets/mixer/action_type/schemas/apps/panel/objects/action_type + + + + + applets/clock/object_type + /schemas/apps/panel/objects/object_type + + bonobo-applet + + + + applets/clock/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + + applets/clock/position + /schemas/apps/panel/objects/position + + 0 + + + + applets/clock/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + true + + + + applets/clock/locked + /schemas/apps/panel/objects/locked + + true + + + + applets/clock/bonobo_iid + /schemas/apps/panel/objects/bonobo_iid + + OAFIID:GNOME_ClockApplet + + + + applets/clock/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + applets/clock/tooltip/schemas/apps/panel/objects/tooltip + applets/clock/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + applets/clock/custom_icon/schemas/apps/panel/objects/custom_icon + applets/clock/use_menu_path/schemas/apps/panel/objects/use_menu_path + applets/clock/menu_path/schemas/apps/panel/objects/menu_path + applets/clock/launcher_location/schemas/apps/panel/objects/launcher_location + applets/clock/action_type/schemas/apps/panel/objects/action_type + + + + + applets/notificationarea/object_type + /schemas/apps/panel/objects/object_type + + bonobo-applet + + + + applets/notificationarea/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + + applets/notificationarea/position + /schemas/apps/panel/objects/position + + 4 + + + + applets/notificationarea/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + true + + + + applets/notificationarea/locked + /schemas/apps/panel/objects/locked + + true + + + + applets/notificationarea/bonobo_iid + /schemas/apps/panel/objects/bonobo_iid + + OAFIID:GNOME_NotificationAreaApplet + + + + applets/notificationarea/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + applets/notificationarea/tooltip/schemas/apps/panel/objects/tooltip + applets/notificationarea/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + applets/notificationarea/custom_icon/schemas/apps/panel/objects/custom_icon + applets/notificationarea/use_menu_path/schemas/apps/panel/objects/use_menu_path + applets/notificationarea/menu_path/schemas/apps/panel/objects/menu_path + applets/notificationarea/launcher_location/schemas/apps/panel/objects/launcher_location + applets/notificationarea/action_type/schemas/apps/panel/objects/action_type + + + + + applets/show_desktop_button/object_type + /schemas/apps/panel/objects/object_type + + bonobo-applet + + + + applets/show_desktop_button/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + bottom_panel + + + + applets/show_desktop_button/position + /schemas/apps/panel/objects/position + + 0 + + + + applets/show_desktop_button/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + false + + + + applets/show_desktop_button/locked + /schemas/apps/panel/objects/locked + + true + + + + applets/show_desktop_button/bonobo_iid + /schemas/apps/panel/objects/bonobo_iid + + OAFIID:GNOME_ShowDesktopApplet + + + + applets/show_desktop_button/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + applets/show_desktop_button/tooltip/schemas/apps/panel/objects/tooltip + applets/show_desktop_button/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + applets/show_desktop_button/custom_icon/schemas/apps/panel/objects/custom_icon + applets/show_desktop_button/use_menu_path/schemas/apps/panel/objects/use_menu_path + applets/show_desktop_button/menu_path/schemas/apps/panel/objects/menu_path + applets/show_desktop_button/launcher_location/schemas/apps/panel/objects/launcher_location + applets/show_desktop_button/action_type/schemas/apps/panel/objects/action_type + + + + + objects/session_dialog/object_type + /schemas/apps/panel/objects/object_type + + action-applet + + + + objects/session_dialog/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + + objects/session_dialog/position + /schemas/apps/panel/objects/position + + 0 + + + + objects/session_dialog/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + true + + + + objects/session_dialog/locked + /schemas/apps/panel/objects/locked + + true + + + + objects/session_dialog/action_type + /schemas/apps/panel/objects/action_type + + logout + + + + objects/session_dialog/launcher_location + /schemas/apps/panel/objects/launcher_location + + + + + + objects/session_dialog/bonobo_iid/schemas/apps/panel/objects/bonobo_iid + objects/session_dialog/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + objects/session_dialog/tooltip/schemas/apps/panel/objects/tooltip + objects/session_dialog/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + objects/session_dialog/custom_icon/schemas/apps/panel/objects/custom_icon + objects/session_dialog/use_menu_path/schemas/apps/panel/objects/use_menu_path + objects/session_dialog/menu_path/schemas/apps/panel/objects/menu_path + objects/session_dialog/action_type/schemas/apps/panel/objects/action_type + + + + + applets/window_list/object_type + /schemas/apps/panel/objects/object_type + + bonobo-applet + + + + applets/window_list/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + bottom_panel + + + + applets/window_list/position + /schemas/apps/panel/objects/position + + 1 + + + + applets/window_list/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + false + + + + applets/window_list/locked + /schemas/apps/panel/objects/locked + + true + + + + applets/window_list/bonobo_iid + /schemas/apps/panel/objects/bonobo_iid + + OAFIID:GNOME_WindowListApplet + + + + applets/window_list/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + applets/window_list/tooltip/schemas/apps/panel/objects/tooltip + applets/window_list/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + applets/window_list/custom_icon/schemas/apps/panel/objects/custom_icon + applets/window_list/use_menu_path/schemas/apps/panel/objects/use_menu_path + applets/window_list/menu_path/schemas/apps/panel/objects/menu_path + applets/window_list/launcher_location/schemas/apps/panel/objects/launcher_location + applets/window_list/action_type/schemas/apps/panel/objects/action_type + + + + + applets/workspace_switcher/object_type + /schemas/apps/panel/objects/object_type + + bonobo-applet + + + + applets/workspace_switcher/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + bottom_panel + + + + applets/workspace_switcher/position + /schemas/apps/panel/objects/position + + 1 + + + + applets/workspace_switcher/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + true + + + + applets/workspace_switcher/locked + /schemas/apps/panel/objects/locked + + true + + + + applets/workspace_switcher/bonobo_iid + /schemas/apps/panel/objects/bonobo_iid + + OAFIID:GNOME_WorkspaceSwitcherApplet + + + + applets/workspace_switcher/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + applets/workspace_switcher/tooltip/schemas/apps/panel/objects/tooltip + applets/workspace_switcher/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + applets/workspace_switcher/custom_icon/schemas/apps/panel/objects/custom_icon + applets/workspace_switcher/use_menu_path/schemas/apps/panel/objects/use_menu_path + applets/workspace_switcher/menu_path/schemas/apps/panel/objects/menu_path + applets/workspace_switcher/launcher_location/schemas/apps/panel/objects/launcher_location + applets/workspace_switcher/action_type/schemas/apps/panel/objects/action_type + + + + + applets/trashapplet/object_type + /schemas/apps/panel/objects/object_type + + bonobo-applet + + + + applets/trashapplet/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + bottom_panel + + + + applets/trashapplet/position + /schemas/apps/panel/objects/position + + 0 + + + + applets/trashapplet/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + true + + + + applets/trashapplet/locked + /schemas/apps/panel/objects/locked + + true + + + + applets/trashapplet/bonobo_iid + /schemas/apps/panel/objects/bonobo_iid + + OAFIID:GNOME_Panel_TrashApplet + + + + applets/trashapplet/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + applets/trashapplet/tooltip/schemas/apps/panel/objects/tooltip + applets/trashapplet/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + applets/trashapplet/custom_icon/schemas/apps/panel/objects/custom_icon + applets/trashapplet/use_menu_path/schemas/apps/panel/objects/use_menu_path + applets/trashapplet/menu_path/schemas/apps/panel/objects/menu_path + applets/trashapplet/launcher_location/schemas/apps/panel/objects/launcher_location + applets/trashapplet/action_type/schemas/apps/panel/objects/action_type + + + + --- gnome-panel-2.18.0.orig/debian/libpanel-applet2-doc.install +++ gnome-panel-2.18.0/debian/libpanel-applet2-doc.install @@ -0,0 +1 @@ +doc/reference/panel-applet/html usr/share/doc/libpanel-applet2-doc/ --- gnome-panel-2.18.0.orig/debian/gnome-panel.manpages +++ gnome-panel-2.18.0/debian/gnome-panel.manpages @@ -0,0 +1,2 @@ +man/*.1 +debian/*.1 --- gnome-panel-2.18.0.orig/debian/ubuntu-about.desktop +++ gnome-panel-2.18.0/debian/ubuntu-about.desktop @@ -0,0 +1,50 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=About Ubuntu +Name[ca]=Quant a Ubuntu +Name[da]=Om Ubuntu +Name[de]=Über Ubuntu +Name[el]=Περί Ubuntu +Name[es]=Acerca de Ubuntu +Name[fa]=درباره Ubuntu +Name[fi]=Tietoja Ubuntusta +Name[fr]=À propos d'Ubuntu +Name[he]=אודות אובונטו +Name[hu]=Az Ubuntu névjegye +Name[is]=Um Ubuntu +Name[it]=Informazioni su Ubuntu +Name[nl]=Over Ubuntu +Name[pt]=Sobre o Ubuntu +Name[pt_BR]=Sobre o Ubuntu +Name[ro]=Despre Ubuntu +Name[sk]=O Ubuntu +Name[sv]=Om Ubuntu +Name[xh]=Malunga ne-Ubuntu +Name[zh_CN]=关于 Ubuntu +Comment=Learn more about Ubuntu +Comment[ca]=Conegueu més sobre Ubuntu +Comment[da]=Lær mere om Ubuntu +Comment[de]=Mehr über Ubuntu erfahren +Comment[el]=Μάθετε περισσότερα για το Ubuntu +Comment[es]=Sepa más acerca de ubuntu +Comment[fa]=راجع به Ubuntu بیشتر بدانید +Comment[fi]=Näytä tietoja Ubuntu-järjestelmästä +Comment[fr]=En savoir plus à propos d'Ubuntu +Comment[he]=קרא דואר באמצעות אבולושיין +Comment[hu]=Tudjon meg többet az Ubunturól +Comment[is]=Lærðu meira um Ubuntu +Comment[it]=Sapere di più circa Ubuntu +Comment[nl]=Kom meer te weten over Ubunt +Comment[pt]=Aprenda mais sobre o Ubuntu +Comment[pt_BR]=Aprenda mais sobre o Ubuntu +Comment[ro]=Aflaţi mai multe despre Ubuntu +Comment[sk]=Dozvedieť sa viac o Ubuntu +Comment[sv]=Lär dig mer om Ubuntu +Comment[xh]=Funda ngaphezulu nge-Ubuntu +Comment[zh_CN]=更多有关 Ubuntu 的信息 +Exec=yelp ghelp:about-ubuntu +Icon=distributor-logo +Terminal=false +Type=Application +Categories=GNOME;Application;Core; +StartupNotify=true --- gnome-panel-2.18.0.orig/debian/control.in +++ gnome-panel-2.18.0/debian/control.in @@ -0,0 +1,54 @@ +Source: gnome-panel +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Guilherme de S. Pastore +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.7.2 +Build-Depends: @cdbs@, liborbit2-dev (>= 1:2.12.1-1), libgconf2-dev (>= 2.6.1), libpango1.0-dev (>= 1.15.4), intltool, gnome-pkg-tools, dpkg-dev (>= 1.13.19), libgtk2.0-dev (>= 2.10), libglade2-dev (>= 1:2.5.1), libwnck-dev (>= 2.13.5), scrollkeeper (>= 0.3.14-9.1), libgnome-desktop-dev (>= 2.11.1), libpng12-dev, libbonobo2-dev (>= 2.8.1-2), libxmu-dev, libecal1.2-dev (>= 1.2.1-1) [!hurd-i386], libgnomevfs2-dev (>= 2.14.2), libxres-dev, sharutils, gnome-doc-utils, libedataserver1.2-dev, libedataserverui1.2-dev (>= 1.3.0), libxau-dev, libcairo2-dev (>= 1.0.0), libgnome-menu-dev (>= 2.16.1-1), libnspr-dev, liblpint-bonobo-dev, liblaunchpad-integration-dev, libdbus-glib-1-dev + +Package: gnome-panel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-panel-data (= ${source:Version}), gnome-desktop-data (>= 2.10.0-1), gnome-control-center (>= 1:2.8.2-3), gnome-menus (>= 2.11.1-1), gnome-about (>= 2.10.0-1) +Recommends: gnome-applets (>= 2.12.1-1), gnome-session, evolution-data-server, menu-xdg (>= 0.2), alacarte +Suggests: yelp, gnome2-user-guide, gnome-terminal | x-terminal-emulator , gnome-system-tools, nautilus, fortunes-mod +Description: launcher and docking facility for GNOME 2 + This package contains toolbar-like “panels” which can be attached to + the sides of your X desktop, or left “floating”. It is designed to be + used in conjunction with the Gnome Desktop Environment. Many features + are provided for use with the panels – including an application menu, + clock, mail checker, network monitor, quick launch icons and the like. + +Package: libpanel-applet2-0 +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: library for GNOME 2 panel applets + This library is used by GNOME 2 panel applets. + +Package: libpanel-applet2-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, libpanel-applet2-0 (= ${binary:Version}), libgnomeui-dev (>= 2.10.0-1), liborbit2-dev (>= 1:2.12.4-1) +Description: library for GNOME 2 panel applets - development files + This packages provides the include files and static library for the GNOME 2 + panel applet library functions. + +Package: libpanel-applet2-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: doc-base +Description: library for GNOME 2 panel applets - documentation files + This packages provides the documentation files for the GNOME 2 panel applet + library functions. + +Package: gnome-panel-data +Section: gnome +Architecture: all +Depends: scrollkeeper (>= 0.3.14-9.1), gconf2 (>= 2.14.0-2) +Recommends: gnome-panel +Description: common files for GNOME 2 panel + This package includes some files that are needed by the GNOME 2 panel + (Pixmaps, .desktop files and internationalization files). + --- gnome-panel-2.18.0.orig/debian/patches/12_autoconf.patch +++ gnome-panel-2.18.0/debian/patches/12_autoconf.patch @@ -0,0 +1,21353 @@ +diff -Nur gnome-panel-2.18.0/aclocal.m4 gnome-panel-2.18.0.new/aclocal.m4 +--- gnome-panel-2.18.0/aclocal.m4 2007-03-12 20:05:25.000000000 +0100 ++++ gnome-panel-2.18.0.new/aclocal.m4 2007-03-13 00:55:43.000000000 +0100 +@@ -11,5941 +11,5373 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + +-# Copyright (C) 2002, 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. ++dnl AM_GCONF_SOURCE_2 ++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas ++dnl (i.e. pass to gconftool-2 ++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where ++dnl you should install foo.schemas files ++dnl + +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) ++AC_DEFUN([AM_GCONF_SOURCE_2], ++[ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi + +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.9.6])]) ++ AC_ARG_WITH(gconf-source, ++ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) + +-# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) + +-# 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. ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi + +-# 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/../..'. ++ AC_ARG_WITH(gconf-schema-file-dir, ++ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) ++ ++ AC_SUBST(GCONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ ++ AC_ARG_ENABLE(schemas-install, ++ [ --disable-schemas-install Disable the schemas installation], ++ [case ${enableval} in ++ yes|no) ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; ++ esac]) ++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++]) ++ ++# Copyright (C) 1995-2002 Free Software Foundation, Inc. ++# Copyright (C) 2001-2003,2004 Red Hat, Inc. + # +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. + # +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir ++# This file can be copied and used freely without restrictions. It can ++# be used in projects which are not available under the GNU Public License ++# but which still want to provide support for the GNU gettext functionality. + # +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. ++# Macro to add for using GNU gettext. ++# Ulrich Drepper , 1995, 1996 + # +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# Modified to never use included libintl. ++# Owen Taylor , 12/15/1998 + # +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. +- +-AC_DEFUN([AM_AUX_DIR_EXPAND], +-[dnl Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50])dnl +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` +-]) +- +-# AM_CONDITIONAL -*- Autoconf -*- +- +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +-# Free Software Foundation, Inc. ++# Major rework to remove unused code ++# Owen Taylor , 12/11/2002 + # +-# 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. ++# Added better handling of ALL_LINGUAS from GNU gettext version ++# written by Bruno Haible, Owen Taylor 5/30/3002 ++# ++# Modified to require ngettext ++# Matthias Clasen 08/06/2004 ++# ++# We need this here as well, since someone might use autoconf-2.5x ++# to configure GLib then an older version to configure a package ++# using AM_GLIB_GNU_GETTEXT ++AC_PREREQ(2.53) + +-# serial 7 ++dnl ++dnl We go to great lengths to make sure that aclocal won't ++dnl try to pull in the installed version of these macros ++dnl when running aclocal in the glib directory. ++dnl ++m4_copy([AC_DEFUN],[glib_DEFUN]) ++m4_copy([AC_REQUIRE],[glib_REQUIRE]) ++dnl ++dnl At the end, if we're not within glib, we'll define the public ++dnl definitions in terms of our private definitions. ++dnl + +-# AM_CONDITIONAL(NAME, SHELL-CONDITION) +-# ------------------------------------- +-# Define a conditional. +-AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ(2.52)dnl +- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE]) +-AC_SUBST([$1_FALSE]) +-if $2; then +- $1_TRUE= +- $1_FALSE='#' ++# GLIB_LC_MESSAGES ++#-------------------- ++glib_DEFUN([GLIB_LC_MESSAGES], ++ [AC_CHECK_HEADERS([locale.h]) ++ if test $ac_cv_header_locale_h = yes; then ++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++ [AC_TRY_LINK([#include ], [return LC_MESSAGES], ++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ AC_DEFINE(HAVE_LC_MESSAGES, 1, ++ [Define if your file defines LC_MESSAGES.]) ++ fi ++ fi]) ++ ++# GLIB_PATH_PROG_WITH_TEST ++#---------------------------- ++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, ++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], ++[# Extract the first word of "$2", so it can be a program name with args. ++set dummy $2; ac_word=[$]2 ++AC_MSG_CHECKING([for $ac_word]) ++AC_CACHE_VAL(ac_cv_path_$1, ++[case "[$]$1" in ++ /*) ++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in ifelse([$5], , $PATH, [$5]); do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if [$3]; then ++ ac_cv_path_$1="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++dnl If no 4th arg is given, leave the cache variable unset, ++dnl so AC_PATH_PROGS will keep looking. ++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ++])dnl ++ ;; ++esac])dnl ++$1="$ac_cv_path_$1" ++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then ++ AC_MSG_RESULT([$]$1) + else +- $1_TRUE='#' +- $1_FALSE= ++ AC_MSG_RESULT(no) + fi +-AC_CONFIG_COMMANDS_PRE( +-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([[conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]]) +-fi])]) +- +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 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. ++AC_SUBST($1)dnl ++]) + +-# serial 8 ++# GLIB_WITH_NLS ++#----------------- ++glib_DEFUN([GLIB_WITH_NLS], ++ dnl NLS is obligatory ++ [AC_REQUIRE([AC_CANONICAL_HOST])dnl ++ USE_NLS=yes ++ AC_SUBST(USE_NLS) + +-# 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, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++ gt_cv_have_gettext=no + ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" + +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) +- +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # 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'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +- +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break ++ # ++ # First check in libc ++ # ++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !ngettext ("","", 1)], ++ gt_cv_func_ngettext_libc=yes, ++ gt_cv_func_ngettext_libc=no) ++ ]) ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !dgettext ("","")], ++ gt_cv_func_dgettext_libc=yes, ++ gt_cv_func_dgettext_libc=no) ++ ]) + fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CHECK_FUNCS(bind_textdomain_codeset) + fi +- fi +- done + +- cd .. +- rm -rf conftest.dir +-else +- am_cv_$1_dependencies_compiler_type=none +-fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) ++ # ++ # If we don't have everything we want, check in libintl ++ # ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ || test "$gt_cv_func_ngettext_libc" != "yes" \ ++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++ ++ AC_CHECK_LIB(intl, bindtextdomain, ++ [AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dgettext, ++ gt_cv_func_dgettext_libintl=yes)])]) + ++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++ AC_MSG_CHECKING([if -liconv is needed to use gettext]) ++ AC_MSG_RESULT([]) ++ AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dcgettext, ++ [gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv], ++ :,-liconv)], ++ :,-liconv) ++ fi + +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ AC_CHECK_FUNCS(bind_textdomain_codeset) ++ LIBS="$glib_save_LIBS" + ++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ++ gt_cv_func_dgettext_libc=no ++ else ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ && test "$gt_cv_func_ngettext_libc" = "yes"; then ++ gt_cv_func_dgettext_libintl=no ++ fi ++ fi ++ fi ++ fi + +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH]) +-]) ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ AC_DEFINE(HAVE_GETTEXT,1, ++ [Define if the GNU gettext() function is already present or preinstalled.]) ++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ AC_CHECK_FUNCS(dcgettext) ++ MSGFMT_OPTS= ++ AC_MSG_CHECKING([if msgfmt accepts -c]) ++ GLIB_RUN_PROG([msgfmt -c -o /dev/null],[ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test \n" ++"Language-Team: C \n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) ++ AC_SUBST(MSGFMT_OPTS) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share and ++ dnl and CATOBJEXT=.gmo in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [CATOBJEXT=.mo ++ DATADIRNAME=lib]) ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac]) ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi ++ fi ++ ]) + +-# Generate code to set up dependency tracking. -*- Autoconf -*- ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [always defined to indicate that i18n is enabled]) ++ fi + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 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. ++ dnl Test whether we really found GNU xgettext. ++ if test "$XGETTEXT" != ":"; then ++ dnl If it is not GNU xgettext we define it as : so that the ++ dnl Makefiles still can work. ++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++ : ; ++ else ++ AC_MSG_RESULT( ++ [found xgettext program is not GNU xgettext; ignore it]) ++ XGETTEXT=":" ++ fi ++ fi + +-#serial 3 ++ # We need to process the po/ directory. ++ POSUB=po + +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +-done +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) + ++ dnl These rules are solely for the distribution goal. While doing this ++ dnl we only have to keep exactly one list of the available catalogs ++ dnl in configure.in. ++ for lang in $ALL_LINGUAS; do ++ GMOFILES="$GMOFILES $lang.gmo" ++ POFILES="$POFILES $lang.po" ++ done + +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +-]) ++ dnl Make all variables we use known to autoconf. ++ AC_SUBST(CATALOGS) ++ AC_SUBST(CATOBJEXT) ++ AC_SUBST(DATADIRNAME) ++ AC_SUBST(GMOFILES) ++ AC_SUBST(INSTOBJEXT) ++ AC_SUBST(INTLLIBS) ++ AC_SUBST(PO_IN_DATADIR_TRUE) ++ AC_SUBST(PO_IN_DATADIR_FALSE) ++ AC_SUBST(POFILES) ++ AC_SUBST(POSUB) ++ ]) + +-# 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. ++# AM_GLIB_GNU_GETTEXT ++# ------------------- ++# Do checks necessary for use of gettext. If a suitable implementation ++# of gettext is found in either in libintl or in the C library, ++# it will set INTLLIBS to the libraries needed for use of gettext ++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable ++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() ++# on various variables needed by the Makefile.in.in installed by ++# glib-gettextize. ++dnl ++glib_DEFUN([GLIB_GNU_GETTEXT], ++ [AC_REQUIRE([AC_PROG_CC])dnl ++ AC_REQUIRE([AC_HEADER_STDC])dnl ++ ++ GLIB_LC_MESSAGES ++ GLIB_WITH_NLS + +-# serial 8 ++ if test "$gt_cv_have_gettext" = "yes"; then ++ if test "x$ALL_LINGUAS" = "x"; then ++ LINGUAS= ++ else ++ AC_MSG_CHECKING(for catalogs to be installed) ++ NEW_LINGUAS= ++ for presentlang in $ALL_LINGUAS; do ++ useit=no ++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ++ desiredlanguages="$LINGUAS" ++ else ++ desiredlanguages="$ALL_LINGUAS" ++ fi ++ for desiredlang in $desiredlanguages; do ++ # Use the presentlang catalog if desiredlang is ++ # a. equal to presentlang, or ++ # b. a variant of presentlang (because in this case, ++ # presentlang can be used as a fallback for messages ++ # which are not translated in the desiredlang catalog). ++ case "$desiredlang" in ++ "$presentlang"*) useit=yes;; ++ esac ++ done ++ if test $useit = yes; then ++ NEW_LINGUAS="$NEW_LINGUAS $presentlang" ++ fi ++ done ++ LINGUAS=$NEW_LINGUAS ++ AC_MSG_RESULT($LINGUAS) ++ fi + +-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++ dnl Construct list of names of catalog files to be constructed. ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi ++ fi + +-# Do all the work for Automake. -*- Autoconf -*- ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ AC_SUBST(MKINSTALLDIRS) + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 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. ++ dnl Generate list of files to be processed by xgettext which will ++ dnl be included in po/Makefile. ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ]) + +-# serial 12 ++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) ++# ------------------------------- ++# Define VARIABLE to the location where catalog files will ++# be installed by po/Makefile. ++glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl ++glib_save_prefix="$prefix" ++glib_save_exec_prefix="$exec_prefix" ++glib_save_datarootdir="$datarootdir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++datarootdir=`eval echo "${datarootdir}"` ++if test "x$CATOBJEXT" = "x.mo" ; then ++ localedir=`eval echo "${libdir}/locale"` ++else ++ localedir=`eval echo "${datadir}/locale"` ++fi ++prefix="$glib_save_prefix" ++exec_prefix="$glib_save_exec_prefix" ++datarootdir="$glib_save_datarootdir" ++AC_DEFINE_UNQUOTED($1, "$localedir", ++ [Define the location where the catalogs will be installed]) ++]) + +-# This macro actually does too much. Some checks are only needed if +-# your package does certain things. But this isn't really a big deal. ++dnl ++dnl Now the definitions that aclocal will find ++dnl ++ifdef(glib_configure_in,[],[ ++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) ++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ++])dnl + +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.58])dnl +-dnl Autoconf wants to disallow AM_ names. We explicitly allow +-dnl the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +-AC_REQUIRE([AC_PROG_INSTALL])dnl +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +-fi ++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) ++# ++# Create a temporary file with TEST-FILE as its contents and pass the ++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with ++# 0 and perform ACTION-IF-FAIL for any other exit status. ++AC_DEFUN([GLIB_RUN_PROG], ++[cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) + +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi +-fi +-AC_SUBST([CYGPATH_W]) + +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++# gnome-common.m4 ++# + +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++dnl GNOME_COMMON_INIT + +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-AC_REQUIRE([AC_PROG_AWK])dnl +-AC_REQUIRE([AC_PROG_MAKE_SET])dnl +-AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_DEFUN([GNOME_COMMON_INIT], ++[ ++ dnl this macro should come after AC_CONFIG_MACRO_DIR ++ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) ++ ++ dnl ensure that when the Automake generated makefile calls aclocal, ++ dnl it honours the $ACLOCAL_FLAGS environment variable ++ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" ++ if test -n "$ac_macro_dir"; then ++ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" ++ fi ++ ++ AC_SUBST([ACLOCAL_AMFLAGS]) + ]) ++ ++AC_DEFUN([GNOME_DEBUG_CHECK], ++[ ++ AC_ARG_ENABLE([debug], ++ AC_HELP_STRING([--enable-debug], ++ [turn on debugging]),, ++ [enable_debug=no]) ++ ++ if test x$enable_debug = xyes ; then ++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1, ++ [Enable additional debugging at the expense of performance and size]) ++ fi + ]) + ++dnl GNOME_MAINTAINER_MODE_DEFINES () ++dnl define DISABLE_DEPRECATED ++dnl ++AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], ++[ ++ AC_REQUIRE([AM_MAINTAINER_MODE]) + +-# When config.status generates a header, we must update the stamp-h file. +-# This file resides in the same directory as the config header +-# that is generated. The stamp files are numbered to have different names. ++ if test $USE_MAINTAINER_MODE = yes; then ++ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED" ++ else ++ DISABLE_DEPRECATED="" ++ fi ++ AC_SUBST(DISABLE_DEPRECATED) ++]) + +-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +-# loop where config.status creates the headers, so we can generate +-# our stamp files there. +-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +-[# Compute $1's index in $config_headers. +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $1 | $1:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++dnl GNOME_COMPILE_WARNINGS ++dnl Turn on many useful compiler warnings ++dnl For now, only works on GCC ++AC_DEFUN([GNOME_COMPILE_WARNINGS],[ ++ dnl ****************************** ++ dnl More compiler warnings ++ dnl ****************************** + +-# 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. ++ AC_ARG_ENABLE(compile-warnings, ++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], ++ [Turn on compiler warnings]),, ++ [enable_compile_warnings="m4_default([$1],[yes])"]) + +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} +-AC_SUBST(install_sh)]) ++ warnCFLAGS= ++ if test "x$GCC" != xyes; then ++ enable_compile_warnings=no ++ fi + +-# Copyright (C) 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. ++ warning_flags= ++ realsave_CFLAGS="$CFLAGS" + +-# serial 2 ++ case "$enable_compile_warnings" in ++ no) ++ warning_flags= ++ ;; ++ minimum) ++ warning_flags="-Wall" ++ ;; ++ yes) ++ warning_flags="-Wall -Wmissing-prototypes" ++ ;; ++ maximum|error) ++ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" ++ CFLAGS="$warning_flags $CFLAGS" ++ for option in -Wno-sign-compare; do ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $option" ++ AC_MSG_CHECKING([whether gcc understands $option]) ++ AC_TRY_COMPILE([], [], ++ has_option=yes, ++ has_option=no,) ++ CFLAGS="$SAVE_CFLAGS" ++ AC_MSG_RESULT($has_option) ++ if test $has_option = yes; then ++ warning_flags="$warning_flags $option" ++ fi ++ unset has_option ++ unset SAVE_CFLAGS ++ done ++ unset option ++ if test "$enable_compile_warnings" = "error" ; then ++ warning_flags="$warning_flags -Werror" ++ fi ++ ;; ++ *) ++ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) ++ ;; ++ esac ++ CFLAGS="$realsave_CFLAGS" ++ AC_MSG_CHECKING(what warning flags to pass to the C compiler) ++ AC_MSG_RESULT($warning_flags) + +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) ++ AC_ARG_ENABLE(iso-c, ++ AC_HELP_STRING([--enable-iso-c], ++ [Try to warn if code is not ISO C ]),, ++ [enable_iso_c=no]) + +-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +-# From Jim Meyering ++ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) ++ complCFLAGS= ++ if test "x$enable_iso_c" != "xno"; then ++ if test "x$GCC" = "xyes"; then ++ case " $CFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCFLAGS="$complCFLAGS -ansi" ;; ++ esac ++ case " $CFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCFLAGS="$complCFLAGS -pedantic" ;; ++ esac ++ fi ++ fi ++ AC_MSG_RESULT($complCFLAGS) + +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 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. ++ WARN_CFLAGS="$warning_flags $complCFLAGS" ++ AC_SUBST(WARN_CFLAGS) ++]) + +-# serial 4 ++dnl For C++, do basically the same thing. + +-AC_DEFUN([AM_MAINTAINER_MODE], +-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +- dnl maintainer-mode is disabled by default +- AC_ARG_ENABLE(maintainer-mode, +-[ --enable-maintainer-mode enable make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- USE_MAINTAINER_MODE=$enableval, +- USE_MAINTAINER_MODE=no) +- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) +- MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST(MAINT)dnl +-] +-) ++AC_DEFUN([GNOME_CXX_WARNINGS],[ ++ AC_ARG_ENABLE(cxx-warnings, ++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] ++ [Turn on compiler warnings.]),, ++ [enable_cxx_warnings="m4_default([$1],[minimum])"]) + +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) ++ warnCXXFLAGS= ++ if test "x$GCC" != xyes; then ++ enable_compile_warnings=no ++ fi ++ if test "x$enable_cxx_warnings" != "xno"; then ++ if test "x$GCC" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-Wall[\ \ ]*) ;; ++ *) warnCXXFLAGS="-Wall -Wno-unused" ;; ++ esac + +-# Check to see how 'make' treats includes. -*- Autoconf -*- ++ ## -W is not all that useful. And it cannot be controlled ++ ## with individual -Wno-xxx flags, unlike -Wall ++ if test "x$enable_cxx_warnings" = "xyes"; then ++ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" ++ fi ++ fi ++ fi ++ AC_MSG_RESULT($warnCXXFLAGS) + +-# Copyright (C) 2001, 2002, 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. ++ AC_ARG_ENABLE(iso-cxx, ++ AC_HELP_STRING([--enable-iso-cxx], ++ [Try to warn if code is not ISO C++ ]),, ++ [enable_iso_cxx=no]) + +-# serial 3 ++ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) ++ complCXXFLAGS= ++ if test "x$enable_iso_cxx" != "xno"; then ++ if test "x$GCC" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; ++ esac + +-# AM_MAKE_INCLUDE() +-# ----------------- +-# Check to see how make treats includes. +-AC_DEFUN([AM_MAKE_INCLUDE], +-[am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo done +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-AC_MSG_CHECKING([for style of include used by $am_make]) +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD ++ case " $CXXFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; ++ esac ++ fi + fi +-fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf +-]) ++ AC_MSG_RESULT($complCXXFLAGS) + +-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" ++ AC_SUBST(WARN_CXXFLAGS) ++]) + +-# Copyright (C) 1997, 1999, 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. ++dnl Do not call GNOME_DOC_DEFINES directly. It is split out from ++dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. ++AC_DEFUN([GNOME_DOC_DEFINES], ++[ ++AC_ARG_WITH([help-dir], ++ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, ++ [with_help_dir='${datadir}/gnome/help']) ++HELP_DIR="$with_help_dir" ++AC_SUBST(HELP_DIR) ++ ++AC_ARG_WITH([omf-dir], ++ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, ++ [with_omf_dir='${datadir}/omf']) ++OMF_DIR="$with_omf_dir" ++AC_SUBST(OMF_DIR) ++ ++AC_ARG_WITH([help-formats], ++ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, ++ [with_help_formats='']) ++DOC_USER_FORMATS="$with_help_formats" ++AC_SUBST(DOC_USER_FORMATS) ++ ++AC_ARG_ENABLE([scrollkeeper], ++ [AC_HELP_STRING([--disable-scrollkeeper], ++ [do not make updates to the scrollkeeper database])],, ++ enable_scrollkeeper=yes) ++AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) + +-# serial 4 ++AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) ++]) + +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) ++# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) ++# ++AC_DEFUN([GNOME_DOC_INIT], ++[ ++ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) + ++PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], ++ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) + +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " ++if test "$gdu_cv_have_gdu" = "yes"; then ++ ifelse([$2],,[:],[$2]) + else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) ++ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) + fi ++ ++GNOME_DOC_DEFINES + ]) + +-# Copyright (C) 2003, 2004, 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. ++dnl -*- mode: autoconf -*- + +-# AM_PROG_MKDIR_P +-# --------------- +-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +-# +-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +-# created by `make install' are always world readable, even if the +-# installer happens to have an overly restrictive umask (e.g. 077). +-# This was a mistake. There are at least two reasons why we must not +-# use `-m 0755': +-# - it causes special bits like SGID to be ignored, +-# - it may be too restrictive (some setups expect 775 directories). +-# +-# Do not use -m 0755 and let people choose whatever they expect by +-# setting umask. +-# +-# We cannot accept any implementation of `mkdir' that recognizes `-p'. +-# Some implementations (such as Solaris 8's) are not thread-safe: if a +-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +-# concurrently, both version can detect that a/ is missing, but only +-# one can create it and the other will error out. Consequently we +-# restrict ourselves to GNU make (using the --version option ensures +-# this.) +-AC_DEFUN([AM_PROG_MKDIR_P], +-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' +- else +- mkdir_p='$(install_sh) -d' ++# serial 1 ++ ++dnl Usage: ++dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) ++AC_DEFUN([GTK_DOC_CHECK], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ dnl for overriding the documentation installation directory ++ AC_ARG_WITH(html-dir, ++ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, ++ [with_html_dir='${datadir}/gtk-doc/html']) ++ HTML_DIR="$with_html_dir" ++ AC_SUBST(HTML_DIR) ++ ++ dnl enable/disable documentation building ++ AC_ARG_ENABLE(gtk-doc, ++ AC_HELP_STRING([--enable-gtk-doc], ++ [use gtk-doc to build documentation [default=no]]),, ++ enable_gtk_doc=no) ++ ++ have_gtk_doc=no ++ if test x$enable_gtk_doc = xyes; then ++ if test -z "$PKG_CONFIG"; then ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ fi ++ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then ++ have_gtk_doc=yes ++ fi ++ ++ dnl do we want to do a version check? ++ifelse([$1],[],, ++ [gtk_doc_min_version=$1 ++ if test "$have_gtk_doc" = yes; then ++ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) ++ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then ++ AC_MSG_RESULT(yes) ++ else ++ AC_MSG_RESULT(no) ++ have_gtk_doc=no ++ fi ++ fi ++]) ++ if test "$have_gtk_doc" != yes; then ++ enable_gtk_doc=no ++ fi + fi ++ ++ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) ++ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") ++]) ++ ++ ++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) ++# serial 35 IT_PROG_INTLTOOL ++AC_DEFUN([IT_PROG_INTLTOOL], ++[AC_PREREQ([2.50])dnl ++ ++case "$am__api_version" in ++ 1.[01234]) ++ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) ++ ;; ++ *) ++ ;; ++esac ++ ++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=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` ++ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` ++ ] ++ 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.]) ++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 $< [$]@' ++ ++AC_SUBST(INTLTOOL_DESKTOP_RULE) ++AC_SUBST(INTLTOOL_DIRECTORY_RULE) ++AC_SUBST(INTLTOOL_KEYS_RULE) ++AC_SUBST(INTLTOOL_PROP_RULE) ++AC_SUBST(INTLTOOL_OAF_RULE) ++AC_SUBST(INTLTOOL_PONG_RULE) ++AC_SUBST(INTLTOOL_SERVER_RULE) ++AC_SUBST(INTLTOOL_SHEET_RULE) ++AC_SUBST(INTLTOOL_SOUNDLIST_RULE) ++AC_SUBST(INTLTOOL_UI_RULE) ++AC_SUBST(INTLTOOL_XAM_RULE) ++AC_SUBST(INTLTOOL_KBD_RULE) ++AC_SUBST(INTLTOOL_XML_RULE) ++AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) ++AC_SUBST(INTLTOOL_CAVES_RULE) ++AC_SUBST(INTLTOOL_SCHEMAS_RULE) ++AC_SUBST(INTLTOOL_THEME_RULE) ++AC_SUBST(INTLTOOL_SERVICE_RULE) ++ ++# Use the tools built into the package, not the ones that are installed. ++AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') ++AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') ++AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') ++ ++AC_PATH_PROG(INTLTOOL_PERL, perl) ++if test -z "$INTLTOOL_PERL"; then ++ AC_MSG_ERROR([perl not found; required for intltool]) ++fi ++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then ++ AC_MSG_ERROR([perl 5.x required for intltool]) ++fi ++if test "x$2" != "xno-xml"; then ++ AC_MSG_CHECKING([for XML::Parser]) ++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++ AC_MSG_RESULT([ok]) ++ else ++ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) ++ fi + fi +-AC_SUBST([mkdir_p])]) + +-# Helper functions for option handling. -*- Autoconf -*- ++AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv) ++AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt) ++AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge) ++AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext) ++ ++# Substitute ALL_LINGUAS so we can use it in po/Makefile ++AC_SUBST(ALL_LINGUAS) ++ ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share ++ dnl in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [DATADIRNAME=share], [DATADIRNAME=lib]) ++ ;; ++ *) ++ [DATADIRNAME=lib] ++ ;; ++ esac]) ++fi ++AC_SUBST(DATADIRNAME) + +-# Copyright (C) 2001, 2002, 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. ++IT_PO_SUBDIR([po]) + +-# serial 3 ++dnl The following is very similar to ++dnl ++dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) ++dnl ++dnl with the following slight differences: ++dnl - the *.in files are in ac_aux_dir, ++dnl - if the file haven't changed upon reconfigure, it's not touched, ++dnl - the evaluation of the third parameter enables a hack which computes ++dnl the actual value of $libdir, ++dnl - the user sees "executing intltool commands", instead of ++dnl "creating intltool-extract" and such. ++dnl ++dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were ++dnl a reason for it. + +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++AC_CONFIG_COMMANDS([intltool], [ + +-# _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)]) ++for file in intltool-extract intltool-merge intltool-update; do ++ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ ++ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ ++ -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ ++ -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ ++ -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ ++ -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ ++ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ ++ < ${ac_aux_dir}/${file}.in > ${file}.out ++ if cmp -s ${file} ${file}.out 2>/dev/null; then ++ rm -f ${file}.out ++ else ++ mv -f ${file}.out ${file} ++ fi ++ chmod ugo+x ${file} ++ chmod u+w ${file} ++done + +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++], ++[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' ++prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" ++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' ++INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' ++INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}']) + +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++]) + +-# Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. ++# IT_PO_SUBDIR(DIRNAME) ++# --------------------- ++# All po subdirs have to be declared with this macro; the subdir "po" is ++# declared by IT_PROG_INTLTOOL. + # +-# 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. ++AC_DEFUN([IT_PO_SUBDIR], ++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. ++dnl ++dnl The following CONFIG_COMMANDS should be exetuted at the very end ++dnl of config.status. ++AC_CONFIG_COMMANDS_PRE([ ++ AC_CONFIG_COMMANDS([$1/stamp-it], [ ++ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" ++ >"$1/stamp-it.tmp" ++ [sed '/^#/d ++ s/^[[].*] *// ++ /^[ ]*$/d ++ '"s|^| $ac_top_srcdir/|" \ ++ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ++ ] ++ if test ! -f "$1/Makefile"; then ++ AC_MSG_ERROR([$1/Makefile is not ready.]) ++ fi ++ mv "$1/Makefile" "$1/Makefile.tmp" ++ [sed '/^POTFILES =/,/[^\\]$/ { ++ /^POTFILES =/!d ++ r $1/POTFILES ++ } ++ ' "$1/Makefile.tmp" >"$1/Makefile"] ++ rm -f "$1/Makefile.tmp" ++ mv "$1/stamp-it.tmp" "$1/stamp-it" ++ ]) ++])dnl ++]) + +-# serial 4 + +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then ++# deprecated macros ++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) ++# A hint is needed for aclocal from Automake <= 1.9.4: ++# AC_DEFUN([AC_PROG_INTLTOOL], ...) + +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi + +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) +-fi +-AC_MSG_RESULT(yes)]) ++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# 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. ++# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL + +-# AM_PROG_INSTALL_STRIP +-# --------------------- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) +-fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# Check how to create a tarball. -*- Autoconf -*- ++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) ++# ----------------------------------------------------------- ++# If this macro is not defined by Autoconf, define it here. ++m4_ifdef([AC_PROVIDE_IFELSE], ++ [], ++ [m4_define([AC_PROVIDE_IFELSE], ++ [m4_ifdef([AC_PROVIDE_$1], ++ [$2], [$3])])]) + +-# Copyright (C) 2004, 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 2 ++# AC_PROG_LIBTOOL ++# --------------- ++AC_DEFUN([AC_PROG_LIBTOOL], ++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl ++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX ++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. ++ AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [AC_LIBTOOL_CXX], ++ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX ++ ])]) ++dnl And a similar setup for Fortran 77 support ++ AC_PROVIDE_IFELSE([AC_PROG_F77], ++ [AC_LIBTOOL_F77], ++ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 ++])]) + +-# _AM_PROG_TAR(FORMAT) +-# -------------------- +-# Check how to create a tarball in format FORMAT. +-# FORMAT should be one of `v7', `ustar', or `pax'. +-# +-# Substitute a variable $(am__tar) that is a command +-# writing to stdout a FORMAT-tarball containing the directory +-# $tardir. +-# tardir=directory && $(am__tar) > result.tar +-# +-# Substitute a variable $(am__untar) that extract such +-# 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]) +-m4_if([$1], [v7], +- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], +- [m4_case([$1], [ustar],, [pax],, +- [m4_fatal([Unknown tar format])]) +-AC_MSG_CHECKING([how to create a $1 tar archive]) +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +-_am_tools=${am_cv_prog_tar_$1-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac ++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. ++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run ++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. ++ AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [ifdef([AC_PROG_GCJ], ++ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++ ifdef([A][M_PROG_GCJ], ++ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++ ifdef([LT_AC_PROG_GCJ], ++ [define([LT_AC_PROG_GCJ], ++ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) ++])])# AC_PROG_LIBTOOL + +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break + +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir ++# _AC_PROG_LIBTOOL ++# ---------------- ++AC_DEFUN([_AC_PROG_LIBTOOL], ++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl + +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +-AC_SUBST([am__tar]) +-AC_SUBST([am__untar]) +-]) # _AM_PROG_TAR ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +-dnl AM_GCONF_SOURCE_2 +-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +-dnl (i.e. pass to gconftool-2 +-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +-dnl you should install foo.schemas files ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++AC_SUBST(LIBTOOL)dnl ++ ++# Prevent multiple expansion ++define([AC_PROG_LIBTOOL], []) ++])# _AC_PROG_LIBTOOL ++ ++ ++# AC_LIBTOOL_SETUP ++# ---------------- ++AC_DEFUN([AC_LIBTOOL_SETUP], ++[AC_PREREQ(2.50)dnl ++AC_REQUIRE([AC_ENABLE_SHARED])dnl ++AC_REQUIRE([AC_ENABLE_STATIC])dnl ++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_PROG_LD])dnl ++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl ++AC_REQUIRE([AC_PROG_NM])dnl ++ ++AC_REQUIRE([AC_PROG_LN_S])dnl ++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl ++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! ++AC_REQUIRE([AC_OBJEXT])dnl ++AC_REQUIRE([AC_EXEEXT])dnl + dnl + +-AC_DEFUN([AM_GCONF_SOURCE_2], +-[ +- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then +- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` +- else +- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++AC_LIBTOOL_SYS_MAX_CMD_LEN ++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++AC_LIBTOOL_OBJDIR ++ ++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++_LT_AC_PROG_ECHO_BACKSLASH ++ ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES + fi ++ ;; ++esac + +- AC_ARG_WITH(gconf-source, +- [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed='sed -e 1s/^X//' ++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) +- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++# Same as above, but do not quote variable references. ++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' +- fi ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +- AC_ARG_WITH(gconf-schema-file-dir, +- [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' + +- AC_SUBST(GCONF_SCHEMA_FILE_DIR) +- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++# Constants: ++rm="rm -f" + +- AC_ARG_ENABLE(schemas-install, +- [ --disable-schemas-install Disable the schemas installation], +- [case ${enableval} in +- yes|no) ;; +- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; +- esac]) +- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) +-]) ++# Global variables: ++default_ofile=libtool ++can_build_shared=yes + +-# Copyright (C) 1995-2002 Free Software Foundation, Inc. +-# Copyright (C) 2001-2003,2004 Red Hat, Inc. +-# +-# This file is free software, distributed under the terms of the GNU +-# General Public License. As a special exception to the GNU General +-# Public License, this file may be distributed as part of a program +-# that contains a configuration script generated by Autoconf, under +-# the same distribution terms as the rest of that program. +-# +-# This file can be copied and used freely without restrictions. It can +-# be used in projects which are not available under the GNU Public License +-# but which still want to provide support for the GNU gettext functionality. +-# +-# Macro to add for using GNU gettext. +-# Ulrich Drepper , 1995, 1996 +-# +-# Modified to never use included libintl. +-# Owen Taylor , 12/15/1998 +-# +-# Major rework to remove unused code +-# Owen Taylor , 12/11/2002 +-# +-# Added better handling of ALL_LINGUAS from GNU gettext version +-# written by Bruno Haible, Owen Taylor 5/30/3002 +-# +-# Modified to require ngettext +-# Matthias Clasen 08/06/2004 +-# +-# We need this here as well, since someone might use autoconf-2.5x +-# to configure GLib then an older version to configure a package +-# using AM_GLIB_GNU_GETTEXT +-AC_PREREQ(2.53) ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ltmain="$ac_aux_dir/ltmain.sh" ++ofile="$default_ofile" ++with_gnu_ld="$lt_cv_prog_gnu_ld" + +-dnl +-dnl We go to great lengths to make sure that aclocal won't +-dnl try to pull in the installed version of these macros +-dnl when running aclocal in the glib directory. +-dnl +-m4_copy([AC_DEFUN],[glib_DEFUN]) +-m4_copy([AC_REQUIRE],[glib_REQUIRE]) +-dnl +-dnl At the end, if we're not within glib, we'll define the public +-dnl definitions in terms of our private definitions. +-dnl ++AC_CHECK_TOOL(AR, ar, false) ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++AC_CHECK_TOOL(STRIP, strip, :) + +-# GLIB_LC_MESSAGES +-#-------------------- +-glib_DEFUN([GLIB_LC_MESSAGES], +- [AC_CHECK_HEADERS([locale.h]) +- if test $ac_cv_header_locale_h = yes; then +- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, +- [AC_TRY_LINK([#include ], [return LC_MESSAGES], +- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) +- if test $am_cv_val_LC_MESSAGES = yes; then +- AC_DEFINE(HAVE_LC_MESSAGES, 1, +- [Define if your file defines LC_MESSAGES.]) +- fi +- fi]) ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" + +-# GLIB_PATH_PROG_WITH_TEST +-#---------------------------- +-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +-[# Extract the first word of "$2", so it can be a program name with args. +-set dummy $2; ac_word=[$]2 +-AC_MSG_CHECKING([for $ac_word]) +-AC_CACHE_VAL(ac_cv_path_$1, +-[case "[$]$1" in +- /*) +- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. +- ;; ++# Set sane defaults for various variables ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++test -z "$AS" && AS=as ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++test -z "$LD" && LD=ld ++test -z "$LN_S" && LN_S="ln -s" ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++test -z "$NM" && NM=nm ++test -z "$SED" && SED=sed ++test -z "$OBJDUMP" && OBJDUMP=objdump ++test -z "$RANLIB" && RANLIB=: ++test -z "$STRIP" && STRIP=: ++test -z "$ac_objext" && ac_objext=o ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; + *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in ifelse([$5], , $PATH, [$5]); do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if [$3]; then +- ac_cv_path_$1="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +-dnl If no 4th arg is given, leave the cache variable unset, +-dnl so AC_PATH_PROGS will keep looking. +-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +-])dnl +- ;; +-esac])dnl +-$1="$ac_cv_path_$1" +-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then +- AC_MSG_RESULT([$]$1) +-else +- AC_MSG_RESULT(no) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + fi +-AC_SUBST($1)dnl +-]) + +-# GLIB_WITH_NLS +-#----------------- +-glib_DEFUN([GLIB_WITH_NLS], +- dnl NLS is obligatory +- [AC_REQUIRE([AC_CANONICAL_HOST])dnl +- USE_NLS=yes +- AC_SUBST(USE_NLS) ++_LT_CC_BASENAME([$compiler]) + +- gt_cv_have_gettext=no ++# Only perform the check for file, if the check method requires it ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ AC_PATH_MAGIC ++ fi ++ ;; ++esac + +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= ++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) ++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++enable_win32_dll=yes, enable_win32_dll=no) + +- AC_CHECK_HEADER(libintl.h, +- [gt_cv_func_dgettext_libintl="no" +- libintl_extra_libs="" ++AC_ARG_ENABLE([libtool-lock], ++ [AC_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +- # +- # First check in libc +- # +- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !ngettext ("","", 1)], +- gt_cv_func_ngettext_libc=yes, +- gt_cv_func_ngettext_libc=no) +- ]) +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !dgettext ("","")], +- gt_cv_func_dgettext_libc=yes, +- gt_cv_func_dgettext_libc=no) +- ]) +- fi +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- fi ++AC_ARG_WITH([pic], ++ [AC_HELP_STRING([--with-pic], ++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++ [pic_mode="$withval"], ++ [pic_mode=default]) ++test -z "$pic_mode" && pic_mode=default + +- # +- # If we don't have everything we want, check in libintl +- # +- if test "$gt_cv_func_dgettext_libc" != "yes" \ +- || test "$gt_cv_func_ngettext_libc" != "yes" \ +- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then +- +- AC_CHECK_LIB(intl, bindtextdomain, +- [AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dgettext, +- gt_cv_func_dgettext_libintl=yes)])]) ++# Use C for the default configuration in the libtool script ++tagname= ++AC_LIBTOOL_LANG_C_CONFIG ++_LT_AC_TAGCONFIG ++])# AC_LIBTOOL_SETUP + +- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- AC_MSG_CHECKING([if -liconv is needed to use gettext]) +- AC_MSG_RESULT([]) +- AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dcgettext, +- [gt_cv_func_dgettext_libintl=yes +- libintl_extra_libs=-liconv], +- :,-liconv)], +- :,-liconv) +- fi + +- # +- # If we found libintl, then check in it for bind_textdomain_codeset(); +- # we'll prefer libc if neither have bind_textdomain_codeset(), +- # and both have dgettext and ngettext +- # +- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $libintl_extra_libs" +- unset ac_cv_func_bind_textdomain_codeset +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- LIBS="$glib_save_LIBS" ++# _LT_AC_SYS_COMPILER ++# ------------------- ++AC_DEFUN([_LT_AC_SYS_COMPILER], ++[AC_REQUIRE([AC_PROG_CC])dnl + +- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then +- gt_cv_func_dgettext_libc=no +- else +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- && test "$gt_cv_func_ngettext_libc" = "yes"; then +- gt_cv_func_dgettext_libintl=no +- fi +- fi +- fi +- fi ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} + +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- || test "$gt_cv_func_dgettext_libintl" = "yes"; then +- gt_cv_have_gettext=yes +- fi +- +- if test "$gt_cv_func_dgettext_libintl" = "yes"; then +- INTLLIBS="-lintl $libintl_extra_libs" +- fi +- +- if test "$gt_cv_have_gettext" = "yes"; then +- AC_DEFINE(HAVE_GETTEXT,1, +- [Define if the GNU gettext() function is already present or preinstalled.]) +- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl +- if test "$MSGFMT" != "no"; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS $INTLLIBS" +- AC_CHECK_FUNCS(dcgettext) +- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) +- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr], +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [case $host in +- *-*-solaris*) +- dnl On Solaris, if bind_textdomain_codeset is in libc, +- dnl GNU format message catalog is always supported, +- dnl since both are added to the libc all together. +- dnl Hence, we'd like to go with DATADIRNAME=share and +- dnl and CATOBJEXT=.gmo in this case. +- AC_CHECK_FUNC(bind_textdomain_codeset, +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [CATOBJEXT=.mo +- DATADIRNAME=lib]) +- ;; +- *) +- CATOBJEXT=.mo +- DATADIRNAME=lib +- ;; +- esac]) +- LIBS="$glib_save_LIBS" +- INSTOBJEXT=.mo +- else +- gt_cv_have_gettext=no +- fi +- fi +- ]) ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +- if test "$gt_cv_have_gettext" = "yes" ; then +- AC_DEFINE(ENABLE_NLS, 1, +- [always defined to indicate that i18n is enabled]) +- fi ++# Allow CC to be a program name with arguments. ++compiler=$CC ++])# _LT_AC_SYS_COMPILER + +- dnl Test whether we really found GNU xgettext. +- if test "$XGETTEXT" != ":"; then +- dnl If it is not GNU xgettext we define it as : so that the +- dnl Makefiles still can work. +- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then +- : ; +- else +- AC_MSG_RESULT( +- [found xgettext program is not GNU xgettext; ignore it]) +- XGETTEXT=":" +- fi +- fi + +- # We need to process the po/ directory. +- POSUB=po ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++AC_DEFUN([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) + +- AC_OUTPUT_COMMANDS( +- [case "$CONFIG_FILES" in *po/Makefile.in*) +- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +- esac]) + +- dnl These rules are solely for the distribution goal. While doing this +- dnl we only have to keep exactly one list of the available catalogs +- dnl in configure.in. +- for lang in $ALL_LINGUAS; do +- GMOFILES="$GMOFILES $lang.gmo" +- POFILES="$POFILES $lang.po" +- done ++# _LT_COMPILER_BOILERPLATE ++# ------------------------ ++# Check for compiler boilerplate output or warnings with ++# the simple compiler test code. ++AC_DEFUN([_LT_COMPILER_BOILERPLATE], ++[ac_outfile=conftest.$ac_objext ++printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_COMPILER_BOILERPLATE + +- dnl Make all variables we use known to autoconf. +- AC_SUBST(CATALOGS) +- AC_SUBST(CATOBJEXT) +- AC_SUBST(DATADIRNAME) +- AC_SUBST(GMOFILES) +- AC_SUBST(INSTOBJEXT) +- AC_SUBST(INTLLIBS) +- AC_SUBST(PO_IN_DATADIR_TRUE) +- AC_SUBST(PO_IN_DATADIR_FALSE) +- AC_SUBST(POFILES) +- AC_SUBST(POSUB) +- ]) + +-# AM_GLIB_GNU_GETTEXT +-# ------------------- +-# Do checks necessary for use of gettext. If a suitable implementation +-# of gettext is found in either in libintl or in the C library, +-# it will set INTLLIBS to the libraries needed for use of gettext +-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +-# on various variables needed by the Makefile.in.in installed by +-# glib-gettextize. +-dnl +-glib_DEFUN([GLIB_GNU_GETTEXT], +- [AC_REQUIRE([AC_PROG_CC])dnl +- AC_REQUIRE([AC_HEADER_STDC])dnl +- +- GLIB_LC_MESSAGES +- GLIB_WITH_NLS ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++AC_DEFUN([_LT_LINKER_BOILERPLATE], ++[ac_outfile=conftest.$ac_objext ++printf "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_LINKER_BOILERPLATE + +- if test "$gt_cv_have_gettext" = "yes"; then +- if test "x$ALL_LINGUAS" = "x"; then +- LINGUAS= +- else +- AC_MSG_CHECKING(for catalogs to be installed) +- NEW_LINGUAS= +- for presentlang in $ALL_LINGUAS; do +- useit=no +- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then +- desiredlanguages="$LINGUAS" +- else +- desiredlanguages="$ALL_LINGUAS" +- fi +- for desiredlang in $desiredlanguages; do +- # Use the presentlang catalog if desiredlang is +- # a. equal to presentlang, or +- # b. a variant of presentlang (because in this case, +- # presentlang can be used as a fallback for messages +- # which are not translated in the desiredlang catalog). +- case "$desiredlang" in +- "$presentlang"*) useit=yes;; +- esac +- done +- if test $useit = yes; then +- NEW_LINGUAS="$NEW_LINGUAS $presentlang" +- fi +- done +- LINGUAS=$NEW_LINGUAS +- AC_MSG_RESULT($LINGUAS) +- fi + +- dnl Construct list of names of catalog files to be constructed. +- if test -n "$LINGUAS"; then +- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done +- fi +- fi ++# _LT_AC_SYS_LIBPATH_AIX ++# ---------------------- ++# Links a minimal program and checks the executable ++# for the system default hardcoded library path. In most cases, ++# this is /usr/lib:/lib, but when the MPI compilers are used ++# the location of the communication and MPI libs are included too. ++# If we don't find anything, use the default library path according ++# to the aix ld manual. ++AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], ++[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } ++}'` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } ++}'`; fi],[]) ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++])# _LT_AC_SYS_LIBPATH_AIX + +- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly +- dnl find the mkinstalldirs script in another subdir but ($top_srcdir). +- dnl Try to locate is. +- MKINSTALLDIRS= +- if test -n "$ac_aux_dir"; then +- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" +- fi +- if test -z "$MKINSTALLDIRS"; then +- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" +- fi +- AC_SUBST(MKINSTALLDIRS) + +- dnl Generate list of files to be processed by xgettext which will +- dnl be included in po/Makefile. +- test -d po || mkdir po +- if test "x$srcdir" != "x."; then +- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then +- posrcprefix="$srcdir/" +- else +- posrcprefix="../$srcdir/" +- fi +- else +- posrcprefix="../" +- fi +- rm -f po/POTFILES +- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ +- < $srcdir/po/POTFILES.in > po/POTFILES +- ]) ++# _LT_AC_SHELL_INIT(ARG) ++# ---------------------- ++AC_DEFUN([_LT_AC_SHELL_INIT], ++[ifdef([AC_DIVERSION_NOTICE], ++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++ [AC_DIVERT_PUSH(NOTICE)]) ++$1 ++AC_DIVERT_POP ++])# _LT_AC_SHELL_INIT + +-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +-# ------------------------------- +-# Define VARIABLE to the location where catalog files will +-# be installed by po/Makefile. +-glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +-glib_save_prefix="$prefix" +-glib_save_exec_prefix="$exec_prefix" +-glib_save_datarootdir="$datarootdir" +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-test "x$exec_prefix" = xNONE && exec_prefix=$prefix +-datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then +- localedir=`eval echo "${libdir}/locale"` +-else +- localedir=`eval echo "${datadir}/locale"` +-fi +-prefix="$glib_save_prefix" +-exec_prefix="$glib_save_exec_prefix" +-datarootdir="$glib_save_datarootdir" +-AC_DEFINE_UNQUOTED($1, "$localedir", +- [Define the location where the catalogs will be installed]) +-]) + +-dnl +-dnl Now the definitions that aclocal will find +-dnl +-ifdef(glib_configure_in,[],[ +-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +-])dnl ++# _LT_AC_PROG_ECHO_BACKSLASH ++# -------------------------- ++# Add some code to the start of the generated configure script which ++# will find an echo command which doesn't interpret backslashes. ++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], ++[_LT_AC_SHELL_INIT([ ++# Check that we are running under the correct shell. ++SHELL=${CONFIG_SHELL-/bin/sh} + +-# gnome-common.m4 +-# +- +-dnl GNOME_COMMON_INIT +- +-AC_DEFUN([GNOME_COMMON_INIT], +-[ +- dnl this macro should come after AC_CONFIG_MACRO_DIR +- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) +- +- dnl ensure that when the Automake generated makefile calls aclocal, +- dnl it honours the $ACLOCAL_FLAGS environment variable +- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" +- if test -n "$ac_macro_dir"; then +- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" +- fi +- +- AC_SUBST([ACLOCAL_AMFLAGS]) +-]) +- +-AC_DEFUN([GNOME_DEBUG_CHECK], +-[ +- AC_ARG_ENABLE([debug], +- AC_HELP_STRING([--enable-debug], +- [turn on debugging]),, +- [enable_debug=no]) ++case X$ECHO in ++X*--fallback-echo) ++ # Remove one level of quotation (which was required for Make). ++ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ;; ++esac + +- if test x$enable_debug = xyes ; then +- AC_DEFINE(GNOME_ENABLE_DEBUG, 1, +- [Enable additional debugging at the expense of performance and size]) +- fi +-]) ++echo=${ECHO-echo} ++if test "X[$]1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X[$]1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $echo works! ++ : ++else ++ # Restart under the correct shell. ++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++fi + +-dnl GNOME_MAINTAINER_MODE_DEFINES () +-dnl define DISABLE_DEPRECATED +-dnl +-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +-[ +- AC_REQUIRE([AM_MAINTAINER_MODE]) ++if test "X[$]1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat </dev/null 2>&1 && unset CDPATH + +-dnl GNOME_COMPILE_WARNINGS +-dnl Turn on many useful compiler warnings +-dnl For now, only works on GCC +-AC_DEFUN([GNOME_COMPILE_WARNINGS],[ +- dnl ****************************** +- dnl More compiler warnings +- dnl ****************************** ++if test -z "$ECHO"; then ++if test "X${echo_test_string+set}" != Xset; then ++# find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if (echo_test_string=`eval $cmd`) 2>/dev/null && ++ echo_test_string=`eval $cmd` && ++ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null ++ then ++ break ++ fi ++ done ++fi + +- AC_ARG_ENABLE(compile-warnings, +- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], +- [Turn on compiler warnings]),, +- [enable_compile_warnings="m4_default([$1],[yes])"]) ++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. + +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$dir/echo" ++ break + fi ++ done ++ IFS="$lt_save_ifs" + +- warning_flags= +- realsave_CFLAGS="$CFLAGS" ++ if test "X$echo" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ echo='print -r' ++ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ else ++ # Try using printf. ++ echo='printf %s\n' ++ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: + +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- AC_MSG_CHECKING([whether gcc understands $option]) +- AC_TRY_COMPILE([], [], +- has_option=yes, +- has_option=no,) +- CFLAGS="$SAVE_CFLAGS" +- AC_MSG_RESULT($has_option) +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" + done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- AC_MSG_CHECKING(what warning flags to pass to the C compiler) +- AC_MSG_RESULT($warning_flags) +- +- AC_ARG_ENABLE(iso-c, +- AC_HELP_STRING([--enable-iso-c], +- [Try to warn if code is not ISO C ]),, +- [enable_iso_c=no]) + +- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ echo=echo + fi ++ fi + fi +- AC_MSG_RESULT($complCFLAGS) ++ fi ++fi ++fi + +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- AC_SUBST(WARN_CFLAGS) +-]) ++# Copy echo and quote the copy suitably for passing to libtool from ++# the Makefile, instead of quoting the original, which is used later. ++ECHO=$echo ++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++fi + +-dnl For C++, do basically the same thing. ++AC_SUBST(ECHO) ++])])# _LT_AC_PROG_ECHO_BACKSLASH + +-AC_DEFUN([GNOME_CXX_WARNINGS],[ +- AC_ARG_ENABLE(cxx-warnings, +- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] +- [Turn on compiler warnings.]),, +- [enable_cxx_warnings="m4_default([$1],[minimum])"]) + +- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) +- warnCXXFLAGS= +- if test "x$GXX" != xyes; then +- enable_cxx_warnings=no ++# _LT_AC_LOCK ++# ----------- ++AC_DEFUN([_LT_AC_LOCK], ++[AC_ARG_ENABLE([libtool-lock], ++ [AC_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # 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.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac + fi +- if test "x$enable_cxx_warnings" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-Wall[\ \ ]*) ;; +- *) warnCXXFLAGS="-Wall -Wno-unused" ;; ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; ++ ++x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ++ # 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 ++ *32-bit*) ++ case $host in ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; + esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; + +- ## -W is not all that useful. And it cannot be controlled +- ## with individual -Wno-xxx flags, unlike -Wall +- if test "x$enable_cxx_warnings" = "xyes"; then +- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" +- fi +- fi ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++ [AC_LANG_PUSH(C) ++ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++ AC_LANG_POP]) ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" + fi +- AC_MSG_RESULT($warnCXXFLAGS) ++ ;; ++sparc*-*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" ;; ++ *) LD="${LD-ld} -64" ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; + +- AC_ARG_ENABLE(iso-cxx, +- AC_HELP_STRING([--enable-iso-cxx], +- [Try to warn if code is not ISO C++ ]),, +- [enable_iso_cxx=no]) ++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++[*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++ AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++ AC_CHECK_TOOL(AS, as, false) ++ AC_CHECK_TOOL(OBJDUMP, objdump, false) ++ ;; ++ ]) ++esac + +- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) +- complCXXFLAGS= +- if test "x$enable_iso_cxx" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; +- esac ++need_locks="$enable_libtool_lock" + +- case " $CXXFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; +- esac ++])# _LT_AC_LOCK ++ ++ ++# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------------------- ++# Check whether the given compiler option works ++AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], ++[AC_REQUIRE([LT_AC_PROG_SED]) ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$3" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s "$ac_outfile"; then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings other than the usual output. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes + fi + fi +- AC_MSG_RESULT($complCXXFLAGS) +- +- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" +- AC_SUBST(WARN_CXXFLAGS) ++ $rm conftest* + ]) + +-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++if test x"[$]$2" = xyes; then ++ ifelse([$5], , :, [$5]) ++else ++ ifelse([$6], , :, [$6]) ++fi ++])# AC_LIBTOOL_COMPILER_OPTION + +-# serial 48 AC_PROG_LIBTOOL + ++# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ------------------------------------------------------------ ++# Check whether the given compiler option works ++AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], ++[AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $3" ++ printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ else ++ $2=yes ++ fi ++ fi ++ $rm conftest* ++ LDFLAGS="$save_LDFLAGS" ++]) + +-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +-# ----------------------------------------------------------- +-# If this macro is not defined by Autoconf, define it here. +-m4_ifdef([AC_PROVIDE_IFELSE], +- [], +- [m4_define([AC_PROVIDE_IFELSE], +- [m4_ifdef([AC_PROVIDE_$1], +- [$2], [$3])])]) ++if test x"[$]$2" = xyes; then ++ ifelse([$4], , :, [$4]) ++else ++ ifelse([$5], , :, [$5]) ++fi ++])# AC_LIBTOOL_LINKER_OPTION + + +-# AC_PROG_LIBTOOL +-# --------------- +-AC_DEFUN([AC_PROG_LIBTOOL], +-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. +- AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [AC_LIBTOOL_CXX], +- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX +- ])]) +-dnl And a similar setup for Fortran 77 support +- AC_PROVIDE_IFELSE([AC_PROG_F77], +- [AC_LIBTOOL_F77], +- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +-])]) ++# AC_LIBTOOL_SYS_MAX_CMD_LEN ++# -------------------------- ++AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], ++[# find the maximum length of command line arguments ++AC_MSG_CHECKING([the maximum length of command line arguments]) ++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++ i=0 ++ teststring="ABCD" + +-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. +- AC_PROVIDE_IFELSE([AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [ifdef([AC_PROG_GCJ], +- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([A][M_PROG_GCJ], +- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([LT_AC_PROG_GCJ], +- [define([LT_AC_PROG_GCJ], +- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +-])])# AC_PROG_LIBTOOL ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; + ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; + +-# _AC_PROG_LIBTOOL +-# ---------------- +-AC_DEFUN([_AC_PROG_LIBTOOL], +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl ++ cygwin* | mingw*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; + +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; + +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-AC_SUBST(LIBTOOL)dnl ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; + +-# Prevent multiple expansion +-define([AC_PROG_LIBTOOL], []) +-])# _AC_PROG_LIBTOOL ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; + ++ 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 ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ # 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. ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ = "XX$teststring") >/dev/null 2>&1 && ++ new_result=`expr "X$teststring" : ".*" 2>&1` && ++ lt_cv_sys_max_cmd_len=$new_result && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on massive ++ # amounts of additional arguments before passing them to the linker. ++ # It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ ;; ++ esac ++]) ++if test -n $lt_cv_sys_max_cmd_len ; then ++ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++else ++ AC_MSG_RESULT(none) ++fi ++])# AC_LIBTOOL_SYS_MAX_CMD_LEN + +-# AC_LIBTOOL_SETUP +-# ---------------- +-AC_DEFUN([AC_LIBTOOL_SETUP], +-[AC_PREREQ(2.50)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +-AC_REQUIRE([AC_PROG_NM])dnl + +-AC_REQUIRE([AC_PROG_LN_S])dnl +-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +-AC_REQUIRE([AC_OBJEXT])dnl +-AC_REQUIRE([AC_EXEEXT])dnl +-dnl ++# _LT_AC_CHECK_DLFCN ++# ------------------ ++AC_DEFUN([_LT_AC_CHECK_DLFCN], ++[AC_CHECK_HEADERS(dlfcn.h)dnl ++])# _LT_AC_CHECK_DLFCN + +-AC_LIBTOOL_SYS_MAX_CMD_LEN +-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-AC_LIBTOOL_OBJDIR + +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-_LT_AC_PROG_ECHO_BACKSLASH ++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++# --------------------------------------------------------------------- ++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], ++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++if test "$cross_compiling" = yes; then : ++ [$4] ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext < ++#endif + +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed='sed -e 1s/^X//' +-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] ++#include + +-# Same as above, but do not quote variable references. +-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif + +-# Sed substitution to delay expansion of an escaped shell variable in a +-# double_quote_subst'ed string. +-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif + +-# Sed substitution to avoid accidental globbing in evaled expressions +-no_glob_subst='s/\*/\\\*/g' ++#ifdef __cplusplus ++extern "C" void exit (int); ++#endif + +-# Constants: +-rm="rm -f" ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; + +-# Global variables: +-default_ofile=libtool +-can_build_shared=yes +- +-# All known linkers require a `.a' archive for static linking (except MSVC, +-# which needs '.lib'). +-libext=a +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" +-with_gnu_ld="$lt_cv_prog_gnu_ld" +- +-AC_CHECK_TOOL(AR, ar, false) +-AC_CHECK_TOOL(RANLIB, ranlib, :) +-AC_CHECK_TOOL(STRIP, strip, :) ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); + +-old_CC="$CC" +-old_CFLAGS="$CFLAGS" ++ exit (status); ++}] ++EOF ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) $1 ;; ++ x$lt_dlneed_uscore) $2 ;; ++ x$lt_dlunknown|x*) $3 ;; ++ esac ++ else : ++ # compilation failed ++ $3 ++ fi ++fi ++rm -fr conftest* ++])# _LT_AC_TRY_DLOPEN_SELF + +-# Set sane defaults for various variables +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-test -z "$AS" && AS=as +-test -z "$CC" && CC=cc +-test -z "$LTCC" && LTCC=$CC +-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +-test -z "$DLLTOOL" && DLLTOOL=dlltool +-test -z "$LD" && LD=ld +-test -z "$LN_S" && LN_S="ln -s" +-test -z "$MAGIC_CMD" && MAGIC_CMD=file +-test -z "$NM" && NM=nm +-test -z "$SED" && SED=sed +-test -z "$OBJDUMP" && OBJDUMP=objdump +-test -z "$RANLIB" && RANLIB=: +-test -z "$STRIP" && STRIP=: +-test -z "$ac_objext" && ac_objext=o + +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= ++# AC_LIBTOOL_DLOPEN_SELF ++# ---------------------- ++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], ++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= + +-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 \$oldlib" ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes + ;; +- esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +-fi +- +-_LT_CC_BASENAME([$compiler]) +- +-# Only perform the check for file, if the check method requires it +-case $deplibs_check_method in +-file_magic*) +- if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- AC_PATH_MAGIC +- fi +- ;; +-esac + +-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-enable_win32_dll=yes, enable_win32_dll=no) ++ mingw* | pw32*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; + +-AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; + +-AC_ARG_WITH([pic], +- [AC_HELP_STRING([--with-pic], +- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], +- [pic_mode="$withval"], +- [pic_mode=default]) +-test -z "$pic_mode" && pic_mode=default ++ darwin*) ++ # if libdl is installed we need to link against it ++ AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ]) ++ ;; + +-# Use C for the default configuration in the libtool script +-tagname= +-AC_LIBTOOL_LANG_C_CONFIG +-_LT_AC_TAGCONFIG +-])# AC_LIBTOOL_SETUP ++ *) ++ AC_CHECK_FUNC([shl_load], ++ [lt_cv_dlopen="shl_load"], ++ [AC_CHECK_LIB([dld], [shl_load], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ++ [AC_CHECK_FUNC([dlopen], ++ [lt_cv_dlopen="dlopen"], ++ [AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++ [AC_CHECK_LIB([svld], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++ [AC_CHECK_LIB([dld], [dld_link], ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ;; ++ esac + ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi + +-# _LT_AC_SYS_COMPILER +-# ------------------- +-AC_DEFUN([_LT_AC_SYS_COMPILER], +-[AC_REQUIRE([AC_PROG_CC])dnl ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" + +-# Allow CC to be a program name with arguments. +-compiler=$CC +-])# _LT_AC_SYS_COMPILER ++ AC_CACHE_CHECK([whether a program can dlopen itself], ++ lt_cv_dlopen_self, [dnl ++ _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++ ]) + ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++ lt_cv_dlopen_self_static, [dnl ++ _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++ ]) ++ fi + +-# _LT_CC_BASENAME(CC) +-# ------------------- +-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +-AC_DEFUN([_LT_CC_BASENAME], +-[for cc_temp in $1""; do +- case $cc_temp in +- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; +- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; +- \-*) ;; +- *) break;; ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; + esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-]) + ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac + +-# _LT_COMPILER_BOILERPLATE +-# ------------------------ +-# Check for compiler boilerplate output or warnings with +-# the simple compiler test code. +-AC_DEFUN([_LT_COMPILER_BOILERPLATE], +-[ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext +-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_compiler_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_COMPILER_BOILERPLATE +- ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi ++])# AC_LIBTOOL_DLOPEN_SELF + +-# _LT_LINKER_BOILERPLATE +-# ---------------------- +-# Check for linker boilerplate output or warnings with +-# the simple link test code. +-AC_DEFUN([_LT_LINKER_BOILERPLATE], +-[ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext +-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_LINKER_BOILERPLATE + ++# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) ++# --------------------------------- ++# Check to see if options -c and -o are simultaneously supported by compiler ++AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], ++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], ++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++ $rm -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext + +-# _LT_AC_SYS_LIBPATH_AIX +-# ---------------------- +-# Links a minimal program and checks the executable +-# for the system default hardcoded library path. In most cases, +-# this is /usr/lib:/lib, but when the MPI compilers are used +-# the location of the communication and MPI libs are included too. +-# If we don't find anything, use the default library path according +-# to the aix ld manual. +-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +-])# _LT_AC_SYS_LIBPATH_AIX ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ fi ++ fi ++ chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ $rm conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++ $rm out/* && rmdir out ++ cd .. ++ rmdir conftest ++ $rm conftest* ++]) ++])# AC_LIBTOOL_PROG_CC_C_O + + +-# _LT_AC_SHELL_INIT(ARG) +-# ---------------------- +-AC_DEFUN([_LT_AC_SHELL_INIT], +-[ifdef([AC_DIVERSION_NOTICE], +- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], +- [AC_DIVERT_PUSH(NOTICE)]) +-$1 +-AC_DIVERT_POP +-])# _LT_AC_SHELL_INIT ++# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) ++# ----------------------------------------- ++# Check to see if we can do hard links to lock some files if needed ++AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], ++[AC_REQUIRE([_LT_AC_LOCK])dnl + ++hard_links="nottested" ++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ AC_MSG_CHECKING([if we can lock with hard links]) ++ hard_links=yes ++ $rm conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ AC_MSG_RESULT([$hard_links]) ++ if test "$hard_links" = no; then ++ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS + +-# _LT_AC_PROG_ECHO_BACKSLASH +-# -------------------------- +-# Add some code to the start of the generated configure script which +-# will find an echo command which doesn't interpret backslashes. +-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +-[_LT_AC_SHELL_INIT([ +-# Check that we are running under the correct shell. +-SHELL=${CONFIG_SHELL-/bin/sh} + +-case X$ECHO in +-X*--fallback-echo) +- # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` +- ;; +-esac ++# AC_LIBTOOL_OBJDIR ++# ----------------- ++AC_DEFUN([AC_LIBTOOL_OBJDIR], ++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++[rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null]) ++objdir=$lt_cv_objdir ++])# AC_LIBTOOL_OBJDIR + +-echo=${ECHO-echo} +-if test "X[$]1" = X--no-reexec; then +- # Discard the --no-reexec flag, and continue. +- shift +-elif test "X[$]1" = X--fallback-echo; then +- # Avoid inline document here, it may be left over +- : +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then +- # Yippee, $echo works! +- : ++ ++# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) ++# ---------------------------------------------- ++# Check hardcoding attributes. ++AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], ++[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++_LT_AC_TAGVAR(hardcode_action, $1)= ++if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ ++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ ++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++ ++ # We can hardcode non-existant directories. ++ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then ++ # Linking always hardcodes the temporary library directory. ++ _LT_AC_TAGVAR(hardcode_action, $1)=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ _LT_AC_TAGVAR(hardcode_action, $1)=immediate ++ fi + else +- # Restart under the correct shell. +- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported + fi ++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) + +-if test "X[$]1" = X--fallback-echo; then +- # used as fallback echo +- shift +- cat </dev/null 2>&1 && unset CDPATH + +-if test -z "$ECHO"; then +-if test "X${echo_test_string+set}" != Xset; then +-# find a string as large as possible, as long as the shell can cope with it +- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do +- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... +- if (echo_test_string=`eval $cmd`) 2>/dev/null && +- echo_test_string=`eval $cmd` && +- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null +- then +- break +- fi +- done ++# AC_LIBTOOL_SYS_LIB_STRIP ++# ------------------------ ++AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], ++[striplib= ++old_striplib= ++AC_MSG_CHECKING([whether stripping libraries is possible]) ++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then ++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++ test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++ AC_MSG_RESULT([yes]) ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++fi ++ ;; ++ *) ++ AC_MSG_RESULT([no]) ++ ;; ++ esac + fi ++])# AC_LIBTOOL_SYS_LIB_STRIP + +-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : ++ ++# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++# ----------------------------- ++# PORTME Fill in your ld.so characteristics ++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], ++[AC_MSG_CHECKING([dynamic linker characteristics]) ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++if test "$GCC" = yes; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi + else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi ++need_lib_prefix=unknown ++hardcode_into_libs=no + +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do +- IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$dir/echo" +- break +- fi +- done +- IFS="$lt_save_ifs" ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown + +- if test "X$echo" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- echo='print -r' +- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} +- else +- # Try using printf. +- echo='printf %s\n' +- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- else +- # maybe with a smaller string... +- prev=: ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH + +- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do +- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null +- then +- break +- fi +- prev="$cmd" +- done ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; + +- if test "$prev" != 'sed 50q "[$]0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} +- else +- # Oops. We lost completely, so just stick with echo. +- echo=echo +- fi ++aix4* | aix5*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[[01]] | aix4.[[01]].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ : ++ else ++ can_build_shared=no + fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' + fi ++ shlibpath_var=LIBPATH + fi +-fi +-fi ++ ;; + +-# Copy echo and quote the copy suitably for passing to libtool from +-# the Makefile, instead of quoting the original, which is used later. +-ECHO=$echo +-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then +- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +-fi ++amigaos*) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; + +-AC_SUBST(ECHO) +-])])# _LT_AC_PROG_ECHO_BACKSLASH ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; + ++bsdi[[45]]*) ++ version_type=linux ++ 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' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; + +-# _LT_AC_LOCK +-# ----------- +-AC_DEFUN([_LT_AC_LOCK], +-[AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++cygwin* | mingw* | pw32*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no + +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case $host in +-ia64-*-hpux*) +- # 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.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $rm \$dlpath' ++ shlibpath_overrides_runpath=yes ++ ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; +- *N32*) +- LD="${LD-ld} -n32" ++ mingw*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi + ;; +- *64-bit*) +- LD="${LD-ld} -64" ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac +- fi +- fi +- rm -rf conftest* ++ ;; ++ ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH + ;; + +-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +- # 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 +- *32-bit*) +- case $host in +- x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac +- ;; +- *64-bit*) +- case $host in +- x86_64-*linux*) +- LD="${LD-ld} -m elf_x86_64" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac +- ;; +- esac ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. ++ if test "$GCC" = yes; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` ++ else ++ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + fi +- rm -rf conftest* ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, +- [AC_LANG_PUSH(C) +- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) +- AC_LANG_POP]) +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi ++dgux*) ++ 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 + ;; +-sparc*-*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" ;; +- *) LD="${LD-ld} -64" ;; +- esac +- ;; ++ ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[[123]]*) objformat=aout ;; ++ *) objformat=elf ;; + esac + fi +- rm -rf conftest* ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ freebsd*) # from 4.6 on ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac + ;; + +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-[*-*-cygwin* | *-*-mingw* | *-*-pw32*) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) ++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 ++ hardcode_into_libs=yes + ;; +- ]) +-esac + +-need_locks="$enable_libtool_lock" ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ postinstall_cmds='chmod 555 $lib' ++ ;; + +-])# _LT_AC_LOCK ++interix3*) ++ 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' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; + ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; + +-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ---------------------------------------------------------------- +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED]) +-AC_CACHE_CHECK([$1], [$2], +- [$2=no +- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="$3" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ +- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- if (exit $ac_status) && test -s "$ac_outfile"; then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings other than the usual output. +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- $2=yes +- fi +- fi +- $rm conftest* +-]) ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; + +-if test x"[$]$2" = xyes; then +- ifelse([$5], , :, [$5]) +-else +- ifelse([$6], , :, [$6]) +-fi +-])# AC_LIBTOOL_COMPILER_OPTION ++# This must be Linux ELF. ++linux* | k*bsd*-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' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes + ++ # 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ fi + +-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ------------------------------------------------------------ +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +-[AC_CACHE_CHECK([$1], [$2], +- [$2=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $3" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext +- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +- # The linker can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test -s conftest.err; then +- # Append any errors to the config.log. +- cat conftest.err 1>&AS_MESSAGE_LOG_FD +- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if diff conftest.exp conftest.er2 >/dev/null; then +- $2=yes +- fi +- else +- $2=yes +- fi +- fi +- $rm conftest* +- LDFLAGS="$save_LDFLAGS" +-]) ++ # We used to test for /lib/ld.so.1 and disable shared libraries on ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; + +-if test x"[$]$2" = xyes; then +- ifelse([$4], , :, [$4]) +-else +- ifelse([$5], , :, [$5]) +-fi +-])# AC_LIBTOOL_LINKER_OPTION ++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 ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; + +-# AC_LIBTOOL_SYS_MAX_CMD_LEN +-# -------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +-[# find the maximum length of command line arguments +-AC_MSG_CHECKING([the maximum length of command line arguments]) +-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl +- i=0 +- teststring="ABCD" ++newsos6) ++ version_type=linux ++ 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 ++ ;; + +- case $build_os in +- msdosdjgpp*) +- # On DJGPP, this test can blow up pretty badly due to problems in libc +- # (any single argument exceeding 2000 bytes causes a buffer overrun +- # during glob expansion). Even if it were fixed, the result of this +- # check would be larger than it should be. +- lt_cv_sys_max_cmd_len=12288; # 12K is about right +- ;; ++nto-qnx*) ++ 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=yes ++ ;; + +- gnu*) +- # Under GNU Hurd, this test is not required because there is +- # no limit to the length of command line arguments. +- # Libtool will interpret -1 as no limit whatsoever +- lt_cv_sys_max_cmd_len=-1; +- ;; ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[[89]] | openbsd2.[[89]].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; + +- cygwin* | mingw*) +- # On Win9x/ME, this test blows up -- it succeeds, but takes +- # about 5 minutes as the teststring grows exponentially. +- # Worse, since 9x/ME are not pre-emptively multitasking, +- # you end up with a "frozen" computer, even though with patience +- # the test eventually succeeds (with a max line length of 256k). +- # Instead, let's just punt: use the minimum linelength reported by +- # all of the supported platforms: 8192 (on NT/2K/XP). +- lt_cv_sys_max_cmd_len=8192; +- ;; ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; + +- amigaos*) +- # On AmigaOS with pdksh, this test takes hours, literally. +- # So we just punt and use a minimum line length of 8192. +- lt_cv_sys_max_cmd_len=8192; +- ;; ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; + +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) +- # This has been around since 386BSD, at least. Likely further. +- if test -x /sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +- elif test -x /usr/sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` +- else +- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs +- fi +- # And add a safety zone +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` +- ;; ++solaris*) ++ 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=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; + +- interix*) +- # We know the value 262144 and hardcode it with a safety zone (like BSD) +- lt_cv_sys_max_cmd_len=196608 +- ;; ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; + +- 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 +- # nice to cause kernel panics so lets avoid the loop below. +- # First set a reasonable default. +- lt_cv_sys_max_cmd_len=16384 +- # +- if test -x /sbin/sysconfig; then +- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in +- *1*) lt_cv_sys_max_cmd_len=-1 ;; +- esac +- fi +- ;; +- sco3.2v5*) +- lt_cv_sys_max_cmd_len=102400 +- ;; +- sysv5* | sco5v6* | sysv4.2uw2*) +- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` +- if test -n "$kargmax"; then +- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` +- else +- lt_cv_sys_max_cmd_len=32768 +- fi +- ;; +- *) +- # 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. +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ +- = "XX$teststring") >/dev/null 2>&1 && +- new_result=`expr "X$teststring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- teststring=$teststring$teststring +- done +- teststring= +- # Add a significant safety factor because C++ compilers can tack on massive +- # amounts of additional arguments before passing them to the linker. +- # It appears as though 1/2 is a usable value. +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` +- ;; ++sysv4 | sysv4.3*) ++ version_type=linux ++ 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 ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; + esac +-]) +-if test -n $lt_cv_sys_max_cmd_len ; then +- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +-else +- AC_MSG_RESULT(none) +-fi +-])# AC_LIBTOOL_SYS_MAX_CMD_LEN +- ++ ;; + +-# _LT_AC_CHECK_DLFCN +-# ------------------ +-AC_DEFUN([_LT_AC_CHECK_DLFCN], +-[AC_CHECK_HEADERS(dlfcn.h)dnl +-])# _LT_AC_CHECK_DLFCN ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ 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 ++ fi ++ ;; + ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ shlibpath_overrides_runpath=no ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ shlibpath_overrides_runpath=yes ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; + +-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +-# --------------------------------------------------------------------- +-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +-if test "$cross_compiling" = yes; then : +- [$4] +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < +-#endif ++*) ++ dynamic_linker=no ++ ;; ++esac ++AC_MSG_RESULT([$dynamic_linker]) ++test "$dynamic_linker" = no && can_build_shared=no + +-#include ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++])# AC_LIBTOOL_SYS_DYNAMIC_LINKER + +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif + +-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we +- find out it does not work in some platform. */ +-#ifndef LT_DLLAZY_OR_NOW +-# ifdef RTLD_LAZY +-# define LT_DLLAZY_OR_NOW RTLD_LAZY +-# else +-# ifdef DL_LAZY +-# define LT_DLLAZY_OR_NOW DL_LAZY +-# else +-# ifdef RTLD_NOW +-# define LT_DLLAZY_OR_NOW RTLD_NOW +-# else +-# ifdef DL_NOW +-# define LT_DLLAZY_OR_NOW DL_NOW +-# else +-# define LT_DLLAZY_OR_NOW 0 +-# endif +-# endif +-# endif +-# endif +-#endif ++# _LT_AC_TAGCONFIG ++# ---------------- ++AC_DEFUN([_LT_AC_TAGCONFIG], ++[AC_ARG_WITH([tags], ++ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], ++ [include additional configurations @<:@automatic@:>@])], ++ [tagnames="$withval"]) + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif ++if test -f "$ltmain" && test -n "$tagnames"; then ++ if test ! -f "${ofile}"; then ++ AC_MSG_WARN([output file `$ofile' does not exist]) ++ fi + +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; ++ if test -z "$LTCC"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" ++ if test -z "$LTCC"; then ++ AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) ++ else ++ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) ++ fi ++ fi ++ if test -z "$LTCFLAGS"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" ++ fi + +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } +- else +- puts (dlerror ()); ++ # Extract list of available tagged configurations in $ofile. ++ # Note that this assumes the entire list is on one line. ++ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` + +- exit (status); +-}] +-EOF +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) $1 ;; +- x$lt_dlneed_uscore) $2 ;; +- x$lt_dlunknown|x*) $3 ;; ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for tagname in $tagnames; do ++ IFS="$lt_save_ifs" ++ # Check whether tagname contains only valid characters ++ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in ++ "") ;; ++ *) AC_MSG_ERROR([invalid tag name: $tagname]) ++ ;; + esac +- else : +- # compilation failed +- $3 +- fi +-fi +-rm -fr conftest* +-])# _LT_AC_TRY_DLOPEN_SELF +- + +-# AC_LIBTOOL_DLOPEN_SELF +-# ---------------------- +-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +-if test "x$enable_dlopen" != xyes; then +- enable_dlopen=unknown +- enable_dlopen_self=unknown +- enable_dlopen_self_static=unknown +-else +- lt_cv_dlopen=no +- lt_cv_dlopen_libs= ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null ++ then ++ AC_MSG_ERROR([tag name \"$tagname\" already exists]) ++ fi + +- case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ;; ++ # Update the list of available tags. ++ if test -n "$tagname"; then ++ echo appending configuration tag \"$tagname\" to $ofile + +- mingw* | pw32*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; ++ case $tagname in ++ CXX) ++ if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_LIBTOOL_LANG_CXX_CONFIG ++ else ++ tagname="" ++ fi ++ ;; + +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; ++ F77) ++ if test -n "$F77" && test "X$F77" != "Xno"; then ++ AC_LIBTOOL_LANG_F77_CONFIG ++ else ++ tagname="" ++ fi ++ ;; + +- darwin*) +- # if libdl is installed we need to link against it +- AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ]) +- ;; ++ GCJ) ++ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then ++ AC_LIBTOOL_LANG_GCJ_CONFIG ++ else ++ tagname="" ++ fi ++ ;; + +- *) +- AC_CHECK_FUNC([shl_load], +- [lt_cv_dlopen="shl_load"], +- [AC_CHECK_LIB([dld], [shl_load], +- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], +- [AC_CHECK_FUNC([dlopen], +- [lt_cv_dlopen="dlopen"], +- [AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], +- [AC_CHECK_LIB([svld], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], +- [AC_CHECK_LIB([dld], [dld_link], +- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) +- ]) +- ]) +- ]) +- ]) +- ]) +- ;; +- esac ++ RC) ++ AC_LIBTOOL_LANG_RC_CONFIG ++ ;; + +- if test "x$lt_cv_dlopen" != xno; then +- enable_dlopen=yes ++ *) ++ AC_MSG_ERROR([Unsupported tag name: $tagname]) ++ ;; ++ esac ++ ++ # Append the new tag name to the list of available tags. ++ if test -n "$tagname" ; then ++ available_tags="$available_tags $tagname" ++ fi ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ++ # Now substitute the updated list of available tags. ++ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then ++ mv "${ofile}T" "$ofile" ++ chmod +x "$ofile" + else +- enable_dlopen=no ++ rm -f "${ofile}T" ++ AC_MSG_ERROR([unable to update list of available tagged configurations.]) + fi ++fi ++])# _LT_AC_TAGCONFIG + +- case $lt_cv_dlopen in +- dlopen) +- save_CPPFLAGS="$CPPFLAGS" +- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + +- save_LDFLAGS="$LDFLAGS" +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++# AC_LIBTOOL_DLOPEN ++# ----------------- ++# enable checks for dlopen support ++AC_DEFUN([AC_LIBTOOL_DLOPEN], ++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) ++])# AC_LIBTOOL_DLOPEN + +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" + +- AC_CACHE_CHECK([whether a program can dlopen itself], +- lt_cv_dlopen_self, [dnl +- _LT_AC_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, +- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) +- ]) ++# AC_LIBTOOL_WIN32_DLL ++# -------------------- ++# declare package support for building win32 DLLs ++AC_DEFUN([AC_LIBTOOL_WIN32_DLL], ++[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ++])# AC_LIBTOOL_WIN32_DLL + +- if test "x$lt_cv_dlopen_self" = xyes; then +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], +- lt_cv_dlopen_self_static, [dnl +- _LT_AC_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, +- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) +- ]) +- fi + +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +- ;; +- esac ++# AC_ENABLE_SHARED([DEFAULT]) ++# --------------------------- ++# implement the --enable-shared flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_SHARED], ++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([shared], ++ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], ++ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_shared=]AC_ENABLE_SHARED_DEFAULT) ++])# AC_ENABLE_SHARED + +- case $lt_cv_dlopen_self in +- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; +- *) enable_dlopen_self=unknown ;; +- esac + +- case $lt_cv_dlopen_self_static in +- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; +- *) enable_dlopen_self_static=unknown ;; +- esac +-fi +-])# AC_LIBTOOL_DLOPEN_SELF ++# AC_DISABLE_SHARED ++# ----------------- ++# set the default shared flag to --disable-shared ++AC_DEFUN([AC_DISABLE_SHARED], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_SHARED(no) ++])# AC_DISABLE_SHARED + + +-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) +-# --------------------------------- +-# Check to see if options -c and -o are simultaneously supported by compiler +-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no +- $rm -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++# AC_ENABLE_STATIC([DEFAULT]) ++# --------------------------- ++# implement the --enable-static flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_STATIC], ++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([static], ++ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], ++ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_static=yes ;; ++ no) enable_static=no ;; ++ *) ++ enable_static=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_static=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_static=]AC_ENABLE_STATIC_DEFAULT) ++])# AC_ENABLE_STATIC + +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ +- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- if (exit $ac_status) && test -s out/conftest2.$ac_objext +- then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes +- fi +- fi +- chmod u+w . 2>&AS_MESSAGE_LOG_FD +- $rm conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out +- cd .. +- rmdir conftest +- $rm conftest* +-]) +-])# AC_LIBTOOL_PROG_CC_C_O + ++# AC_DISABLE_STATIC ++# ----------------- ++# set the default static flag to --disable-static ++AC_DEFUN([AC_DISABLE_STATIC], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_STATIC(no) ++])# AC_DISABLE_STATIC + +-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) +-# ----------------------------------------- +-# Check to see if we can do hard links to lock some files if needed +-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], +-[AC_REQUIRE([_LT_AC_LOCK])dnl + +-hard_links="nottested" +-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- AC_MSG_CHECKING([if we can lock with hard links]) +- hard_links=yes +- $rm conftest* +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- touch conftest.a +- ln conftest.a conftest.b 2>&5 || hard_links=no +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- AC_MSG_RESULT([$hard_links]) +- if test "$hard_links" = no; then +- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) +- need_locks=warn +- fi +-else +- need_locks=no +-fi +-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS ++# AC_ENABLE_FAST_INSTALL([DEFAULT]) ++# --------------------------------- ++# implement the --enable-fast-install flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_FAST_INSTALL], ++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([fast-install], ++ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], ++ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) ++])# AC_ENABLE_FAST_INSTALL + + +-# AC_LIBTOOL_OBJDIR +-# ----------------- +-AC_DEFUN([AC_LIBTOOL_OBJDIR], +-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +-[rm -f .libs 2>/dev/null +-mkdir .libs 2>/dev/null +-if test -d .libs; then +- lt_cv_objdir=.libs +-else +- # MS-DOS does not allow filenames that begin with a dot. +- lt_cv_objdir=_libs +-fi +-rmdir .libs 2>/dev/null]) +-objdir=$lt_cv_objdir +-])# AC_LIBTOOL_OBJDIR ++# AC_DISABLE_FAST_INSTALL ++# ----------------------- ++# set the default to --disable-fast-install ++AC_DEFUN([AC_DISABLE_FAST_INSTALL], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_FAST_INSTALL(no) ++])# AC_DISABLE_FAST_INSTALL + + +-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) +-# ---------------------------------------------- +-# Check hardcoding attributes. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], +-[AC_MSG_CHECKING([how to hardcode library paths into programs]) +-_LT_AC_TAGVAR(hardcode_action, $1)= +-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ +- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ +- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++# AC_LIBTOOL_PICMODE([MODE]) ++# -------------------------- ++# implement the --with-pic flag ++# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++AC_DEFUN([AC_LIBTOOL_PICMODE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++pic_mode=ifelse($#,1,$1,default) ++])# AC_LIBTOOL_PICMODE + +- # We can hardcode non-existant directories. +- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && +- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then +- # Linking always hardcodes the temporary library directory. +- _LT_AC_TAGVAR(hardcode_action, $1)=relink +- else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- _LT_AC_TAGVAR(hardcode_action, $1)=immediate +- fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported +-fi +-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) + +-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless +-fi +-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH ++# AC_PROG_EGREP ++# ------------- ++# This is predefined starting with Autoconf 2.54, so this conditional ++# definition can be removed once we require Autoconf 2.54 or later. ++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], ++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], ++ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 ++ then ac_cv_prog_egrep='grep -E' ++ else ac_cv_prog_egrep='egrep' ++ fi]) ++ EGREP=$ac_cv_prog_egrep ++ AC_SUBST([EGREP]) ++])]) + + +-# AC_LIBTOOL_SYS_LIB_STRIP +-# ------------------------ +-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], +-[striplib= +-old_striplib= +-AC_MSG_CHECKING([whether stripping libraries is possible]) +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then +- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +- test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- AC_MSG_RESULT([yes]) ++# AC_PATH_TOOL_PREFIX ++# ------------------- ++# find a file program which can recognise shared library ++AC_DEFUN([AC_PATH_TOOL_PREFIX], ++[AC_REQUIRE([AC_PROG_EGREP])dnl ++AC_MSG_CHECKING([for $1]) ++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++[case $MAGIC_CMD in ++[[\\/*] | ?:[\\/]*]) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++dnl $ac_dummy forces splitting on constant user-supplied paths. ++dnl POSIX.2 word splitting is done only on the output of word expansions, ++dnl not every word. This closes a longstanding sh security hole. ++ ac_dummy="ifelse([$2], , $PATH, [$2])" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$1; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac]) ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ AC_MSG_RESULT($MAGIC_CMD) + else +-# FIXME - insert some real tests, host_os isn't really good enough +- case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +-fi +- ;; +- *) +- AC_MSG_RESULT([no]) +- ;; +- esac ++ AC_MSG_RESULT(no) + fi +-])# AC_LIBTOOL_SYS_LIB_STRIP ++])# AC_PATH_TOOL_PREFIX + + +-# AC_LIBTOOL_SYS_DYNAMIC_LINKER +-# ----------------------------- +-# PORTME Fill in your ld.so characteristics +-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +-[AC_MSG_CHECKING([dynamic linker characteristics]) +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext_cmds=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++# AC_PATH_MAGIC ++# ------------- ++# find a file program which can recognise a shared library ++AC_DEFUN([AC_PATH_MAGIC], ++[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) ++if test -z "$lt_cv_path_MAGIC_CMD"; then ++ if test -n "$ac_tool_prefix"; then ++ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ MAGIC_CMD=: + fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + fi +-need_lib_prefix=unknown +-hardcode_into_libs=no ++])# AC_PATH_MAGIC + +-# when you set need_version to no, make sure it does not cause -set_version +-# flags to be left without arguments +-need_version=unknown + +-case $host_os in +-aix3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' +- shlibpath_var=LIBPATH ++# AC_PROG_LD ++# ---------- ++# find the pathname to the GNU or non-GNU linker ++AC_DEFUN([AC_PROG_LD], ++[AC_ARG_WITH([gnu-ld], ++ [AC_HELP_STRING([--with-gnu-ld], ++ [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++ [test "$withval" = no || with_gnu_ld=yes], ++ [with_gnu_ld=no]) ++AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ AC_MSG_CHECKING([for ld used by $CC]) ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [[\\/]]* | ?:[[\\/]]*) ++ re_direlt='/[[^/]][[^/]]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` ++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test "$with_gnu_ld" = yes; then ++ AC_MSG_CHECKING([for GNU ld]) ++else ++ AC_MSG_CHECKING([for non-GNU ld]) ++fi ++AC_CACHE_VAL(lt_cv_path_LD, ++[if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 &1 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' +- echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then +- : +- else +- can_build_shared=no +- fi +- ;; +- esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct +- # soname into executable. Probably we can add versioning support to +- # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then +- # If using run time linking (on AIX 4.2 or later) use lib.so +- # instead of lib.a to let people know that these are not +- # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ ++# AC_PROG_LD_RELOAD_FLAG ++# ---------------------- ++# find reload flag for linker ++# -- PORTME Some linkers may need a different reload flag. ++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], ++[AC_CACHE_CHECK([for $LD option to reload object files], ++ lt_cv_ld_reload_flag, ++ [lt_cv_ld_reload_flag='-r']) ++reload_flag=$lt_cv_ld_reload_flag ++case $reload_flag in ++"" | " "*) ;; ++*) reload_flag=" $reload_flag" ;; ++esac ++reload_cmds='$LD$reload_flag -o $output$reload_objs' ++case $host_os in ++ darwin*) ++ if test "$GCC" = yes; then ++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else +- # We preserve .a as extension for shared libraries through AIX4.2 +- # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' ++ reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi +- shlibpath_var=LIBPATH +- fi +- ;; ++ ;; ++esac ++])# AC_PROG_LD_RELOAD_FLAG + +-amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ++# AC_DEPLIBS_CHECK_METHOD ++# ----------------------- ++# how to check for library dependencies ++# -- PORTME fill in with the dynamic library characteristics ++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], ++[AC_CACHE_CHECK([how to recognise dependent libraries], ++lt_cv_deplibs_check_method, ++[lt_cv_file_magic_cmd='$MAGIC_CMD' ++lt_cv_file_magic_test_file= ++lt_cv_deplibs_check_method='unknown' ++# Need to set the preceding variable on all platforms that support ++# interlibrary dependencies. ++# 'none' -- dependencies not supported. ++# `unknown' -- same as none, but documents that we really don't know. ++# 'pass_all' -- all dependencies passed with no checks. ++# 'test_compile' -- check by making test program. ++# 'file_magic [[regex]]' -- check by looking for files in library path ++# which responds to the $file_magic_cmd with a given extended regex. ++# If you have `file' or equivalent on your system and you're not sure ++# whether `pass_all' will *always* work, you probably want this one. ++ ++case $host_os in ++aix4* | aix5*) ++ lt_cv_deplibs_check_method=pass_all + ;; + + beos*) +- library_names_spec='${libname}${shared_ext}' +- dynamic_linker="$host_os ld.so" +- shlibpath_var=LIBRARY_PATH ++ lt_cv_deplibs_check_method=pass_all + ;; + + bsdi[[45]]*) +- version_type=linux +- 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' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" +- # the default ld.so.conf also contains /usr/contrib/lib and +- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow +- # libtool to hard-code these into programs ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' ++ lt_cv_file_magic_cmd='/usr/bin/file -L' ++ lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +-cygwin* | mingw* | pw32*) +- version_type=windows +- shrext_cmds=".dll" +- need_version=no +- need_lib_prefix=no ++cygwin*) ++ # func_win32_libid is a shell function defined in ltmain.sh ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ ;; + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) +- library_names_spec='$libname.dll.a' +- # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ +- dldir=$destdir/`dirname \$dlpath`~ +- test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname~ +- chmod a+x \$dldir/$dlname' +- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ +- dlpath=$dir/\$dldll~ +- $rm \$dlpath' +- shlibpath_overrides_runpath=yes ++mingw* | pw32*) ++ # Base MSYS/MinGW do not provide the 'file' command needed by ++ # func_win32_libid shell function, so use a weaker test based on 'objdump'. ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ ;; + +- case $host_os in +- cygwin*) +- # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +- ;; +- mingw*) +- # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then +- # It is most probably a Windows format PATH printed by +- # mingw gcc, but we are running on Cygwin. Gcc prints its search +- # path with ; separators, and with drive letters. We can handle the +- # drive letters (cygwin fileutils understands them), so leave them, +- # especially as we might pass files found there to a mingw objdump, +- # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +- ;; +- pw32*) +- # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++darwin* | rhapsody*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++freebsd* | dragonfly*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++ case $host_cpu in ++ i*86 ) ++ # Not sure whether the presence of OpenBSD here was a mistake. ++ # Let's accept both of them until this is cleared up. ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac +- ;; ++ else ++ lt_cv_deplibs_check_method=pass_all ++ fi ++ ;; ++ ++gnu*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + ++hpux10.20* | hpux11*) ++ lt_cv_file_magic_cmd=/usr/bin/file ++ case $host_cpu in ++ ia64*) ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' ++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++ ;; ++ hppa*64*) ++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] ++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++ ;; + *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' ++ lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac +- dynamic_linker='Win32 ld.exe' +- # FIXME: first we should search . and the directory the executable is in +- shlibpath_var=PATH + ;; + +-darwin* | rhapsody*) +- dynamic_linker="$host_os dyld" +- version_type=darwin +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' +- shlibpath_overrides_runpath=yes +- shlibpath_var=DYLD_LIBRARY_PATH +- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi +- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++interix3*) ++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + +-dgux*) +- 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 ++irix5* | irix6* | nonstopux*) ++ case $LD in ++ *-32|*"-32 ") libmagic=32-bit;; ++ *-n32|*"-n32 ") libmagic=N32;; ++ *-64|*"-64 ") libmagic=64-bit;; ++ *) libmagic=never-match;; ++ esac ++ lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd1*) +- dynamic_linker=no ++# This must be Linux ELF. ++linux* | k*bsd*-gnu) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-kfreebsd*-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='GNU ld.so' ++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 ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' ++ fi + ;; + +-freebsd* | dragonfly*) +- # DragonFly does not have aout. When/if they implement a new +- # versioning mechanism, adjust this. +- if test -x /usr/bin/objformat; then +- objformat=`/usr/bin/objformat` ++newos6*) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=/usr/lib/libnls.so ++ ;; ++ ++nto-qnx*) ++ lt_cv_deplibs_check_method=unknown ++ ;; ++ ++openbsd*) ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else +- case $host_os in +- freebsd[[123]]*) objformat=aout ;; +- *) objformat=elf ;; +- esac ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi +- version_type=freebsd-$objformat +- case $version_type in +- freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- need_version=no +- need_lib_prefix=no +- ;; +- freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' +- need_version=yes +- ;; +- esac +- shlibpath_var=LD_LIBRARY_PATH +- case $host_os in +- freebsd2*) +- shlibpath_overrides_runpath=yes +- ;; +- freebsd3.[[01]]* | freebsdelf3.[[01]]*) +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ +- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- freebsd*) # from 4.6 on +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- esac + ;; + +-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 +- hardcode_into_libs=yes ++osf3* | osf4* | osf5*) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-hpux9* | hpux10* | hpux11*) +- # Give a soname corresponding to the major version so that dld.sl refuses to +- # link against other versions. +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- case $host_cpu in +- ia64*) +- shrext_cmds='.so' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.so" +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then +- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +- else +- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" +- fi +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++solaris*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++sysv4 | sysv4.3*) ++ case $host_vendor in ++ motorola) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext_cmds='.sl' +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=SHLIB_PATH +- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ ncr) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ sequent) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++ ;; ++ sni) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" ++ lt_cv_file_magic_test_file=/lib/libc.so ++ ;; ++ siemens) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all + ;; + esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. +- postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) +- 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' +- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all + ;; ++esac ++]) ++file_magic_cmd=$lt_cv_file_magic_cmd ++deplibs_check_method=$lt_cv_deplibs_check_method ++test -z "$deplibs_check_method" && deplibs_check_method=unknown ++])# AC_DEPLIBS_CHECK_METHOD + +-irix5* | irix6* | nonstopux*) +- case $host_os in +- nonstopux*) version_type=nonstopux ;; +- *) +- if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux +- else +- version_type=irix +- fi ;; +- esac +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' +- case $host_os in +- irix5* | nonstopux*) +- libsuff= shlibsuff= +- ;; +- *) +- case $LD in # libtool.m4 will add one of these switches to LD +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") +- libsuff= shlibsuff= libmagic=32-bit;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +- libsuff=32 shlibsuff=N32 libmagic=N32;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") +- libsuff=64 shlibsuff=64 libmagic=64-bit;; +- *) libsuff= shlibsuff= libmagic=never-match;; +- esac +- ;; +- esac +- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +- hardcode_into_libs=yes +- ;; +- +-# No shared lib support for Linux oldld, aout, or coff. +-linux*oldld* | linux*aout* | linux*coff*) +- dynamic_linker=no +- ;; +- +-# This must be Linux ELF. +-linux*) +- 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' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- # This implies no fast_install, which is unacceptable. +- # Some rework will be needed to allow for fast_install +- # before this can be enabled. +- hardcode_into_libs=yes +- +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac + +- # 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++# AC_PROG_NM ++# ---------- ++# find the pathname to a BSD-compatible name lister ++AC_DEFUN([AC_PROG_NM], ++[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, ++[if test -n "$NM"; then ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" ++else ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" + fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++fi]) ++NM="$lt_cv_path_NM" ++])# AC_PROG_NM + +- # We used to test for /lib/ld.so.1 and disable shared libraries on +- # powerpc, because MkLinux only supported shared libraries with the +- # GNU dynamic linker. Since this was broken with cross compilers, +- # most powerpc-linux boxes support dynamic linking these days and +- # people can always --disable-shared, the test was removed, and we +- # assume the GNU/Linux dynamic linker is in use. +- dynamic_linker='GNU/Linux ld.so' +- ;; + +-knetbsd*-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='GNU ld.so' ++# AC_CHECK_LIBM ++# ------------- ++# check for math library ++AC_DEFUN([AC_CHECK_LIBM], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++LIBM= ++case $host in ++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) ++ # These system don't have libm, or don't need it + ;; +- +-netbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- dynamic_linker='NetBSD (a.out) ld.so' +- else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='NetBSD ld.elf_so' +- fi +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes ++*-ncr-sysv4.3*) ++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") ++ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +- +-newsos6) +- version_type=linux +- 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 ++*) ++ AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; ++esac ++])# AC_CHECK_LIBM + +-nto-qnx*) +- 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=yes +- ;; + +-openbsd*) +- version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" +- need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; ++# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) ++# ----------------------------------- ++# sets LIBLTDL to the link flags for the libltdl convenience library and ++# LTDLINCL to the include flags for the libltdl header and adds ++# --enable-ltdl-convenience to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with ++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' ++# (note the single quotes!). If your package is not flat and you're not ++# using automake, define top_builddir and top_srcdir appropriately in ++# the Makefiles. ++AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++ case $enable_ltdl_convenience in ++ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; ++ "") enable_ltdl_convenience=yes ++ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; + esac +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[[89]] | openbsd2.[[89]].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +- ;; +- esac ++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ++ # For backwards non-gettext consistent compatibility... ++ INCLTDL="$LTDLINCL" ++])# AC_LIBLTDL_CONVENIENCE ++ ++ ++# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) ++# ----------------------------------- ++# sets LIBLTDL to the link flags for the libltdl installable library and ++# LTDLINCL to the include flags for the libltdl header and adds ++# --enable-ltdl-install to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# and an installed libltdl is not found, it is assumed to be `libltdl'. ++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with ++# '${top_srcdir}/' (note the single quotes!). If your package is not ++# flat and you're not using automake, define top_builddir and top_srcdir ++# appropriately in the Makefiles. ++# In the future, this macro may have to be called after AC_PROG_LIBTOOL. ++AC_DEFUN([AC_LIBLTDL_INSTALLABLE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++ AC_CHECK_LIB(ltdl, lt_dlinit, ++ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], ++ [if test x"$enable_ltdl_install" = xno; then ++ AC_MSG_WARN([libltdl not installed, but installation disabled]) ++ else ++ enable_ltdl_install=yes ++ fi ++ ]) ++ if test x"$enable_ltdl_install" = x"yes"; then ++ ac_configure_args="$ac_configure_args --enable-ltdl-install" ++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + else +- shlibpath_overrides_runpath=yes ++ ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ++ LIBLTDL="-lltdl" ++ LTDLINCL= + fi +- ;; ++ # For backwards non-gettext consistent compatibility... ++ INCLTDL="$LTDLINCL" ++])# AC_LIBLTDL_INSTALLABLE + +-os2*) +- libname_spec='$name' +- shrext_cmds=".dll" +- need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' +- dynamic_linker='OS/2 ld.exe' +- shlibpath_var=LIBPATH +- ;; + +-osf3* | osf4* | osf5*) +- version_type=osf +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +- ;; ++# AC_LIBTOOL_CXX ++# -------------- ++# enable support for C++ libraries ++AC_DEFUN([AC_LIBTOOL_CXX], ++[AC_REQUIRE([_LT_AC_LANG_CXX]) ++])# AC_LIBTOOL_CXX + +-solaris*) +- 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=yes +- hardcode_into_libs=yes +- # ldd complains unless libraries are executable +- postinstall_cmds='chmod +x $lib' +- ;; + +-sunos4*) +- version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- fi +- need_version=yes +- ;; ++# _LT_AC_LANG_CXX ++# --------------- ++AC_DEFUN([_LT_AC_LANG_CXX], ++[AC_REQUIRE([AC_PROG_CXX]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ++])# _LT_AC_LANG_CXX + +-sysv4 | sysv4.3*) +- version_type=linux +- 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 +- case $host_vendor in +- sni) +- shlibpath_overrides_runpath=no +- need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' +- runpath_var=LD_RUN_PATH +- ;; +- siemens) +- need_lib_prefix=no +- ;; +- motorola) +- need_lib_prefix=no +- need_version=no +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' +- ;; +- esac +- ;; ++# _LT_AC_PROG_CXXCPP ++# ------------------ ++AC_DEFUN([_LT_AC_PROG_CXXCPP], ++[ ++AC_REQUIRE([AC_PROG_CXX]) ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_PROG_CXXCPP ++fi ++])# _LT_AC_PROG_CXXCPP + +-sysv4*MP*) +- if test -d /usr/nec ;then +- version_type=linux +- 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 +- fi +- ;; ++# AC_LIBTOOL_F77 ++# -------------- ++# enable support for Fortran 77 libraries ++AC_DEFUN([AC_LIBTOOL_F77], ++[AC_REQUIRE([_LT_AC_LANG_F77]) ++])# AC_LIBTOOL_F77 + +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- version_type=freebsd-elf +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes +- if test "$with_gnu_ld" = yes; then +- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- shlibpath_overrides_runpath=no +- else +- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- shlibpath_overrides_runpath=yes +- case $host_os in +- sco3.2v5*) +- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" +- ;; +- esac +- fi +- sys_lib_dlsearch_path_spec='/usr/lib' +- ;; + +-uts4*) +- version_type=linux +- 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 +- ;; ++# _LT_AC_LANG_F77 ++# --------------- ++AC_DEFUN([_LT_AC_LANG_F77], ++[AC_REQUIRE([AC_PROG_F77]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) ++])# _LT_AC_LANG_F77 + +-*) +- dynamic_linker=no +- ;; +-esac +-AC_MSG_RESULT([$dynamic_linker]) +-test "$dynamic_linker" = no && can_build_shared=no + +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi +-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++# AC_LIBTOOL_GCJ ++# -------------- ++# enable support for GCJ libraries ++AC_DEFUN([AC_LIBTOOL_GCJ], ++[AC_REQUIRE([_LT_AC_LANG_GCJ]) ++])# AC_LIBTOOL_GCJ + + +-# _LT_AC_TAGCONFIG +-# ---------------- +-AC_DEFUN([_LT_AC_TAGCONFIG], +-[AC_ARG_WITH([tags], +- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], +- [include additional configurations @<:@automatic@:>@])], +- [tagnames="$withval"]) ++# _LT_AC_LANG_GCJ ++# --------------- ++AC_DEFUN([_LT_AC_LANG_GCJ], ++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], ++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], ++ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], ++ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], ++ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) ++])# _LT_AC_LANG_GCJ + +-if test -f "$ltmain" && test -n "$tagnames"; then +- if test ! -f "${ofile}"; then +- AC_MSG_WARN([output file `$ofile' does not exist]) +- fi + +- if test -z "$LTCC"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" +- if test -z "$LTCC"; then +- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) +- else +- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) +- fi +- fi +- if test -z "$LTCFLAGS"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" +- fi ++# AC_LIBTOOL_RC ++# ------------- ++# enable support for Windows resource files ++AC_DEFUN([AC_LIBTOOL_RC], ++[AC_REQUIRE([LT_AC_PROG_RC]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) ++])# AC_LIBTOOL_RC + +- # Extract list of available tagged configurations in $ofile. +- # Note that this assumes the entire list is on one line. +- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` + +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for tagname in $tagnames; do +- IFS="$lt_save_ifs" +- # Check whether tagname contains only valid characters +- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in +- "") ;; +- *) AC_MSG_ERROR([invalid tag name: $tagname]) +- ;; +- esac ++# AC_LIBTOOL_LANG_C_CONFIG ++# ------------------------ ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) ++AC_DEFUN([_LT_AC_LANG_C_CONFIG], ++[lt_save_CC="$CC" ++AC_LANG_PUSH(C) + +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null +- then +- AC_MSG_ERROR([tag name \"$tagname\" already exists]) +- fi ++# Source file extension for C test sources. ++ac_ext=c + +- # Update the list of available tags. +- if test -n "$tagname"; then +- echo appending configuration tag \"$tagname\" to $ofile ++# Object file extension for compiled C test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +- case $tagname in +- CXX) +- if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- AC_LIBTOOL_LANG_CXX_CONFIG +- else +- tagname="" +- fi +- ;; ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="int some_variable = 0;\n" + +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- AC_LIBTOOL_LANG_F77_CONFIG +- else +- tagname="" +- fi +- ;; ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(){return(0);}\n' + +- GCJ) +- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then +- AC_LIBTOOL_LANG_GCJ_CONFIG +- else +- tagname="" +- fi +- ;; ++_LT_AC_SYS_COMPILER + +- RC) +- AC_LIBTOOL_LANG_RC_CONFIG +- ;; +- +- *) +- AC_MSG_ERROR([Unsupported tag name: $tagname]) +- ;; +- esac ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +- # Append the new tag name to the list of available tags. +- if test -n "$tagname" ; then +- available_tags="$available_tags $tagname" +- fi +- fi +- done +- IFS="$lt_save_ifs" ++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++AC_LIBTOOL_SYS_LIB_STRIP ++AC_LIBTOOL_DLOPEN_SELF + +- # Now substitute the updated list of available tags. +- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then +- mv "${ofile}T" "$ofile" +- chmod +x "$ofile" +- else +- rm -f "${ofile}T" +- AC_MSG_ERROR([unable to update list of available tagged configurations.]) +- fi +-fi +-])# _LT_AC_TAGCONFIG ++# Report which library types will actually be built ++AC_MSG_CHECKING([if libtool supports shared libraries]) ++AC_MSG_RESULT([$can_build_shared]) + ++AC_MSG_CHECKING([whether to build shared libraries]) ++test "$can_build_shared" = "no" && enable_shared=no + +-# AC_LIBTOOL_DLOPEN +-# ----------------- +-# enable checks for dlopen support +-AC_DEFUN([AC_LIBTOOL_DLOPEN], +- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_DLOPEN ++# On AIX, shared libraries and static libraries use the same namespace, and ++# are all built from PIC. ++case $host_os in ++aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; + ++aix4* | aix5*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++esac ++AC_MSG_RESULT([$enable_shared]) + +-# AC_LIBTOOL_WIN32_DLL +-# -------------------- +-# declare package support for building win32 DLLs +-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_WIN32_DLL ++AC_MSG_CHECKING([whether to build static libraries]) ++# Make sure either enable_shared or enable_static is yes. ++test "$enable_shared" = yes || enable_static=yes ++AC_MSG_RESULT([$enable_static]) + ++AC_LIBTOOL_CONFIG($1) + +-# AC_ENABLE_SHARED([DEFAULT]) +-# --------------------------- +-# implement the --enable-shared flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_SHARED], +-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([shared], +- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], +- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; +- *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) +-])# AC_ENABLE_SHARED ++AC_LANG_POP ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_C_CONFIG + + +-# AC_DISABLE_SHARED +-# ----------------- +-# set the default shared flag to --disable-shared +-AC_DEFUN([AC_DISABLE_SHARED], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_SHARED(no) +-])# AC_DISABLE_SHARED ++# AC_LIBTOOL_LANG_CXX_CONFIG ++# -------------------------- ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) ++AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], ++[AC_LANG_PUSH(C++) ++AC_REQUIRE([AC_PROG_CXX]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) + ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_AC_TAGVAR(allow_undefined_flag, $1)= ++_LT_AC_TAGVAR(always_export_symbols, $1)=no ++_LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_direct, $1)=no ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++_LT_AC_TAGVAR(hardcode_automatic, $1)=no ++_LT_AC_TAGVAR(module_cmds, $1)= ++_LT_AC_TAGVAR(module_expsym_cmds, $1)= ++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_AC_TAGVAR(no_undefined_flag, $1)= ++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +-# AC_ENABLE_STATIC([DEFAULT]) +-# --------------------------- +-# implement the --enable-static flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_STATIC], +-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([static], +- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], +- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_static=yes ;; +- no) enable_static=no ;; +- *) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_static=]AC_ENABLE_STATIC_DEFAULT) +-])# AC_ENABLE_STATIC ++# Dependencies to place before and after the object being linked: ++_LT_AC_TAGVAR(predep_objects, $1)= ++_LT_AC_TAGVAR(postdep_objects, $1)= ++_LT_AC_TAGVAR(predeps, $1)= ++_LT_AC_TAGVAR(postdeps, $1)= ++_LT_AC_TAGVAR(compiler_lib_search_path, $1)= + ++# Source file extension for C++ test sources. ++ac_ext=cpp + +-# AC_DISABLE_STATIC +-# ----------------- +-# set the default static flag to --disable-static +-AC_DEFUN([AC_DISABLE_STATIC], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_STATIC(no) +-])# AC_DISABLE_STATIC ++# Object file extension for compiled C++ test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="int some_variable = 0;\n" + +-# AC_ENABLE_FAST_INSTALL([DEFAULT]) +-# --------------------------------- +-# implement the --enable-fast-install flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_FAST_INSTALL], +-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([fast-install], +- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], +- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; +- *) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) +-])# AC_ENABLE_FAST_INSTALL ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' + ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER + +-# AC_DISABLE_FAST_INSTALL +-# ----------------------- +-# set the default to --disable-fast-install +-AC_DEFUN([AC_DISABLE_FAST_INSTALL], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_FAST_INSTALL(no) +-])# AC_DISABLE_FAST_INSTALL ++# 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_LD=$LD ++lt_save_GCC=$GCC ++GCC=$GXX ++lt_save_with_gnu_ld=$with_gnu_ld ++lt_save_path_LD=$lt_cv_path_LD ++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++else ++ $as_unset lt_cv_prog_gnu_ld ++fi ++if test -n "${lt_cv_path_LDCXX+set}"; then ++ lt_cv_path_LD=$lt_cv_path_LDCXX ++else ++ $as_unset lt_cv_path_LD ++fi ++test -z "${LDCXX+set}" || LD=$LDCXX ++CC=${CXX-"c++"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + +-# AC_LIBTOOL_PICMODE([MODE]) +-# -------------------------- +-# implement the --with-pic flag +-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +-AC_DEFUN([AC_LIBTOOL_PICMODE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-pic_mode=ifelse($#,1,$1,default) +-])# AC_LIBTOOL_PICMODE ++# We don't want -fno-exception wen compiling C++ code, so set the ++# no_builtin_flag separately ++if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++else ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++fi + ++if test "$GXX" = yes; then ++ # Set up default GNU C++ configuration + +-# AC_PROG_EGREP +-# ------------- +-# This is predefined starting with Autoconf 2.54, so this conditional +-# definition can be removed once we require Autoconf 2.54 or later. +-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], +-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], +- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' +- fi]) +- EGREP=$ac_cv_prog_egrep +- AC_SUBST([EGREP]) +-])]) ++ AC_PROG_LD + ++ # Check if GNU C++ uses GNU ld as the underlying linker, since the ++ # archiving commands below assume that GNU ld is being used. ++ if test "$with_gnu_ld" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + +-# AC_PATH_TOOL_PREFIX +-# ------------------- +-# find a file program which can recognise shared library +-AC_DEFUN([AC_PATH_TOOL_PREFIX], +-[AC_REQUIRE([AC_PROG_EGREP])dnl +-AC_MSG_CHECKING([for $1]) +-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +-[case $MAGIC_CMD in +-[[\\/*] | ?:[\\/]*]) +- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. +- ;; +-*) +- lt_save_MAGIC_CMD="$MAGIC_CMD" +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +-dnl $ac_dummy forces splitting on constant user-supplied paths. +-dnl POSIX.2 word splitting is done only on the output of word expansions, +-dnl not every word. This closes a longstanding sh security hole. +- ac_dummy="ifelse([$2], , $PATH, [$2])" +- for ac_dir in $ac_dummy; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$1; then +- lt_cv_path_MAGIC_CMD="$ac_dir/$1" +- if test -n "$file_magic_test_file"; then +- case $deplibs_check_method in +- "file_magic "*) +- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` +- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | +- $EGREP "$file_magic_regex" > /dev/null; then +- : +- else +- cat <&2 ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + +-*** Warning: the command libtool uses to detect shared libraries, +-*** $file_magic_cmd, produces output that libtool cannot recognize. +-*** The result is that libtool may fail to recognize shared libraries +-*** as such. This will affect the creation of libtool libraries that +-*** depend on shared libraries, but programs linked with such libtool +-*** libraries will work regardless of this problem. Nevertheless, you +-*** may want to report the problem to your system manager and/or to +-*** bug-libtool@gnu.org ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++ # investigate it a little bit more. (MM) ++ wlarc='${wl}' + +-EOF +- fi ;; +- esac +- fi +- break ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ ++ grep 'no-whole-archive' > /dev/null; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi +- done +- IFS="$lt_save_ifs" +- MAGIC_CMD="$lt_save_MAGIC_CMD" +- ;; +-esac]) +-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +-if test -n "$MAGIC_CMD"; then +- AC_MSG_RESULT($MAGIC_CMD) +-else +- AC_MSG_RESULT(no) +-fi +-])# AC_PATH_TOOL_PREFIX +- +- +-# AC_PATH_MAGIC +-# ------------- +-# find a file program which can recognise a shared library +-AC_DEFUN([AC_PATH_MAGIC], +-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +-if test -z "$lt_cv_path_MAGIC_CMD"; then +- if test -n "$ac_tool_prefix"; then +- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else +- MAGIC_CMD=: ++ with_gnu_ld=no ++ wlarc= ++ ++ # A generic and very simple default shared library creation ++ # command for GNU C++ for the case where it uses the native ++ # linker, instead of GNU ld. If possible, this setting should ++ # overridden to take advantage of the native linker features on ++ # the platform it is being used on. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi +-fi +-])# AC_PATH_MAGIC + ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +-# AC_PROG_LD +-# ---------- +-# find the pathname to the GNU or non-GNU linker +-AC_DEFUN([AC_PROG_LD], +-[AC_ARG_WITH([gnu-ld], +- [AC_HELP_STRING([--with-gnu-ld], +- [assume the C compiler uses GNU ld @<:@default=no@:>@])], +- [test "$withval" = no || with_gnu_ld=yes], +- [with_gnu_ld=no]) +-AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-ac_prog=ld +-if test "$GCC" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- AC_MSG_CHECKING([for ld used by $CC]) +- case $host in +- *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw +- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; +- *) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +- esac +- case $ac_prog in +- # Accept absolute paths. +- [[\\/]]* | ?:[[\\/]]*) +- re_direlt='/[[^/]][[^/]]*/\.\./' +- # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- AC_MSG_CHECKING([for GNU ld]) + else +- AC_MSG_CHECKING([for non-GNU ld]) ++ GXX=no ++ with_gnu_ld=no ++ wlarc= + fi +-AC_CACHE_VAL(lt_cv_path_LD, +-[if test -z "$LD"; then +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- lt_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some variants of GNU ld only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null ++ then ++ # We have reworked collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ else ++ # We have old collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi + else +- reload_cmds='$LD$reload_flag -o $output$reload_objs' ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi + fi +- ;; +-esac +-])# AC_PROG_LD_RELOAD_FLAG +- +- +-# AC_DEPLIBS_CHECK_METHOD +-# ----------------------- +-# how to check for library dependencies +-# -- PORTME fill in with the dynamic library characteristics +-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], +-[AC_CACHE_CHECK([how to recognise dependent libraries], +-lt_cv_deplibs_check_method, +-[lt_cv_file_magic_cmd='$MAGIC_CMD' +-lt_cv_file_magic_test_file= +-lt_cv_deplibs_check_method='unknown' +-# Need to set the preceding variable on all platforms that support +-# interlibrary dependencies. +-# 'none' -- dependencies not supported. +-# `unknown' -- same as none, but documents that we really don't know. +-# 'pass_all' -- all dependencies passed with no checks. +-# 'test_compile' -- check by making test program. +-# 'file_magic [[regex]]' -- check by looking for files in library path +-# which responds to the $file_magic_cmd with a given extended regex. +-# If you have `file' or equivalent on your system and you're not sure +-# whether `pass_all' will *always* work, you probably want this one. + +-case $host_os in +-aix4* | aix5*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-beos*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-bsdi[[45]]*) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' +- lt_cv_file_magic_cmd='/usr/bin/file -L' +- lt_cv_file_magic_test_file=/shlib/libc.so +- ;; +- +-cygwin*) +- # func_win32_libid is a shell function defined in ltmain.sh +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='func_win32_libid' +- ;; ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + +-mingw* | pw32*) +- # Base MSYS/MinGW do not provide the 'file' command needed by +- # func_win32_libid shell function, so use a weaker test based on 'objdump'. +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' +- lt_cv_file_magic_cmd='$OBJDUMP -f' +- ;; ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; + +-darwin* | rhapsody*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + +-freebsd* | kfreebsd*-gnu | dragonfly*) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then +- case $host_cpu in +- i*86 ) +- # Not sure whether the presence of OpenBSD here was a mistake. +- # Let's accept both of them until this is cleared up. +- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` +- ;; ++ chorus*) ++ case $cc_basename in ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; + esac +- else +- lt_cv_deplibs_check_method=pass_all +- fi +- ;; +- +-gnu*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-hpux10.20* | hpux11*) +- lt_cv_file_magic_cmd=/usr/bin/file +- case $host_cpu in +- ia64*) +- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' +- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so +- ;; +- hppa*64*) +- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] +- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl +- ;; +- *) +- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' +- lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; +- esac +- ;; +- +-interix3*) +- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' +- ;; +- +-irix5* | irix6* | nonstopux*) +- case $LD in +- *-32|*"-32 ") libmagic=32-bit;; +- *-n32|*"-n32 ") libmagic=N32;; +- *-64|*"-64 ") libmagic=64-bit;; +- *) libmagic=never-match;; +- esac +- lt_cv_deplibs_check_method=pass_all +- ;; + +-# This must be Linux ELF. +-linux*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + +-netbsd*) +- 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 +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' +- fi +- ;; +- +-newos6*) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=/usr/lib/libnls.so +- ;; +- +-nto-qnx*) +- lt_cv_deplibs_check_method=unknown +- ;; +- +-openbsd*) +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' +- else +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' +- fi +- ;; +- +-osf3* | osf4* | osf5*) +- lt_cv_deplibs_check_method=pass_all ++ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi + ;; ++ darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +-solaris*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ if test "$GXX" = yes ; then ++ lt_int_apple_cc_single_mod=no ++ output_verbose_link_cmd='echo' ++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then ++ lt_int_apple_cc_single_mod=yes ++ fi ++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ fi ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ else ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ else ++ case $cc_basename in ++ xlc*) ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ ;; ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi ++ ;; + +-sysv4 | sysv4.3*) +- case $host_vendor in +- motorola) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` +- ;; +- ncr) +- lt_cv_deplibs_check_method=pass_all ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac + ;; +- sequent) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++ freebsd[[12]]*) ++ # C++ shared libraries reported to be fairly broken before switch to ELF ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- sni) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" +- lt_cv_file_magic_test_file=/lib/libc.so ++ freebsd-elf*) ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ;; +- siemens) +- lt_cv_deplibs_check_method=pass_all ++ freebsd* | dragonfly*) ++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++ # conventions ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes + ;; +- pc) +- lt_cv_deplibs_check_method=pass_all ++ gnu*) + ;; +- esac +- ;; ++ hpux9*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. + +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- lt_cv_deplibs_check_method=pass_all +- ;; +-esac +-]) +-file_magic_cmd=$lt_cv_file_magic_cmd +-deplibs_check_method=$lt_cv_deplibs_check_method +-test -z "$deplibs_check_method" && deplibs_check_method=unknown +-])# AC_DEPLIBS_CHECK_METHOD ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ hpux10*|hpux11*) ++ if test $with_gnu_ld = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++ ;; ++ *) ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ esac ++ fi ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ;; ++ esac + +-# AC_PROG_NM +-# ---------- +-# find the pathname to a BSD-compatible name lister +-AC_DEFUN([AC_PROG_NM], +-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, +-[if test -n "$NM"; then +- # Let the user override the test. +- lt_cv_path_NM="$NM" +-else +- lt_nm_to_check="${ac_tool_prefix}nm" +- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then +- lt_nm_to_check="$lt_nm_to_check nm" +- fi +- for lt_tmp_nm in $lt_nm_to_check; do +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/$lt_tmp_nm" +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- # Tru64's nm complains that /dev/null is an invalid object file +- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in +- */dev/null* | *'Invalid file or object type'*) +- lt_cv_path_NM="$tmp_nm -B" +- break ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in +- */dev/null*) +- lt_cv_path_NM="$tmp_nm -p" +- break +- ;; +- *) +- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags +- ;; +- esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac +- fi +- done +- IFS="$lt_save_ifs" +- done +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +-fi]) +-NM="$lt_cv_path_NM" +-])# AC_PROG_NM +- +- +-# AC_CHECK_LIBM +-# ------------- +-# check for math library +-AC_DEFUN([AC_CHECK_LIBM], +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-LIBM= +-case $host in +-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +- # These system don't have libm, or don't need it +- ;; +-*-ncr-sysv4.3*) +- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") +- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") +- ;; +-*) +- AC_CHECK_LIB(m, cos, LIBM="-lm") +- ;; +-esac +-])# AC_CHECK_LIBM +- +- +-# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) +-# ----------------------------------- +-# sets LIBLTDL to the link flags for the libltdl convenience library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-convenience to the configure arguments. Note that +-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +-# it is assumed to be `libltdl'. LIBLTDL will be prefixed with +-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' +-# (note the single quotes!). If your package is not flat and you're not +-# using automake, define top_builddir and top_srcdir appropriately in +-# the Makefiles. +-AC_DEFUN([AC_LIBLTDL_CONVENIENCE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- case $enable_ltdl_convenience in +- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; +- "") enable_ltdl_convenience=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +- esac +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_CONVENIENCE +- +- +-# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) +-# ----------------------------------- +-# sets LIBLTDL to the link flags for the libltdl installable library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-install to the configure arguments. Note that +-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +-# and an installed libltdl is not found, it is assumed to be `libltdl'. +-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with +-# '${top_srcdir}/' (note the single quotes!). If your package is not +-# flat and you're not using automake, define top_builddir and top_srcdir +-# appropriately in the Makefiles. +-# In the future, this macro may have to be called after AC_PROG_LIBTOOL. +-AC_DEFUN([AC_LIBLTDL_INSTALLABLE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- AC_CHECK_LIB(ltdl, lt_dlinit, +- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], +- [if test x"$enable_ltdl_install" = xno; then +- AC_MSG_WARN([libltdl not installed, but installation disabled]) +- else +- enable_ltdl_install=yes +- fi +- ]) +- if test x"$enable_ltdl_install" = x"yes"; then +- ac_configure_args="$ac_configure_args --enable-ltdl-install" +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- else +- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" +- LIBLTDL="-lltdl" +- LTDLINCL= +- fi +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_INSTALLABLE +- +- +-# AC_LIBTOOL_CXX +-# -------------- +-# enable support for C++ libraries +-AC_DEFUN([AC_LIBTOOL_CXX], +-[AC_REQUIRE([_LT_AC_LANG_CXX]) +-])# AC_LIBTOOL_CXX +- ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test $with_gnu_ld = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ fi ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ interix3*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ irix5* | irix6*) ++ case $cc_basename in ++ CC*) ++ # SGI C++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + +-# _LT_AC_LANG_CXX +-# --------------- +-AC_DEFUN([_LT_AC_LANG_CXX], +-[AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) +-])# _LT_AC_LANG_CXX ++ # Archives containing C++ object files must be created using ++ # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' ++ fi ++ fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ esac ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler + +-# _LT_AC_PROG_CXXCPP +-# ------------------ +-AC_DEFUN([_LT_AC_PROG_CXXCPP], +-[ +-AC_REQUIRE([AC_PROG_CXX]) +-if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- AC_PROG_CXXCPP +-fi +-])# _LT_AC_PROG_CXXCPP ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + +-# AC_LIBTOOL_F77 +-# -------------- +-# enable support for Fortran 77 libraries +-AC_DEFUN([AC_LIBTOOL_F77], +-[AC_REQUIRE([_LT_AC_LANG_F77]) +-])# AC_LIBTOOL_F77 ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++ ;; ++ icpc*) ++ # Intel C++ ++ with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ ;; ++ pgCC*) ++ # Portland Group C++ compiler ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + +-# _LT_AC_LANG_F77 +-# --------------- +-AC_DEFUN([_LT_AC_LANG_F77], +-[AC_REQUIRE([AC_PROG_F77]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) +-])# _LT_AC_LANG_F77 ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) ++ # Compaq C++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + ++ runpath_var=LD_RUN_PATH ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-# AC_LIBTOOL_GCJ +-# -------------- +-# enable support for GCJ libraries +-AC_DEFUN([AC_LIBTOOL_GCJ], +-[AC_REQUIRE([_LT_AC_LANG_GCJ]) +-])# AC_LIBTOOL_GCJ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ esac ++ ;; ++ lynxos*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ m88k*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ++ wlarc= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ fi ++ # Workaround some broken pre-1.5 toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ openbsd*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd='echo' ++ ;; ++ osf3*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler + ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + +-# _LT_AC_LANG_GCJ +-# --------------- +-AC_DEFUN([_LT_AC_LANG_GCJ], +-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], +- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], +- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], +- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) +-])# _LT_AC_LANG_GCJ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + +-# AC_LIBTOOL_RC +-# ------------- +-# enable support for Windows resource files +-AC_DEFUN([AC_LIBTOOL_RC], +-[AC_REQUIRE([LT_AC_PROG_RC]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) +-])# AC_LIBTOOL_RC ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ cxx*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-# AC_LIBTOOL_LANG_C_CONFIG +-# ------------------------ +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) +-AC_DEFUN([_LT_AC_LANG_C_CONFIG], +-[lt_save_CC="$CC" +-AC_LANG_PUSH(C) ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + +-# Source file extension for C test sources. +-ac_ext=c ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-# Object file extension for compiled C test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler + +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(){return(0);}\n' ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + +-_LT_AC_SYS_COMPILER ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE ++ # Archives containing C++ object files must be created using ++ # the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ cxx*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++ echo "-hidden">> $lib.exp~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ ++ $rm $lib.exp' + +-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-# Report which library types will actually be built +-AC_MSG_CHECKING([if libtool supports shared libraries]) +-AC_MSG_RESULT([$can_build_shared]) ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + +-AC_MSG_CHECKING([whether to build shared libraries]) +-test "$can_build_shared" = "no" && enable_shared=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case $host_os in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +-aix4* | aix5*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac + ;; +-esac +-AC_MSG_RESULT([$enable_shared]) +- +-AC_MSG_CHECKING([whether to build static libraries]) +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-AC_MSG_RESULT([$enable_static]) +- +-AC_LIBTOOL_CONFIG($1) +- +-AC_LANG_POP +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_C_CONFIG +- +- +-# AC_LIBTOOL_LANG_CXX_CONFIG +-# -------------------------- +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) +-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], +-[AC_LANG_PUSH(C++) +-AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++ psos*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ lcc*) ++ # Lucid ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_AC_TAGVAR(allow_undefined_flag, $1)= +-_LT_AC_TAGVAR(always_export_symbols, $1)=no +-_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_direct, $1)=no +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no +-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +-_LT_AC_TAGVAR(hardcode_automatic, $1)=no +-_LT_AC_TAGVAR(module_cmds, $1)= +-_LT_AC_TAGVAR(module_expsym_cmds, $1)= +-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_AC_TAGVAR(no_undefined_flag, $1)= +-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # The C++ compiler is used as linker so we must use $wl ++ # flag to pass the commands to the underlying system ++ # linker. We must also pass each convience library through ++ # to the system linker between allextract/defaultextract. ++ # The C++ compiler will combine linker options so we ++ # cannot just pass the convience library names through ++ # without $wl. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ++ ;; ++ esac ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +-# Dependencies to place before and after the object being linked: +-_LT_AC_TAGVAR(predep_objects, $1)= +-_LT_AC_TAGVAR(postdep_objects, $1)= +-_LT_AC_TAGVAR(predeps, $1)= +-_LT_AC_TAGVAR(postdeps, $1)= +-_LT_AC_TAGVAR(compiler_lib_search_path, $1)= ++ output_verbose_link_cmd='echo' + +-# Source file extension for C++ test sources. +-ac_ext=cpp ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + +-# Object file extension for compiled C++ test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext ++ # The C++ compiler must be used to create the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++ ;; ++ *) ++ # GNU C++ compiler with Solaris linker ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++ if $CC --version | grep -v '^2\.7' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ else ++ # g++ 2.7 appears to require `-G' NOT `-shared' on this ++ # platform. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ fi + +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++ fi ++ ;; ++ esac ++ ;; ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' + +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ # So that behaviour is only enabled if SCOABSPATH is set to a ++ # non-empty value in the environment. Most likely only useful for ++ # creating official distributions of packages. ++ # This is a hack until libtool officially supports absolute path ++ # names for shared libraries. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' + +-# Allow CC to be a program name with arguments. +-lt_save_CC=$CC +-lt_save_LD=$LD +-lt_save_GCC=$GCC +-GCC=$GXX +-lt_save_with_gnu_ld=$with_gnu_ld +-lt_save_path_LD=$lt_cv_path_LD +-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then +- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +-else +- $as_unset lt_cv_prog_gnu_ld +-fi +-if test -n "${lt_cv_path_LDCXX+set}"; then +- lt_cv_path_LD=$lt_cv_path_LDCXX +-else +- $as_unset lt_cv_path_LD +-fi +-test -z "${LDCXX+set}" || LD=$LDCXX +-CC=${CXX-"c++"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ vxworks*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++esac ++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +-# We don't want -fno-exception wen compiling C++ code, so set the +-# no_builtin_flag separately +-if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +-else +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +-fi ++_LT_AC_TAGVAR(GCC, $1)="$GXX" ++_LT_AC_TAGVAR(LD, $1)="$LD" + +-if test "$GXX" = yes; then +- # Set up default GNU C++ configuration ++AC_LIBTOOL_POSTDEP_PREDEP($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + +- AC_PROG_LD ++AC_LIBTOOL_CONFIG($1) + +- # Check if GNU C++ uses GNU ld as the underlying linker, since the +- # archiving commands below assume that GNU ld is being used. +- if test "$with_gnu_ld" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++AC_LANG_POP ++CC=$lt_save_CC ++LDCXX=$LD ++LD=$lt_save_LD ++GCC=$lt_save_GCC ++with_gnu_ldcxx=$with_gnu_ld ++with_gnu_ld=$lt_save_with_gnu_ld ++lt_cv_path_LDCXX=$lt_cv_path_LD ++lt_cv_path_LD=$lt_save_path_LD ++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++])# AC_LIBTOOL_LANG_CXX_CONFIG + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) ++# ------------------------------------ ++# Figure out "hidden" library dependencies from verbose ++# compiler output when linking a shared library. ++# Parse the compiler output and extract the necessary ++# objects, libraries and library flags. ++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ ++dnl we can't use the lt_simple_compile_test_code here, ++dnl because it contains code intended for an executable, ++dnl not a library. It's possible we should let each ++dnl tag define a new lt_????_link_test_code variable, ++dnl but it's only used here... ++ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&1" | \ +- grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- else +- with_gnu_ld=no +- wlarc= ++ # The `*' in the case matches for architectures that use `case' in ++ # $output_verbose_cmd can trigger glob expansion during the loop ++ # eval without this substitution. ++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` + +- # A generic and very simple default shared library creation +- # command for GNU C++ for the case where it uses the native +- # linker, instead of GNU ld. If possible, this setting should +- # overridden to take advantage of the native linker features on +- # the platform it is being used on. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- fi ++ for p in `eval $output_verbose_link_cmd`; do ++ case $p in + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++ -L* | -R* | -l*) ++ # Some compilers place space between "-{L,R}" and the path. ++ # Remove the space. ++ if test $p = "-L" \ ++ || test $p = "-R"; then ++ prev=$p ++ continue ++ else ++ prev= ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ case $p in ++ -L* | -R*) ++ # Internal compiler library paths should come after those ++ # provided the user. The postdeps already come after the ++ # user supplied libs so there is no need to process them. ++ if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" ++ else ++ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" ++ fi ++ ;; ++ # The "-l" case would never come before the object being ++ # linked, so don't bother handling this case. ++ esac ++ else ++ if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then ++ _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" ++ else ++ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" ++ fi ++ fi ++ ;; ++ ++ *.$objext) ++ # This assumes that the test object file only shows up ++ # once in the compiler output. ++ if test "$p" = "conftest.$objext"; then ++ pre_test_object_deps_done=yes ++ continue ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then ++ _LT_AC_TAGVAR(predep_objects, $1)="$p" ++ else ++ _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p" ++ fi ++ else ++ if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then ++ _LT_AC_TAGVAR(postdep_objects, $1)="$p" ++ else ++ _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p" ++ fi ++ fi ++ ;; + ++ *) ;; # Ignore the rest. ++ ++ esac ++ done ++ ++ # Clean up. ++ rm -f a.out a.exe + else +- GXX=no +- with_gnu_ld=no +- wlarc= ++ echo "libtool.m4: error: problem compiling $1 test program" + fi + +-# PORTME: fill in a description of your system's C++ link characteristics +-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-_LT_AC_TAGVAR(ld_shlibs, $1)=yes +-case $host_os in +- aix3*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aix4* | aix5*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- aix_use_runtimelinking=no ++$rm -f confest.$objext + +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) +- for ld_flag in $LDFLAGS; do +- case $ld_flag in +- *-brtl*) +- aix_use_runtimelinking=yes +- break +- ;; +- esac +- done +- ;; +- esac ++# PORTME: override above test on systems where it is broken ++ifelse([$1],[CXX], ++[case $host_os in ++interix3*) ++ # Interix 3.5 installs completely hosed .la files for C++, so rather than ++ # hack all around it, let's just trust "g++" to DTRT. ++ _LT_AC_TAGVAR(predep_objects,$1)= ++ _LT_AC_TAGVAR(postdep_objects,$1)= ++ _LT_AC_TAGVAR(postdeps,$1)= ++ ;; + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi ++solaris*) ++ case $cc_basename in ++ CC*) ++ # Adding this requires a known-good setup of shared libraries for ++ # Sun compiler versions before 5.6, else PIC objects from an old ++ # archive will be linked into the output, leading to subtle bugs. ++ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' ++ ;; ++ esac ++ ;; ++esac ++]) + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++case " $_LT_AC_TAGVAR(postdeps, $1) " in ++*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; ++esac ++])# AC_LIBTOOL_POSTDEP_PREDEP + +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++# AC_LIBTOOL_LANG_F77_CONFIG ++# -------------------------- ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) ++AC_DEFUN([_LT_AC_LANG_F77_CONFIG], ++[AC_REQUIRE([AC_PROG_F77]) ++AC_LANG_PUSH(Fortran 77) + +- if test "$GXX" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- fi +- ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_AC_TAGVAR(allow_undefined_flag, $1)= ++_LT_AC_TAGVAR(always_export_symbols, $1)=no ++_LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_direct, $1)=no ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++_LT_AC_TAGVAR(hardcode_automatic, $1)=no ++_LT_AC_TAGVAR(module_cmds, $1)= ++_LT_AC_TAGVAR(module_expsym_cmds, $1)= ++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_AC_TAGVAR(no_undefined_flag, $1)= ++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++# Source file extension for f77 test sources. ++ac_ext=f + +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; ++# Object file extension for compiled f77 test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Joseph Beckenbach says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# Code to be used in simple compile tests ++lt_simple_compile_test_code=" subroutine t\n return\n end\n" + +- chorus*) +- case $cc_basename in +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; ++# Code to be used in simple link tests ++lt_simple_link_test_code=" program t\n end\n" + +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER + +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +- if test "$GXX" = yes ; then +- lt_int_apple_cc_single_mod=no +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes +- fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- case $cc_basename in +- xlc*) +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- ;; +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +- ;; ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${F77-"f77"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + +- dgux*) +- case $cc_basename in +- ec++*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- ghcx*) +- # Green Hills C++ Compiler +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- freebsd[[12]]*) +- # C++ shared libraries reported to be fairly broken before switch to ELF +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- freebsd-elf*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) +- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF +- # conventions +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- ;; +- gnu*) +- ;; +- hpux9*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. ++AC_MSG_CHECKING([if libtool supports shared libraries]) ++AC_MSG_RESULT([$can_build_shared]) + +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- hpux10*|hpux11*) +- if test $with_gnu_ld = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++AC_MSG_CHECKING([whether to build shared libraries]) ++test "$can_build_shared" = "no" && enable_shared=no + +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- ;; +- *) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; +- esac +- fi +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- *) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- esac ++# On AIX, shared libraries and static libraries use the same namespace, and ++# are all built from PIC. ++case $host_os in ++aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++aix4* | aix5*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++esac ++AC_MSG_RESULT([$enable_shared]) + +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC*) +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- if test $with_gnu_ld = no; then +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- fi +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- interix3*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- ;; +- irix5* | irix6*) +- case $cc_basename in +- CC*) +- # SGI C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++AC_MSG_CHECKING([whether to build static libraries]) ++# Make sure either enable_shared or enable_static is yes. ++test "$enable_shared" = yes || enable_static=yes ++AC_MSG_RESULT([$enable_static]) + +- # Archives containing C++ object files must be created using +- # "CC -ar", where "CC" is the IRIX C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' +- ;; +- *) +- if test "$GXX" = yes; then +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' +- fi +- fi +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; +- esac +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- linux*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler ++_LT_AC_TAGVAR(GCC, $1)="$G77" ++_LT_AC_TAGVAR(LD, $1)="$LD" + +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++AC_LIBTOOL_CONFIG($1) + +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' +- ;; +- icpc*) +- # Intel C++ +- with_gnu_ld=yes +- # version 8.0 and above of icpc choke on multiply defined symbols +- # if we add $predep_objects and $postdep_objects, however 7.1 and +- # earlier do not add the objects themselves. +- case `$CC -V 2>&1` in +- *"Version 7."*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- *) # Version 8.0 or newer +- tmp_idyn= +- case $host_cpu in +- ia64*) tmp_idyn=' -i_dynamic';; +- esac +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +- ;; +- pgCC*) +- # Portland Group C++ compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++AC_LANG_POP ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_F77_CONFIG + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- ;; +- cxx*) +- # Compaq C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# AC_LIBTOOL_LANG_GCJ_CONFIG ++# -------------------------- ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) ++AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], ++[AC_LANG_SAVE + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- esac +- ;; +- lynxos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- m88k*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- mvs*) +- case $cc_basename in +- cxx*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' +- wlarc= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' +- ;; +- openbsd2*) +- # C++ shared libraries are fairly broken +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- openbsd*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- fi +- output_verbose_link_cmd='echo' +- ;; +- osf3*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler ++# Source file extension for Java test sources. ++ac_ext=java + +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++# Object file extension for compiled Java test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="class foo {}\n" + +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++# Code to be used in simple link tests ++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' + +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${GCJ-"gcj"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# GCJ did not exist at the time GCC didn't implicitly link libc in. ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- osf4* | osf5*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler ++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++AC_LIBTOOL_CONFIG($1) + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++AC_LANG_RESTORE ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_GCJ_CONFIG + +- # Archives containing C++ object files must be created using +- # the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ +- echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ +- $rm $lib.exp' + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# AC_LIBTOOL_LANG_RC_CONFIG ++# ------------------------- ++# Ensure that the configuration vars for the Windows resource compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) ++AC_DEFUN([_LT_AC_LANG_RC_CONFIG], ++[AC_LANG_SAVE + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++# Source file extension for RC test sources. ++ac_ext=rc + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# Object file extension for compiled RC test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++# Code to be used in simple compile tests ++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' + +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- psos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- lcc*) +- # Lucid +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- solaris*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.2, 5.x and Centerline C++ +- _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++# Code to be used in simple link tests ++lt_simple_link_test_code="$lt_simple_compile_test_code" + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) +- # The C++ compiler is used as linker so we must use $wl +- # flag to pass the commands to the underlying system +- # linker. We must also pass each convience library through +- # to the system linker between allextract/defaultextract. +- # The C++ compiler will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl. +- # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' +- ;; +- esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER + +- output_verbose_link_cmd='echo' ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +- # Archives containing C++ object files must be created using +- # "CC -xar", where "CC" is the Sun C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' +- ;; +- gcx*) +- # Green Hills C++ Compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${RC-"windres"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) ++_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +- # The C++ compiler must be used to create the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' +- ;; +- *) +- # GNU C++ compiler with Solaris linker +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' +- if $CC --version | grep -v '^2\.7' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++AC_LIBTOOL_CONFIG($1) + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- else +- # g++ 2.7 appears to require `-G' NOT `-shared' on this +- # platform. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++AC_LANG_RESTORE ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_RC_CONFIG + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- fi + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' +- fi +- ;; +- esac +- ;; +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var='LD_RUN_PATH' ++# AC_LIBTOOL_CONFIG([TAGNAME]) ++# ---------------------------- ++# If TAGNAME is not passed, then create an initial libtool script ++# with a default configuration from the untagged config vars. Otherwise ++# add code to config.status for appending the configuration named by ++# TAGNAME from the matching tagged config vars. ++AC_DEFUN([AC_LIBTOOL_CONFIG], ++[# The else clause should only fire when bootstrapping the ++# libtool distribution, otherwise you forgot to ship ltmain.sh ++# with your package, and you will get complaints that there are ++# no rules to generate ltmain.sh. ++if test -f "$ltmain"; then ++ # See if we are running on zsh, and set the options which allow our commands through ++ # without removal of \ escapes. ++ if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++ fi ++ # Now quote all the things that may contain metacharacters while being ++ # careful not to overquote the AC_SUBSTed values. We take copies of the ++ # variables and quote the copies for generation of the libtool script. ++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ ++ SED SHELL STRIP \ ++ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ ++ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ ++ deplibs_check_method reload_flag reload_cmds need_locks \ ++ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ ++ lt_cv_sys_global_symbol_to_c_name_address \ ++ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ ++ old_postinstall_cmds old_postuninstall_cmds \ ++ _LT_AC_TAGVAR(compiler, $1) \ ++ _LT_AC_TAGVAR(CC, $1) \ ++ _LT_AC_TAGVAR(LD, $1) \ ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ ++ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ ++ _LT_AC_TAGVAR(old_archive_cmds, $1) \ ++ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ ++ _LT_AC_TAGVAR(predep_objects, $1) \ ++ _LT_AC_TAGVAR(postdep_objects, $1) \ ++ _LT_AC_TAGVAR(predeps, $1) \ ++ _LT_AC_TAGVAR(postdeps, $1) \ ++ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ ++ _LT_AC_TAGVAR(archive_cmds, $1) \ ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ ++ _LT_AC_TAGVAR(postinstall_cmds, $1) \ ++ _LT_AC_TAGVAR(postuninstall_cmds, $1) \ ++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ ++ _LT_AC_TAGVAR(allow_undefined_flag, $1) \ ++ _LT_AC_TAGVAR(no_undefined_flag, $1) \ ++ _LT_AC_TAGVAR(export_symbols_cmds, $1) \ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ ++ _LT_AC_TAGVAR(hardcode_automatic, $1) \ ++ _LT_AC_TAGVAR(module_cmds, $1) \ ++ _LT_AC_TAGVAR(module_expsym_cmds, $1) \ ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ ++ _LT_AC_TAGVAR(exclude_expsyms, $1) \ ++ _LT_AC_TAGVAR(include_expsyms, $1); do + +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; ++ case $var in ++ _LT_AC_TAGVAR(old_archive_cmds, $1) | \ ++ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ ++ _LT_AC_TAGVAR(archive_cmds, $1) | \ ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ ++ _LT_AC_TAGVAR(module_cmds, $1) | \ ++ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ ++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ ++ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ ++ extract_expsyms_cmds | reload_cmds | finish_cmds | \ ++ postinstall_cmds | postuninstall_cmds | \ ++ old_postinstall_cmds | old_postuninstall_cmds | \ ++ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) ++ # Double-quote double-evaled strings. ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ++ ;; ++ *) ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" ++ ;; + esac +- ;; +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- # For security reasons, it is highly recommended that you always +- # use absolute paths for naming shared libraries, and exclude the +- # DT_RUNPATH tag from executables and libraries. But doing so +- # requires that you compile everything twice, which is a pain. +- # So that behaviour is only enabled if SCOABSPATH is set to a +- # non-empty value in the environment. Most likely only useful for +- # creating official distributions of packages. +- # This is a hack until libtool officially supports absolute path +- # names for shared libraries. +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' ++ done + +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- ;; +- tandem*) +- case $cc_basename in +- NCC*) +- # NonStop-UX NCC 3.20 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- vxworks*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ case $lt_echo in ++ *'\[$]0 --fallback-echo"') ++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` + ;; +-esac +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ esac + +-_LT_AC_TAGVAR(GCC, $1)="$GXX" +-_LT_AC_TAGVAR(LD, $1)="$LD" ++ifelse([$1], [], ++ [cfgfile="${ofile}T" ++ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 ++ $rm -f "$cfgfile" ++ AC_MSG_NOTICE([creating $ofile])], ++ [cfgfile="$ofile"]) + +-AC_LIBTOOL_POSTDEP_PREDEP($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++ cat <<__EOF__ >> "$cfgfile" ++ifelse([$1], [], ++[#! $SHELL + +-AC_LIBTOOL_CONFIG($1) ++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 ++# Free Software Foundation, Inc. ++# ++# This file is part of GNU Libtool: ++# Originally by Gordon Matzigkeit , 1996 ++# ++# 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 ++# 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. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. + +-AC_LANG_POP +-CC=$lt_save_CC +-LDCXX=$LD +-LD=$lt_save_LD +-GCC=$lt_save_GCC +-with_gnu_ldcxx=$with_gnu_ld +-with_gnu_ld=$lt_save_with_gnu_ld +-lt_cv_path_LDCXX=$lt_cv_path_LD +-lt_cv_path_LD=$lt_save_path_LD +-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +-])# AC_LIBTOOL_LANG_CXX_CONFIG ++# A sed program that does not truncate output. ++SED=$lt_SED + +-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) +-# ------------------------------------ +-# Figure out "hidden" library dependencies from verbose +-# compiler output when linking a shared library. +-# Parse the compiler output and extract the necessary +-# objects, libraries and library flags. +-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +-dnl we can't use the lt_simple_compile_test_code here, +-dnl because it contains code intended for an executable, +-dnl not a library. It's possible we should let each +-dnl tag define a new lt_????_link_test_code variable, +-dnl but it's only used here... +-ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext </dev/null 2>&1 && unset CDPATH + +- # The `*' in the case matches for architectures that use `case' in +- # $output_verbose_cmd can trigger glob expansion during the loop +- # eval without this substitution. +- output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` ++# The names of the tagged configurations supported by this script. ++available_tags= + +- for p in `eval $output_verbose_link_cmd`; do +- case $p in ++# ### BEGIN LIBTOOL CONFIG], ++[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) + +- -L* | -R* | -l*) +- # Some compilers place space between "-{L,R}" and the path. +- # Remove the space. +- if test $p = "-L" \ +- || test $p = "-R"; then +- prev=$p +- continue +- else +- prev= +- fi ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +- if test "$pre_test_object_deps_done" = no; then +- case $p in +- -L* | -R*) +- # Internal compiler library paths should come after those +- # provided the user. The postdeps already come after the +- # user supplied libs so there is no need to process them. +- if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then +- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" +- else +- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" +- fi +- ;; +- # The "-l" case would never come before the object being +- # linked, so don't bother handling this case. +- esac +- else +- if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then +- _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" +- else +- _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" +- fi +- fi +- ;; ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL + +- *.$objext) +- # This assumes that the test object file only shows up +- # once in the compiler output. +- if test "$p" = "conftest.$objext"; then +- pre_test_object_deps_done=yes +- continue +- fi ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared + +- if test "$pre_test_object_deps_done" = no; then +- if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then +- _LT_AC_TAGVAR(predep_objects, $1)="$p" +- else +- _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p" +- fi +- else +- if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then +- _LT_AC_TAGVAR(postdep_objects, $1)="$p" +- else +- _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p" +- fi +- fi +- ;; ++# Whether or not to build static libraries. ++build_old_libs=$enable_static + +- *) ;; # Ignore the rest. ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) + +- esac +- done ++# Whether or not to disallow shared libs when runtime libs are static ++allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) + +- # Clean up. +- rm -f a.out a.exe +-else +- echo "libtool.m4: error: problem compiling $1 test program" +-fi ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install + +-$rm -f confest.$objext ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os + +-# PORTME: override above test on systems where it is broken +-ifelse([$1],[CXX], +-[case $host_os in +-interix3*) +- # Interix 3.5 installs completely hosed .la files for C++, so rather than +- # hack all around it, let's just trust "g++" to DTRT. +- _LT_AC_TAGVAR(predep_objects,$1)= +- _LT_AC_TAGVAR(postdep_objects,$1)= +- _LT_AC_TAGVAR(postdeps,$1)= +- ;; ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os + +-solaris*) +- case $cc_basename in +- CC*) +- # Adding this requires a known-good setup of shared libraries for +- # Sun compiler versions before 5.6, else PIC objects from an old +- # archive will be linked into the output, leading to subtle bugs. +- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' +- ;; +- esac +- ;; +-esac +-]) ++# An echo program that does not interpret backslashes. ++echo=$lt_echo + +-case " $_LT_AC_TAGVAR(postdeps, $1) " in +-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; +-esac +-])# AC_LIBTOOL_POSTDEP_PREDEP ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS + +-# AC_LIBTOOL_LANG_F77_CONFIG +-# -------------------------- +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) +-AC_DEFUN([_LT_AC_LANG_F77_CONFIG], +-[AC_REQUIRE([AC_PROG_F77]) +-AC_LANG_PUSH(Fortran 77) ++# A C compiler. ++LTCC=$lt_LTCC + +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_AC_TAGVAR(allow_undefined_flag, $1)= +-_LT_AC_TAGVAR(always_export_symbols, $1)=no +-_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_direct, $1)=no +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no +-_LT_AC_TAGVAR(hardcode_automatic, $1)=no +-_LT_AC_TAGVAR(module_cmds, $1)= +-_LT_AC_TAGVAR(module_expsym_cmds, $1)= +-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_AC_TAGVAR(no_undefined_flag, $1)= +-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS + +-# Source file extension for f77 test sources. +-ac_ext=f ++# A language-specific compiler. ++CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) + +-# Object file extension for compiled f77 test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext ++# Is the compiler the GNU C compiler? ++with_gcc=$_LT_AC_TAGVAR(GCC, $1) + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code=" subroutine t\n return\n end\n" ++# An ERE matcher. ++EGREP=$lt_EGREP + +-# Code to be used in simple link tests +-lt_simple_link_test_code=" program t\n end\n" ++# The linker used to build libraries. ++LD=$lt_[]_LT_AC_TAGVAR(LD, $1) + +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER ++# Whether we need hard or soft links. ++LN_S=$lt_LN_S + +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE ++# A BSD-compatible nm program. ++NM=$lt_NM + +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${F77-"f77"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) ++# A symbol stripping program ++STRIP=$lt_STRIP + +-AC_MSG_CHECKING([if libtool supports shared libraries]) +-AC_MSG_RESULT([$can_build_shared]) ++# Used to examine libraries when file_magic_cmd begins "file" ++MAGIC_CMD=$MAGIC_CMD + +-AC_MSG_CHECKING([whether to build shared libraries]) +-test "$can_build_shared" = "no" && enable_shared=no ++# Used on cygwin: DLL creation program. ++DLLTOOL="$DLLTOOL" + +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case $host_os in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +-aix4* | aix5*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi +- ;; +-esac +-AC_MSG_RESULT([$enable_shared]) ++# Used on cygwin: object dumper. ++OBJDUMP="$OBJDUMP" + +-AC_MSG_CHECKING([whether to build static libraries]) +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-AC_MSG_RESULT([$enable_static]) ++# Used on cygwin: assembler. ++AS="$AS" + +-_LT_AC_TAGVAR(GCC, $1)="$G77" +-_LT_AC_TAGVAR(LD, $1)="$LD" ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir + +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds + +-AC_LIBTOOL_CONFIG($1) ++# How to pass a linker flag through the compiler. ++wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + +-AC_LANG_POP +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_F77_CONFIG ++# Object file suffix (normally "o"). ++objext="$ac_objext" + ++# Old archive suffix (normally "a"). ++libext="$libext" + +-# AC_LIBTOOL_LANG_GCJ_CONFIG +-# -------------------------- +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) +-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], +-[AC_LANG_SAVE ++# Shared library suffix (normally ".so"). ++shrext_cmds='$shrext_cmds' + +-# Source file extension for Java test sources. +-ac_ext=java ++# Executable file suffix (normally ""). ++exeext="$exeext" + +-# Object file extension for compiled Java test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext ++# Additional compiler flags for building library objects. ++pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++pic_mode=$pic_mode + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="class foo {}\n" ++# What is the maximum length of a command? ++max_cmd_len=$lt_cv_sys_max_cmd_len + +-# Code to be used in simple link tests +-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) + +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks + +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE ++# Do we need the lib prefix for modules? ++need_lib_prefix=$need_lib_prefix + +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${GCJ-"gcj"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) ++# Do we need a version for libraries? ++need_version=$need_version + +-# GCJ did not exist at the time GCC didn't implicitly link libc in. +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen + +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self + +-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static + +-AC_LIBTOOL_CONFIG($1) ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) + +-AC_LANG_RESTORE +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_GCJ_CONFIG ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) + ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) + +-# AC_LIBTOOL_LANG_RC_CONFIG +-# ------------------------- +-# Ensure that the configuration vars for the Windows resource compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) +-AC_DEFUN([_LT_AC_LANG_RC_CONFIG], +-[AC_LANG_SAVE ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) + +-# Source file extension for RC test sources. +-ac_ext=rc ++# Compiler flag to generate thread-safe objects. ++thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) + +-# Object file extension for compiled RC test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext ++# Library versioning type. ++version_type=$version_type + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' ++# Format of library name prefix. ++libname_spec=$lt_libname_spec + +-# Code to be used in simple link tests +-lt_simple_link_test_code="$lt_simple_compile_test_code" ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME. ++library_names_spec=$lt_library_names_spec + +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec + +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE ++# Commands used to build and install an old-style archive. ++RANLIB=$lt_RANLIB ++old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds + +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${RC-"windres"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) +-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) + +-AC_LIBTOOL_CONFIG($1) ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) + +-AC_LANG_RESTORE +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_RC_CONFIG ++# Commands used to build and install a shared archive. ++archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) ++archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) ++postinstall_cmds=$lt_postinstall_cmds ++postuninstall_cmds=$lt_postuninstall_cmds + ++# Commands used to build a loadable module (assumed same as above if empty) ++module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) ++module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) + +-# AC_LIBTOOL_CONFIG([TAGNAME]) +-# ---------------------------- +-# If TAGNAME is not passed, then create an initial libtool script +-# with a default configuration from the untagged config vars. Otherwise +-# add code to config.status for appending the configuration named by +-# TAGNAME from the matching tagged config vars. +-AC_DEFUN([AC_LIBTOOL_CONFIG], +-[# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # See if we are running on zsh, and set the options which allow our commands through +- # without removal of \ escapes. +- if test -n "${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- _LT_AC_TAGVAR(compiler, $1) \ +- _LT_AC_TAGVAR(CC, $1) \ +- _LT_AC_TAGVAR(LD, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ +- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ +- _LT_AC_TAGVAR(old_archive_cmds, $1) \ +- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ +- _LT_AC_TAGVAR(predep_objects, $1) \ +- _LT_AC_TAGVAR(postdep_objects, $1) \ +- _LT_AC_TAGVAR(predeps, $1) \ +- _LT_AC_TAGVAR(postdeps, $1) \ +- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ +- _LT_AC_TAGVAR(archive_cmds, $1) \ +- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ +- _LT_AC_TAGVAR(postinstall_cmds, $1) \ +- _LT_AC_TAGVAR(postuninstall_cmds, $1) \ +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ +- _LT_AC_TAGVAR(allow_undefined_flag, $1) \ +- _LT_AC_TAGVAR(no_undefined_flag, $1) \ +- _LT_AC_TAGVAR(export_symbols_cmds, $1) \ +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ +- _LT_AC_TAGVAR(hardcode_automatic, $1) \ +- _LT_AC_TAGVAR(module_cmds, $1) \ +- _LT_AC_TAGVAR(module_expsym_cmds, $1) \ +- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ +- _LT_AC_TAGVAR(exclude_expsyms, $1) \ +- _LT_AC_TAGVAR(include_expsyms, $1); do +- +- case $var in +- _LT_AC_TAGVAR(old_archive_cmds, $1) | \ +- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ +- _LT_AC_TAGVAR(archive_cmds, $1) | \ +- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ +- _LT_AC_TAGVAR(module_cmds, $1) | \ +- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ +- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done +- +- case $lt_echo in +- *'\[$]0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` +- ;; +- esac +- +-ifelse([$1], [], +- [cfgfile="${ofile}T" +- trap "$rm \"$cfgfile\"; exit 1" 1 2 15 +- $rm -f "$cfgfile" +- AC_MSG_NOTICE([creating $ofile])], +- [cfgfile="$ofile"]) +- +- cat <<__EOF__ >> "$cfgfile" +-ifelse([$1], [], +-[#! $SHELL +- +-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) +-# NOTE: Changes made to this file will be lost: look at ltmain.sh. +-# +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +-# Free Software Foundation, Inc. +-# +-# This file is part of GNU Libtool: +-# Originally by Gordon Matzigkeit , 1996 +-# +-# 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 +-# 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. +-# +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# A sed program that does not truncate output. +-SED=$lt_SED +- +-# Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="$SED -e 1s/^X//" +- +-# The HP-UX ksh and POSIX shell print the target directory to stdout +-# if CDPATH is set. +-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +- +-# The names of the tagged configurations supported by this script. +-available_tags= +- +-# ### BEGIN LIBTOOL CONFIG], +-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) +- +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +- +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared +- +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +- +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) +- +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os +- +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os +- +-# An echo program that does not interpret backslashes. +-echo=$lt_echo +- +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS +- +-# A C compiler. +-LTCC=$lt_LTCC +- +-# LTCC compiler flags. +-LTCFLAGS=$lt_LTCFLAGS +- +-# A language-specific compiler. +-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) +- +-# Is the compiler the GNU C compiler? +-with_gcc=$_LT_AC_TAGVAR(GCC, $1) +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# The linker used to build libraries. +-LD=$lt_[]_LT_AC_TAGVAR(LD, $1) +- +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S +- +-# A BSD-compatible nm program. +-NM=$lt_NM +- +-# A symbol stripping program +-STRIP=$lt_STRIP +- +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD +- +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" +- +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" +- +-# Used on cygwin: assembler. +-AS="$AS" +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# How to pass a linker flag through the compiler. +-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +- +-# Object file suffix (normally "o"). +-objext="$ac_objext" +- +-# Old archive suffix (normally "a"). +-libext="$libext" +- +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' +- +-# Executable file suffix (normally ""). +-exeext="$exeext" +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +-pic_mode=$pic_mode +- +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) +- +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks +- +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +- +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +- +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) +- +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) +- +-# Library versioning type. +-version_type=$version_type +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) +- +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) +-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) +-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) +- +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib + + # Dependencies to place before the objects being linked to create a + # shared library. +@@ -6170,7 +5602,7 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +-linux*) ++linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[[ABCDGIRSTW]]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +@@ -6443,7 +5875,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -6486,7 +5918,7 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -6529,7 +5961,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -6603,1477 +6035,2356 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac +- ;; +- vxworks*) +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; +- esac +- fi +-], +-[ +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ vxworks*) ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ esac ++ fi ++], ++[ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ ++ amigaos*) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ ++ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ ++ mingw* | pw32* | os2*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ ;; ++ ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; ++ ++ interix3*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ enable_shared=no ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ fi ++ ;; ++ ++ hpux*) ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ else ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ esac ++ ;; ++ ++ mingw* | pw32* | os2*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC (with -KPIC) is the default. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ newsos6) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ icc* | ecc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ccc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All Alpha code is PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ esac ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All OSF/1 code is PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ solaris*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++ esac ++ ;; ++ ++ sunos4*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec ;then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ unicos*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ ++ uts4*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ esac ++ fi ++]) ++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then ++ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], ++ _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), ++ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], ++ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in ++ "" | " "*) ;; ++ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++ esac], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++fi ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ++ ;; ++esac ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" ++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), ++ $lt_tmp_static_flag, ++ [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ++]) ++ ++ ++# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) ++# ------------------------------------ ++# See if the linker supports building shared libraries. ++AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], ++[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++ifelse([$1],[CXX],[ ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ case $host_os in ++ aix4* | aix5*) ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ fi ++ ;; ++ pw32*) ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++ ;; ++ cygwin* | mingw*) ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ linux* | k*bsd*-gnu) ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ esac ++],[ ++ runpath_var= ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)= ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= ++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=no ++ _LT_AC_TAGVAR(module_cmds, $1)= ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)= ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ # include_expsyms should be a list of space-separated symbols to be *always* ++ # included in the symbol list ++ _LT_AC_TAGVAR(include_expsyms, $1)= ++ # exclude_expsyms can be an extended regexp of symbols to exclude ++ # it will be wrapped by ` (' and `)$', so one must not match beginning or ++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++ # as well as any symbol that contains `d'. ++ _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" ++ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++ # platforms (ab)use it in PIC code, but their linkers get confused if ++ # the symbol is explicitly referenced. Since portable code cannot ++ # rely on this symbol name, it's probably fine to never include it in ++ # preloaded symbol tables. ++ extract_expsyms_cmds= ++ # Just being paranoid about ensuring that cc_basename is set. ++ _LT_CC_BASENAME([$compiler]) ++ case $host_os in ++ cygwin* | mingw* | pw32*) ++ # FIXME: the MSVC++ port hasn't been tested in a loooong time ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ if test "$GCC" != yes; then ++ with_gnu_ld=no ++ fi ++ ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; ++ openbsd*) ++ with_gnu_ld=no ++ ;; ++ esac ++ ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ if test "$with_gnu_ld" = yes; then ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ wlarc='${wl}' ++ ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>/dev/null` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ ++ # See if GNU ld supports shared libraries. ++ case $host_os in ++ aix3* | aix4* | aix5*) ++ # On AIX/PPC, the GNU linker is very broken ++ if test "$host_cpu" != ia64; then ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <&2 ++ ++*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++*** to be unable to reliably create shared libraries on AIX. ++*** Therefore, libtool is disabling shared libraries support. If you ++*** really care for shared libraries, you may want to modify your PATH ++*** so that a non-GNU linker is found, and then restart. ++ ++EOF ++ fi ++ ;; ++ ++ amigaos*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ ++ # Samuel A. Falvo II reports ++ # that the semantics of dynamic libraries on AmigaOS, at least up ++ # to version 4, is to share data among multiple programs linked ++ # with the same dynamic library. Since this doesn't match the ++ # behavior of shared libraries on other platforms, we can't use ++ # them. ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_AC_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' ++ ++ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ interix3*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ ++ linux* | k*bsd*-gnu) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ tmp_addflag= ++ case $cc_basename,$host_cpu in ++ pgcc*) # Portland Group C compiler ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++ if test $supports_anon_versioning = yes; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ $echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ wlarc= ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi ++ ;; ++ ++ solaris*) ++ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <&2 ++ ++*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++*** create shared libraries on Solaris systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.9.1 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++EOF ++ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ sunos4*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then ++ runpath_var= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ # Note: this linker hardcodes the directories in LIBPATH if there ++ # are no directories specified by -L. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ fi ++ ;; ++ ++ aix4* | aix5*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ fi ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ++ if test "$GCC" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ else ++ # We have old collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi + +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi + fi + ;; + + amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ # see comment about different semantics on the GNU ld section ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. ++ bsdi[[45]]*) ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + +- mingw* | pw32* | os2*) +- # This hack is so that the source file can tell whether it is being +- # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ cygwin* | mingw* | pw32*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ if test "$GCC" = yes ; then ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ else ++ case $cc_basename in ++ xlc*) ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ ;; ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi + ;; + +- interix3*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. ++ dgux*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ freebsd1*) ++ _LT_AC_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 ++ # extra space). ++ freebsd2.2*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | dragonfly*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ hpux9*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ ++ hpux10*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ fi + ;; + +- msdosdjgpp*) +- # Just because we use GCC doesn't mean we suddenly get shared libraries +- # on systems that don't support them. +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- enable_shared=no +- ;; ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac + fi + ;; + +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- else +- # PORTME Check for flag to pass linker flags through the system compiler. +- case $host_os in +- aix*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- ;; +- esac +- ;; + +- mingw* | pw32* | os2*) +- # This hack is so that the source file can tell whether it is being +- # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ newsos6) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- hpux9* | hpux10* | hpux11*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +- ;; +- esac +- # Is there a better lt_prog_compiler_static that works with the bundled CC? +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ openbsd*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ else ++ case $host_os in ++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + ;; + +- irix5* | irix6* | nonstopux*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # PIC (with -KPIC) is the default. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ os2*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + +- newsos6) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ osf3*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + +- linux*) +- case $cc_basename in +- icc* | ecc*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +- ;; +- pgcc* | pgf77* | pgf90* | pgf95*) +- # Portland Group compilers (*not* the Pentium gcc compiler, +- # which looks to be a dead project) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- ccc*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # All Alpha code is PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- esac +- ;; ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ else ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ ++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + +- osf3* | osf4* | osf5*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # All OSF/1 code is PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ # Both c and cxx compiler support -rpath directly ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + solaris*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- case $cc_basename in +- f77* | f90* | f95*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++ else ++ wlarc='' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++ # The compiler driver will combine linker options so we ++ # cannot just pass the convience library names through ++ # without $wl, iff we do not link with $LD. ++ # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ case $wlarc in ++ '') ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; ++ *) ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; ++ esac ;; + esac ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ if test "x$host_vendor" = xsequent; then ++ # Use $CC to link under sequent, because it throws in some extra .o ++ # files that make .init and .fini sections work. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- sysv4 | sysv4.2uw2* | sysv4.3*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ sysv4) ++ case $host_vendor in ++ sni) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++ ;; ++ siemens) ++ ## LD is ld it makes a PLAMLIB ++ ## CC just makes a GrossModule. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ ;; ++ motorola) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++ ;; ++ esac ++ runpath_var='LD_RUN_PATH' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ sysv4.3*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) +- if test -d /usr/nec ;then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ if test -d /usr/nec; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var=LD_RUN_PATH ++ hardcode_runpath_var=yes ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi + ;; + +- unicos*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi + ;; + + uts4*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + fi + ]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) ++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ ++# ++# Do we need to explicitly link libc? ++# ++case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in ++x|xyes) ++ # Assume -lc should be added ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $_LT_AC_TAGVAR(archive_cmds, $1) in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) ++ $rm conftest* ++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) ++ then ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ else ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ fi ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $rm conftest* ++ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) ++ ;; ++ esac ++ fi ++ ;; ++esac ++])# AC_LIBTOOL_PROG_LD_SHLIBS ++ ++ ++# _LT_AC_FILE_LTDLL_C ++# ------------------- ++# Be careful that the start marker always follows a newline. ++AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ ++# /* ltdll.c starts here */ ++# #define WIN32_LEAN_AND_MEAN ++# #include ++# #undef WIN32_LEAN_AND_MEAN ++# #include ++# ++# #ifndef __CYGWIN__ ++# # ifdef __CYGWIN32__ ++# # define __CYGWIN__ __CYGWIN32__ ++# # endif ++# #endif ++# ++# #ifdef __cplusplus ++# extern "C" { ++# #endif ++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); ++# #ifdef __cplusplus ++# } ++# #endif ++# ++# #ifdef __CYGWIN__ ++# #include ++# DECLARE_CYGWIN_DLL( DllMain ); ++# #endif ++# HINSTANCE __hDllInstance_base; ++# ++# BOOL APIENTRY ++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) ++# { ++# __hDllInstance_base = hInst; ++# return TRUE; ++# } ++# /* ltdll.c ends here */ ++])# _LT_AC_FILE_LTDLL_C ++ ++ ++# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) ++# --------------------------------- ++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++ ++ ++# old names ++AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) ++AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) ++AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++ ++# This is just to silence aclocal about the macro not being used ++ifelse([AC_DISABLE_FAST_INSTALL]) ++ ++AC_DEFUN([LT_AC_PROG_GCJ], ++[AC_CHECK_TOOL(GCJ, gcj, no) ++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++ AC_SUBST(GCJFLAGS) ++]) ++ ++AC_DEFUN([LT_AC_PROG_RC], ++[AC_CHECK_TOOL(RC, windres, no) ++]) ++ ++# NOTE: This macro has been submitted for inclusion into # ++# GNU Autoconf as AC_PROG_SED. When it is available in # ++# a released version of Autoconf we should remove this # ++# macro and use it instead. # ++# LT_AC_PROG_SED ++# -------------- ++# Check for a fully-functional sed program, that truncates ++# as few characters as possible. Prefer GNU sed if found. ++AC_DEFUN([LT_AC_PROG_SED], ++[AC_MSG_CHECKING([for a sed that does not truncate output]) ++AC_CACHE_VAL(lt_cv_path_SED, ++[# Loop through the user's path and test for sed and gsed. ++# Then use that list of sed's as ones to test for truncation. ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for lt_ac_prog in sed gsed; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then ++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" ++ fi ++ done ++ done ++done ++lt_ac_max=0 ++lt_ac_count=0 ++# Add /usr/xpg4/bin/sed as it is typically found on Solaris ++# along with /bin/sed that truncates output. ++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++ test ! -f $lt_ac_sed && continue ++ cat /dev/null > conftest.in ++ lt_ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++ # Check for GNU sed and select it if it is found. ++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++ lt_cv_path_SED=$lt_ac_sed ++ break ++ fi ++ while true; do ++ cat conftest.in conftest.in >conftest.tmp ++ mv conftest.tmp conftest.in ++ cp conftest.in conftest.nl ++ echo >>conftest.nl ++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++ cmp -s conftest.out conftest.nl || break ++ # 10000 chars as input seems more than enough ++ test $lt_ac_count -gt 10 && break ++ lt_ac_count=`expr $lt_ac_count + 1` ++ if test $lt_ac_count -gt $lt_ac_max; then ++ lt_ac_max=$lt_ac_count ++ lt_cv_path_SED=$lt_ac_sed ++ fi ++ done ++done ++]) ++SED=$lt_cv_path_SED ++AC_MSG_RESULT([$SED]) ++]) + ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant . ++# ++# 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. + # +-# Check to make sure the PIC flag actually works. ++# 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 ++# General Public License for more details. + # +-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then +- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), +- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], +- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in +- "" | " "*) ;; +- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; +- esac], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++# 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. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) + fi +-case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" +- ;; +-esac ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG + ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # +-# Check to make sure the static flag actually works. ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. + # +-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" +-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], +- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), +- $lt_tmp_static_flag, +- [], +- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +-]) ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) + + +-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) +-# ------------------------------------ +-# See if the linker supports building shared libraries. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], +-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-ifelse([$1],[CXX],[ +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- case $host_os in +- aix4* | aix5*) +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" + else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- fi +- ;; +- pw32*) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" +- ;; +- cygwin* | mingw*) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' +- ;; +- *) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; +- esac +-],[ +- runpath_var= +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)= +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +- _LT_AC_TAGVAR(hardcode_automatic, $1)=no +- _LT_AC_TAGVAR(module_cmds, $1)= +- _LT_AC_TAGVAR(module_expsym_cmds, $1)= +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- # include_expsyms should be a list of space-separated symbols to be *always* +- # included in the symbol list +- _LT_AC_TAGVAR(include_expsyms, $1)= +- # exclude_expsyms can be an extended regexp of symbols to exclude +- # it will be wrapped by ` (' and `)$', so one must not match beginning or +- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +- # as well as any symbol that contains `d'. +- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" +- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out +- # platforms (ab)use it in PIC code, but their linkers get confused if +- # the symbol is explicitly referenced. Since portable code cannot +- # rely on this symbol name, it's probably fine to never include it in +- # preloaded symbol tables. +- extract_expsyms_cmds= +- # Just being paranoid about ensuring that cc_basename is set. +- _LT_CC_BASENAME([$compiler]) +- case $host_os in +- cygwin* | mingw* | pw32*) +- # FIXME: the MSVC++ port hasn't been tested in a loooong time +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- if test "$GCC" != yes; then +- with_gnu_ld=no +- fi +- ;; +- interix*) +- # we just hope/assume this is gcc and not c89 (= MSVC++) +- with_gnu_ld=yes +- ;; +- openbsd*) +- with_gnu_ld=no +- ;; +- esac +- +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- if test "$with_gnu_ld" = yes; then +- # If archive_cmds runs LD, not CC, wlarc should be empty +- wlarc='${wl}' +- +- # Set some defaults for GNU ld with shared library support. These +- # are reset later if shared libraries are not supported. Putting them +- # here allows them to be overridden if necessary. +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) + fi +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac +- +- # See if GNU ld supports shared libraries. +- case $host_os in +- aix3* | aix4* | aix5*) +- # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <&2 +- +-*** Warning: the GNU linker, at least up to release 2.9.1, is reported +-*** to be unable to reliably create shared libraries on AIX. +-*** Therefore, libtool is disabling shared libraries support. If you +-*** really care for shared libraries, you may want to modify your PATH +-*** so that a non-GNU linker is found, and then restart. +- +-EOF +- fi +- ;; ++else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG + +- amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED + +- # Samuel A. Falvo II reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; + +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Joseph Beckenbach says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) ++# ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_AC_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' ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) + +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +- interix3*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- ;; ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) + +- linux*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- tmp_addflag= +- case $cc_basename,$host_cpu in +- pgcc*) # Portland Group C compiler +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag' +- ;; +- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag -Mnomain' ;; +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 +- tmp_addflag=' -i_dynamic' ;; +- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 +- tmp_addflag=' -i_dynamic -nofor_main' ;; +- ifc* | ifort*) # Intel Fortran compiler +- tmp_addflag=' -nofor_main' ;; +- esac +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + +- if test $supports_anon_versioning = yes; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ +- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +- $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- fi +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' +- wlarc= +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- fi +- ;; ++$$1_PKG_ERRORS + +- solaris*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <&2 ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + +-*** Warning: The releases 2.8.* of the GNU linker cannot reliably +-*** create shared libraries on Solaris systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.9.1 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. ++_PKG_TEXT ++])], ++ [AC_MSG_RESULT([no]) ++ $4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. + +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++_PKG_TEXT + +- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) +- case `$LD -v 2>&1` in +- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <<_LT_EOF 1>&2 ++To get pkg-config, see .])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES + +-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +-*** reliably create shared libraries on SCO systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. ++# Copyright (C) 2002, 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. + +-_LT_EOF +- ;; +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) + +- sunos4*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- wlarc= +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION so it can be traced. ++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++ [AM_AUTOMAKE_VERSION([1.9.6])]) + +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then +- runpath_var= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- else +- # PORTME fill in a description of your system's linker (not GNU ld) +- case $host_os in +- aix3*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' +- # Note: this linker hardcodes the directories in LIBPATH if there +- # are no directories specified by -L. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then +- # Neither direct hardcoding nor static linking is supported with a +- # broken collect2. +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- fi +- ;; ++# 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. ++ ++# 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/../..'. ++# ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. ++# ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir ++# ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. ++# ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. + +- aix4* | aix5*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- fi +- aix_use_runtimelinking=no ++AC_DEFUN([AM_AUX_DIR_EXPAND], ++[dnl Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50])dnl ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) + +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) +- for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi +- done +- ;; +- esac ++# AM_CONDITIONAL -*- Autoconf -*- + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 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. + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++# serial 7 + +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++# AM_CONDITIONAL(NAME, SHELL-CONDITION) ++# ------------------------------------- ++# Define a conditional. ++AC_DEFUN([AM_CONDITIONAL], ++[AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE]) ++AC_SUBST([$1_FALSE]) ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) ++fi])]) + +- if test "$GCC" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- fi +- ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi + +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 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. + +- amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- # see comment about different semantics on the GNU ld section +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++# serial 8 + +- bsdi[[45]]*) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic +- ;; ++# 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, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + +- cygwin* | mingw* | pw32*) +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' +- # FIXME: Should let the user specify the lib program. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' +- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- ;; + +- darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- if test "$GCC" = yes ; then +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- case $cc_basename in +- xlc*) +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- ;; +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +- ;; ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl ++ ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) + +- dgux*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # 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'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub + +- freebsd1*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +- # 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 +- # extra space). +- freebsd2.2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi + ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done + +- # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_$1_dependencies_compiler_type=none ++fi ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ++]) + +- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; + +- hpux9*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; + +- hpux10*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +- fi +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH]) ++]) + +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++# Generate code to set up dependency tracking. -*- Autoconf -*- + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- fi +- ;; ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 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. + +- hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- else +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- fi +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++#serial 3 + +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- *) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[for mf in $CONFIG_FILES; do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # So let's grep whole file. ++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++done ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- ;; +- esac +- fi +- ;; + +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. ++# ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# 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. + +- newsos6) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# serial 8 + +- openbsd*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- else +- case $host_os in +- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- ;; +- esac +- fi +- ;; ++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +- os2*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' +- ;; ++# Do all the work for Automake. -*- Autoconf -*- + +- osf3*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 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. + +- osf4* | osf5*) # as osf3* with the addition of -msym flag +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- else +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++# serial 12 + +- # Both c and cxx compiler support -rpath directly +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; ++# This macro actually does too much. Some checks are only needed if ++# your package does certain things. But this isn't really a big deal. + +- solaris*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' +- if test "$GCC" = yes; then +- wlarc='${wl}' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' +- else +- wlarc='' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. +- # Supported since Solaris 2.6 (maybe 2.5.1?) +- case $wlarc in +- '') +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; +- *) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; +- esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_PREREQ([2.58])dnl ++dnl Autoconf wants to disallow AM_ names. We explicitly allow ++dnl the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL])dnl ++# test to see if srcdir already configured ++if test "`cd $srcdir && pwd`" != "`pwd`" && ++ test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++fi + +- sunos4*) +- if test "x$host_vendor" = xsequent; then +- # Use $CC to link under sequent, because it throws in some extra .o +- # files that make .init and .fini sections work. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++AC_SUBST([CYGPATH_W]) + +- sysv4) +- case $host_vendor in +- sni) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? +- ;; +- siemens) +- ## LD is ld it makes a PLAMLIB +- ## CC just makes a GrossModule. +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- ;; +- motorola) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie +- ;; +- esac +- runpath_var='LD_RUN_PATH' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++ ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++ ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AM_PROG_INSTALL_SH ++AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++]) ++]) + +- sysv4.3*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' +- ;; + +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- fi +- ;; ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var='LD_RUN_PATH' ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $1 | $1:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; ++# 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. + +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++install_sh=${install_sh-"$am_aux_dir/install-sh"} ++AC_SUBST(install_sh)]) + +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; ++# Copyright (C) 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. + +- uts4*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# serial 2 + +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +-]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) + ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering ++ ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. + # +-# Do we need to explicitly link libc? +-# +-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in +-x|xyes) +- # Assume -lc should be added +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++# 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. + +- if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $_LT_AC_TAGVAR(archive_cmds, $1) in +- *'~'*) +- # FIXME: we may have to deal with multi-command sequences. +- ;; +- '$CC '*) +- # Test whether the compiler implicitly links with -lc since on some +- # systems, -lgcc has to come before -lc. If gcc already passes -lc +- # to ld, don't add -lc before -lgcc. +- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) +- $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++# serial 4 + +- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) +- then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- else +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- fi +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $rm conftest* +- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) +- ;; +- esac +- fi +- ;; +-esac +-])# AC_LIBTOOL_PROG_LD_SHLIBS ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) + ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +-# _LT_AC_FILE_LTDLL_C +-# ------------------- +-# Be careful that the start marker always follows a newline. +-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ +-# /* ltdll.c starts here */ +-# #define WIN32_LEAN_AND_MEAN +-# #include +-# #undef WIN32_LEAN_AND_MEAN +-# #include +-# +-# #ifndef __CYGWIN__ +-# # ifdef __CYGWIN32__ +-# # define __CYGWIN__ __CYGWIN32__ +-# # endif +-# #endif +-# +-# #ifdef __cplusplus +-# extern "C" { +-# #endif +-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); +-# #ifdef __cplusplus +-# } +-# #endif +-# +-# #ifdef __CYGWIN__ +-# #include +-# DECLARE_CYGWIN_DLL( DllMain ); +-# #endif +-# HINSTANCE __hDllInstance_base; ++# Check to see how 'make' treats includes. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. + # +-# BOOL APIENTRY +-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +-# { +-# __hDllInstance_base = hInst; +-# return TRUE; +-# } +-# /* ltdll.c ends here */ +-])# _LT_AC_FILE_LTDLL_C ++# 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 3 + +-# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +-# --------------------------------- +-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo done ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf ++]) + ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# old names +-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++# Copyright (C) 1997, 1999, 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. + +-# This is just to silence aclocal about the macro not being used +-ifelse([AC_DISABLE_FAST_INSTALL]) ++# serial 4 + +-AC_DEFUN([LT_AC_PROG_GCJ], +-[AC_CHECK_TOOL(GCJ, gcj, no) +- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" +- AC_SUBST(GCJFLAGS) +-]) ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) + +-AC_DEFUN([LT_AC_PROG_RC], +-[AC_CHECK_TOOL(RC, windres, no) +-]) + +-# NOTE: This macro has been submitted for inclusion into # +-# GNU Autoconf as AC_PROG_SED. When it is available in # +-# a released version of Autoconf we should remove this # +-# macro and use it instead. # +-# LT_AC_PROG_SED +-# -------------- +-# Check for a fully-functional sed program, that truncates +-# as few characters as possible. Prefer GNU sed if found. +-AC_DEFUN([LT_AC_PROG_SED], +-[AC_MSG_CHECKING([for a sed that does not truncate output]) +-AC_CACHE_VAL(lt_cv_path_SED, +-[# Loop through the user's path and test for sed and gsed. +-# Then use that list of sed's as ones to test for truncation. +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for lt_ac_prog in sed gsed; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then +- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" +- fi +- done +- done +-done +-lt_ac_max=0 +-lt_ac_count=0 +-# Add /usr/xpg4/bin/sed as it is typically found on Solaris +-# along with /bin/sed that truncates output. +-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- test ! -f $lt_ac_sed && continue +- cat /dev/null > conftest.in +- lt_ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >conftest.in +- # Check for GNU sed and select it if it is found. +- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then +- lt_cv_path_SED=$lt_ac_sed +- break +- fi +- while true; do +- cat conftest.in conftest.in >conftest.tmp +- mv conftest.tmp conftest.in +- cp conftest.in conftest.nl +- echo >>conftest.nl +- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break +- cmp -s conftest.out conftest.nl || break +- # 10000 chars as input seems more than enough +- test $lt_ac_count -gt 10 && break +- lt_ac_count=`expr $lt_ac_count + 1` +- if test $lt_ac_count -gt $lt_ac_max; then +- lt_ac_max=$lt_ac_count +- lt_cv_path_SED=$lt_ac_sed +- fi +- done +-done +-]) +-SED=$lt_cv_path_SED +-AC_MSG_RESULT([$SED]) ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) ++fi + ]) + +-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +-# +-# Copyright © 2004 Scott James Remnant . ++# Copyright (C) 2003, 2004, 2005 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 +-# the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. ++# 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. ++ ++# AM_PROG_MKDIR_P ++# --------------- ++# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. + # +-# 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 +-# General Public License for more details. ++# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories ++# created by `make install' are always world readable, even if the ++# installer happens to have an overly restrictive umask (e.g. 077). ++# This was a mistake. There are at least two reasons why we must not ++# use `-m 0755': ++# - it causes special bits like SGID to be ignored, ++# - it may be too restrictive (some setups expect 775 directories). + # +-# 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. ++# Do not use -m 0755 and let people choose whatever they expect by ++# setting umask. + # +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +-# ---------------------------------- +-AC_DEFUN([PKG_PROG_PKG_CONFIG], +-[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +-m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +- AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++# We cannot accept any implementation of `mkdir' that recognizes `-p'. ++# Some implementations (such as Solaris 8's) are not thread-safe: if a ++# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' ++# concurrently, both version can detect that a/ is missing, but only ++# one can create it and the other will error out. Consequently we ++# restrict ourselves to GNU make (using the --version option ensures ++# this.) ++AC_DEFUN([AM_PROG_MKDIR_P], ++[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then ++ # We used to keeping the `.' as first argument, in order to ++ # allow $(mkdir_p) to be used without argument. As in ++ # $(mkdir_p) $(somedir) ++ # where $(somedir) is conditionally defined. However this is wrong ++ # for two reasons: ++ # 1. if the package is installed by a user who cannot write `.' ++ # make install will fail, ++ # 2. the above comment should most certainly read ++ # $(mkdir_p) $(DESTDIR)$(somedir) ++ # so it does not work when $(somedir) is undefined and ++ # $(DESTDIR) is not. ++ # To support the latter case, we have to write ++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), ++ # so the `.' trick is pointless. ++ mkdir_p='mkdir -p --' ++else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ for d in ./-p ./--version; ++ do ++ test -d $d && rmdir $d ++ done ++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. ++ if test -f "$ac_aux_dir/mkinstalldirs"; then ++ mkdir_p='$(mkinstalldirs)' ++ else ++ mkdir_p='$(install_sh) -d' ++ fi + fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=m4_default([$1], [0.9.0]) +- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- PKG_CONFIG="" +- fi +- +-fi[]dnl +-])# PKG_PROG_PKG_CONFIG ++AC_SUBST([mkdir_p])]) + +-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +-# +-# Check to see whether a particular set of modules exists. Similar +-# to PKG_CHECK_MODULES(), but does not set variables or print errors. +-# ++# Helper functions for option handling. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. + # +-# Similar to PKG_CHECK_MODULES, make sure that the first instance of +-# this or PKG_CHECK_MODULES is called, or make sure to call +-# PKG_CHECK_EXISTS manually +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_EXISTS], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-if test -n "$PKG_CONFIG" && \ +- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then +- m4_ifval([$2], [$2], [:]) +-m4_ifvaln([$3], [else +- $3])dnl +-fi]) ++# 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 3 ++ ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_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)]) + +-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +-# --------------------------------------------- +-m4_define([_PKG_CONFIG], +-[if test -n "$PKG_CONFIG"; then +- if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- else +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- fi +-else +- pkg_failed=untried +-fi[]dnl +-])# _PKG_CONFIG ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +-# _PKG_SHORT_ERRORS_SUPPORTED +-# ----------------------------- +-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi[]dnl +-])# _PKG_SHORT_ERRORS_SUPPORTED ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + ++# Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +-# [ACTION-IF-NOT-FOUND]) +-# +-# +-# Note that if there is a possibility the first call to +-# PKG_CHECK_MODULES might not happen, you should be sure to include an +-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +-# ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. + # +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_MODULES], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++# 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. + +-pkg_failed=no +-AC_MSG_CHECKING([for $1]) ++# serial 4 + +-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then + +-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +-and $1[]_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details.]) ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi + +-if test $pkg_failed = yes; then +- _PKG_SHORT_ERRORS_SUPPORTED +- if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` +- else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) ++fi ++AC_MSG_RESULT(yes)]) + +- ifelse([$4], , [AC_MSG_ERROR(dnl +-[Package requirements ($2) were not met: ++# 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. + +-$$1_PKG_ERRORS ++# AM_PROG_INSTALL_STRIP ++# --------------------- ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. ++# Check how to create a tarball. -*- Autoconf -*- + +-_PKG_TEXT +-])], +- [$4]) +-elif test $pkg_failed = untried; then +- ifelse([$4], , [AC_MSG_FAILURE(dnl +-[The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. ++# Copyright (C) 2004, 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. + +-_PKG_TEXT ++# serial 2 + +-To get pkg-config, see .])], +- [$4]) +-else +- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS +- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS +- AC_MSG_RESULT([yes]) +- ifelse([$3], , :, [$3]) +-fi[]dnl +-])# PKG_CHECK_MODULES ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# 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]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac ++ ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break ++ ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir ++ ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR + +-m4_include([m4/d-type.m4]) +-m4_include([m4/gnome-doc-utils.m4]) +-m4_include([m4/gtk-doc.m4]) +-m4_include([m4/intltool.m4]) +diff -Nur gnome-panel-2.18.0/applets/clock/Makefile.in gnome-panel-2.18.0.new/applets/clock/Makefile.in +--- gnome-panel-2.18.0/applets/clock/Makefile.in 2007-03-12 20:06:11.000000000 +0100 ++++ gnome-panel-2.18.0.new/applets/clock/Makefile.in 2007-03-13 00:55:54.000000000 +0100 +@@ -42,10 +42,7 @@ + subdir = applets/clock + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/applets/fish/Makefile.in gnome-panel-2.18.0.new/applets/fish/Makefile.in +--- gnome-panel-2.18.0/applets/fish/Makefile.in 2007-03-12 20:06:12.000000000 +0100 ++++ gnome-panel-2.18.0.new/applets/fish/Makefile.in 2007-03-13 00:55:54.000000000 +0100 +@@ -42,10 +42,7 @@ + subdir = applets/fish + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -225,6 +222,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/applets/Makefile.in gnome-panel-2.18.0.new/applets/Makefile.in +--- gnome-panel-2.18.0/applets/Makefile.in 2007-03-12 20:06:10.000000000 +0100 ++++ gnome-panel-2.18.0.new/applets/Makefile.in 2007-03-13 00:55:53.000000000 +0100 +@@ -38,10 +38,7 @@ + subdir = applets + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -177,6 +174,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/applets/notification_area/Makefile.in gnome-panel-2.18.0.new/applets/notification_area/Makefile.in +--- gnome-panel-2.18.0/applets/notification_area/Makefile.in 2007-03-12 20:06:14.000000000 +0100 ++++ gnome-panel-2.18.0.new/applets/notification_area/Makefile.in 2007-03-13 00:55:55.000000000 +0100 +@@ -43,10 +43,7 @@ + subdir = applets/notification_area + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -246,6 +243,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/applets/wncklet/Makefile.in gnome-panel-2.18.0.new/applets/wncklet/Makefile.in +--- gnome-panel-2.18.0/applets/wncklet/Makefile.in 2007-03-12 20:06:16.000000000 +0100 ++++ gnome-panel-2.18.0.new/applets/wncklet/Makefile.in 2007-03-13 00:55:56.000000000 +0100 +@@ -42,10 +42,7 @@ + subdir = applets/wncklet + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -235,6 +232,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/config.h.in gnome-panel-2.18.0.new/config.h.in +--- gnome-panel-2.18.0/config.h.in 2007-03-12 20:05:52.000000000 +0100 ++++ gnome-panel-2.18.0.new/config.h.in 2007-03-13 00:55:52.000000000 +0100 +@@ -21,10 +21,6 @@ + /* Define to 1 if you have the `dcgettext' function. */ + #undef HAVE_DCGETTEXT + +-/* Define to 1 if you have the header file, and it defines `DIR'. +- */ +-#undef HAVE_DIRENT_H +- + /* Define to 1 if you have the header file. */ + #undef HAVE_DLFCN_H + +@@ -50,9 +46,6 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_MEMORY_H + +-/* Define to 1 if you have the header file, and it defines `DIR'. */ +-#undef HAVE_NDIR_H +- + /* Define to 1 if you have the `nl_langinfo' function. */ + #undef HAVE_NL_LANGINFO + +@@ -68,18 +61,6 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_STRING_H + +-/* Define if there is a member named d_type in the struct describing directory +- headers. */ +-#undef HAVE_STRUCT_DIRENT_D_TYPE +- +-/* Define to 1 if you have the header file, and it defines `DIR'. +- */ +-#undef HAVE_SYS_DIR_H +- +-/* Define to 1 if you have the header file, and it defines `DIR'. +- */ +-#undef HAVE_SYS_NDIR_H +- + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_STAT_H + +diff -Nur gnome-panel-2.18.0/config.h.in~ gnome-panel-2.18.0.new/config.h.in~ +--- gnome-panel-2.18.0/config.h.in~ 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.18.0.new/config.h.in~ 2007-03-12 20:05:52.000000000 +0100 +@@ -0,0 +1,126 @@ ++/* config.h.in. Generated from configure.in by autoheader. */ ++ ++/* Defined when compiling the clock applet in-process */ ++#undef CLOCK_INPROCESS ++ ++/* always defined to indicate that i18n is enabled */ ++#undef ENABLE_NLS ++ ++/* Defined when compiling the fish applet in-process */ ++#undef FISH_INPROCESS ++ ++/* Define the gettext package to be used */ ++#undef GETTEXT_PACKAGE ++ ++/* Define to 1 if you have the `bind_textdomain_codeset' function. */ ++#undef HAVE_BIND_TEXTDOMAIN_CODESET ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_CRT_EXTERNS_H ++ ++/* Define to 1 if you have the `dcgettext' function. */ ++#undef HAVE_DCGETTEXT ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#undef HAVE_DIRENT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_DLFCN_H ++ ++/* Define if the GNU gettext() function is already present or preinstalled. */ ++#undef HAVE_GETTEXT ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LANGINFO_H ++ ++/* Define if your file defines LC_MESSAGES. */ ++#undef HAVE_LC_MESSAGES ++ ++/* Defined when evolution-data-server libecal-1.2 and libedataserverui-1.2 are ++ detected */ ++#undef HAVE_LIBECAL ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LOCALE_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MEMORY_H ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. */ ++#undef HAVE_NDIR_H ++ ++/* Define to 1 if you have the `nl_langinfo' function. */ ++#undef HAVE_NL_LANGINFO ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDLIB_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRING_H ++ ++/* Define if there is a member named d_type in the struct describing directory ++ headers. */ ++#undef HAVE_STRUCT_DIRENT_D_TYPE ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#undef HAVE_SYS_DIR_H ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#undef HAVE_SYS_NDIR_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H ++ ++/* Define to 1 if you have the `_NSGetEnviron' function. */ ++#undef HAVE__NSGETENVIRON ++ ++/* Defined when compiling the notification-area applet in-process */ ++#undef NOTIFICATION_AREA_INPROCESS ++ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS ++ ++/* Version number of package */ ++#undef VERSION ++ ++/* Defined when compiling the wncklet applet in-process */ ++#undef WNCKLET_INPROCESS ++ ++/* Define to 1 if the X Window System is missing or not being used. */ ++#undef X_DISPLAY_MISSING +diff -Nur gnome-panel-2.18.0/configure gnome-panel-2.18.0.new/configure +--- gnome-panel-2.18.0/configure 2007-03-12 20:05:47.000000000 +0100 ++++ gnome-panel-2.18.0.new/configure 2007-03-13 00:55:48.000000000 +0100 +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.60 for gnome-panel 2.18.0. ++# Generated by GNU Autoconf 2.61 for gnome-panel 2.18.0. + # + # Report bugs to . + # +@@ -12,7 +12,8 @@ + ## M4sh Initialization. ## + ## --------------------- ## + +-# Be Bourne compatible ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -21,10 +22,13 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ ++ + + + # PATH needs CR +@@ -217,7 +221,7 @@ + else + as_candidate_shells= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +@@ -235,7 +239,6 @@ + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +-# Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -244,10 +247,12 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ + + : + _ASEOF +@@ -255,7 +260,6 @@ + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +-# Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -264,10 +268,12 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ + + : + (as_func_return () { +@@ -514,19 +520,28 @@ + as_mkdir_p=false + fi + +-# Find out whether ``test -x'' works. Don't use a zero-byte file, as +-# systems may use methods other than mode bits to determine executability. +-cat >conf$$.file <<_ASEOF +-#! /bin/sh +-exit 0 +-_ASEOF +-chmod +x conf$$.file +-if test -x conf$$.file >/dev/null 2>&1; then +- as_executable_p="test -x" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' + else +- as_executable_p=: ++ 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 +-rm -f conf$$.file ++as_executable_p=$as_test_x + + # 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'" +@@ -720,36 +735,36 @@ + # Factoring default headers for most tests. + ac_includes_default="\ + #include +-#if HAVE_SYS_TYPES_H ++#ifdef HAVE_SYS_TYPES_H + # include + #endif +-#if HAVE_SYS_STAT_H ++#ifdef HAVE_SYS_STAT_H + # include + #endif +-#if STDC_HEADERS ++#ifdef STDC_HEADERS + # include + # include + #else +-# if HAVE_STDLIB_H ++# ifdef HAVE_STDLIB_H + # include + # endif + #endif +-#if HAVE_STRING_H +-# if !STDC_HEADERS && HAVE_MEMORY_H ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H + # include + # endif + # include + #endif +-#if HAVE_STRINGS_H ++#ifdef HAVE_STRINGS_H + # include + #endif +-#if HAVE_INTTYPES_H ++#ifdef HAVE_INTTYPES_H + # include + #endif +-#if HAVE_STDINT_H ++#ifdef HAVE_STDINT_H + # include + #endif +-#if HAVE_UNISTD_H ++#ifdef HAVE_UNISTD_H + # include + #endif" + +@@ -926,6 +941,7 @@ + GETTEXT_PACKAGE + USE_NLS + MSGFMT ++MSGFMT_OPTS + GMSGFMT + XGETTEXT + CATALOGS +@@ -966,6 +982,7 @@ + CC + CFLAGS + LDFLAGS ++LIBS + CPPFLAGS + CPP + CXX +@@ -1091,10 +1108,10 @@ + -disable-* | --disable-*) + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) +@@ -1110,10 +1127,10 @@ + -enable-* | --enable-*) + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ +@@ -1307,19 +1324,19 @@ + -with-* | --with-*) + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package| sed 's/-/_/g'` ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; + + -without-* | --without-*) + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/-/_/g'` ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; + + --x) +@@ -1614,6 +1631,7 @@ + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory ++ LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor +@@ -1706,7 +1724,7 @@ + if $ac_init_version; then + cat <<\_ACEOF + gnome-panel configure 2.18.0 +-generated by GNU Autoconf 2.60 ++generated by GNU Autoconf 2.61 + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +@@ -1720,7 +1738,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by gnome-panel $as_me 2.18.0, which was +-generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + $ $0 $@ + +@@ -2142,7 +2160,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_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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. +@@ -2308,7 +2326,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2443,7 +2461,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2483,7 +2501,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2538,14 +2556,6 @@ + + + +-case m4 in +- [\\/]* | ?:[\\/]* ) ac_macro_dir=m4 ;; +- *) ac_macro_dir=$srcdir/m4 ;; +-esac +-test -d "$ac_macro_dir" || +- { { echo "$as_me:$LINENO: error: cannot find macro directory \`m4'" >&5 +-echo "$as_me: error: cannot find macro directory \`m4'" >&2;} +- { (exit 1); exit 1; }; } + + + +@@ -2597,7 +2607,7 @@ + + + if test $USE_MAINTAINER_MODE = yes; then +- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED" ++ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED" + else + DISABLE_DEPRECATED="" + fi +@@ -2691,7 +2701,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2731,7 +2741,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2788,7 +2798,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2829,7 +2839,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -2887,7 +2897,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2931,7 +2941,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3072,7 +3082,7 @@ + # in a Makefile. We should not override ac_cv_exeext if it was cached, + # so that the user can short-circuit this test for compilers unknown to + # Autoconf. +-for ac_file in $ac_files ++for ac_file in $ac_files '' + do + test -f "$ac_file" || continue + case $ac_file in +@@ -3100,6 +3110,12 @@ + test "$ac_cv_exeext" = no && ac_cv_exeext= + + else ++ ac_file='' ++fi ++ ++{ echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6; } ++if test -z "$ac_file"; then + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +@@ -3111,8 +3127,6 @@ + fi + + ac_exeext=$ac_cv_exeext +-{ echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6; } + + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +@@ -3290,27 +3304,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -3365,27 +3362,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -3420,27 +3400,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -3476,27 +3439,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -3612,27 +3558,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 +@@ -3870,7 +3799,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3933,7 +3862,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3974,7 +3903,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4015,7 +3944,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4056,7 +3985,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4115,27 +4044,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + DATADIRNAME=share + else + echo "$as_me: failed program was:" >&5 +@@ -4206,27 +4119,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_bind_textdomain_codeset=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4235,7 +4132,7 @@ + ac_cv_func_bind_textdomain_codeset=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +@@ -4253,7 +4150,7 @@ + esac + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + +@@ -4314,27 +4211,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_search_strerror=$ac_res + else + echo "$as_me: failed program was:" >&5 +@@ -4343,7 +4224,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then + break +@@ -4387,7 +4268,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4427,7 +4308,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4484,7 +4365,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4525,7 +4406,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -4583,7 +4464,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4627,7 +4508,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4747,27 +4628,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4822,27 +4686,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4877,27 +4724,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -4933,27 +4763,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -5069,27 +4882,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 +@@ -5287,17 +5083,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -5331,17 +5120,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -5406,17 +5188,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -5450,17 +5225,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -5515,7 +5283,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_executable_p "$ac_path_GREP"; } || continue ++ { test -f "$ac_path_GREP" && $as_test_x "$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 +@@ -5597,7 +5365,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_executable_p "$ac_path_EGREP"; } || continue ++ { test -f "$ac_path_EGREP" && $as_test_x "$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 +@@ -5693,27 +5461,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -6308,7 +6059,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu | dragonfly*) ++freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) +@@ -6362,11 +6113,11 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-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 +@@ -6482,7 +6233,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6485 "configure"' > conftest.$ac_ext ++ echo '#line 6236 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -6606,27 +6357,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + lt_cv_cc_needs_belf=yes + else + echo "$as_me: failed program was:" >&5 +@@ -6635,7 +6370,7 @@ + lt_cv_cc_needs_belf=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -6689,7 +6424,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6729,7 +6464,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6785,7 +6520,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS="${ac_tool_prefix}as" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6825,7 +6560,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AS="as" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6881,7 +6616,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6921,7 +6656,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7009,27 +6744,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -7092,27 +6810,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7148,17 +6849,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7250,7 +6944,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7294,7 +6988,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7407,27 +7101,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7482,27 +7159,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7537,27 +7197,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -7593,27 +7236,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7816,17 +7442,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -7860,17 +7479,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -7935,17 +7547,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -7979,17 +7584,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -8030,7 +7628,7 @@ + ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_f77_compiler_gnu + if test -n "$ac_tool_prefix"; then +- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +@@ -8048,7 +7646,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_F77="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8074,7 +7672,7 @@ + fi + if test -z "$F77"; then + ac_ct_F77=$F77 +- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -8092,7 +7690,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_F77="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8199,27 +7797,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -8262,27 +7843,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_f77_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -8480,7 +8044,7 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +-linux*) ++linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[ABCDGIRSTW]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +@@ -8737,7 +8301,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8777,7 +8341,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8833,7 +8397,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8873,7 +8437,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8929,7 +8493,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8969,7 +8533,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9286,11 +8850,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9289: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8853: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9293: \$? = $ac_status" >&5 ++ echo "$as_me:8857: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9448,7 +9012,7 @@ + lt_prog_compiler_static='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl='-Wl,' +@@ -9554,11 +9118,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9557: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9121: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9561: \$? = $ac_status" >&5 ++ echo "$as_me:9125: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9658,11 +9222,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9661: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9225: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9665: \$? = $ac_status" >&5 ++ echo "$as_me:9229: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -9887,7 +9451,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -9913,12 +9477,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs=no + else + ld_shlibs=no + 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= +@@ -10138,27 +9703,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -10172,7 +9721,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -10213,27 +9762,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -10247,7 +9780,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -10378,7 +9911,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes +@@ -10480,7 +10013,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 +@@ -10970,18 +10503,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-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='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -11137,7 +10658,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -11151,31 +10672,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 11158 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $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 +@@ -11187,7 +10687,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -11196,7 +10696,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -11516,27 +11016,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11545,7 +11029,7 @@ + ac_cv_lib_dl_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -11627,27 +11111,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_shl_load=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11656,7 +11124,7 @@ + ac_cv_func_shl_load=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +@@ -11706,27 +11174,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dld_shl_load=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11735,7 +11187,7 @@ + ac_cv_lib_dld_shl_load=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -11807,27 +11259,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11836,7 +11272,7 @@ + ac_cv_func_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +@@ -11886,27 +11322,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11915,7 +11335,7 @@ + ac_cv_lib_dl_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -11966,27 +11386,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_svld_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11995,7 +11399,7 @@ + ac_cv_lib_svld_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -12046,27 +11450,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dld_dld_link=yes + else + echo "$as_me: failed program was:" >&5 +@@ -12075,7 +11463,7 @@ + ac_cv_lib_dld_dld_link=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -12131,7 +11519,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -13352,7 +12724,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -13394,27 +12766,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -13428,7 +12784,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -13576,7 +12932,7 @@ + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes +@@ -13735,7 +13091,7 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -13837,7 +13193,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -14404,7 +13760,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -14447,7 +13803,7 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -14490,7 +13846,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -14599,11 +13955,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14602: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13958: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14606: \$? = $ac_status" >&5 ++ echo "$as_me:13962: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -14703,11 +14059,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14706: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14062: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14710: \$? = $ac_status" >&5 ++ echo "$as_me:14066: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -14775,6 +14131,9 @@ + cygwin* | mingw*) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs_CXX=no ++ ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -15054,18 +14413,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-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='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -15221,7 +14568,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -15235,31 +14582,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 15242 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $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 +@@ -15271,7 +14597,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -15280,7 +14606,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -16188,7 +15514,7 @@ + lt_prog_compiler_static_F77='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_F77='-Wl,' +@@ -16294,11 +15620,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16297: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15623: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16301: \$? = $ac_status" >&5 ++ echo "$as_me:15627: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16398,11 +15724,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16401: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15727: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16405: \$? = $ac_status" >&5 ++ echo "$as_me:15731: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16627,7 +15953,7 @@ + archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -16653,12 +15979,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_F77=no + else + ld_shlibs_F77=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -16868,27 +16195,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -16902,7 +16213,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -16933,27 +16244,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -16967,7 +16262,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -17098,7 +16393,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes +@@ -17200,7 +16495,7 @@ + link_all_deplibs_F77=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -17690,18 +16985,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-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='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -17857,7 +17140,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -17871,31 +17154,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 17878 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $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 +@@ -17907,7 +17169,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -17916,7 +17178,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -18649,11 +17911,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18652: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17914: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18656: \$? = $ac_status" >&5 ++ echo "$as_me:17918: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -18811,7 +18073,7 @@ + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -18917,11 +18179,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18920: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18182: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18924: \$? = $ac_status" >&5 ++ echo "$as_me:18186: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -19021,11 +18283,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:19024: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18286: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:19028: \$? = $ac_status" >&5 ++ echo "$as_me:18290: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -19250,7 +18512,7 @@ + archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -19276,12 +18538,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -19501,27 +18764,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -19535,7 +18782,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -19576,27 +18823,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -19610,7 +18841,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -19741,7 +18972,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes +@@ -19843,7 +19074,7 @@ + link_all_deplibs_GCJ=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -20333,18 +19564,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-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='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -20500,7 +19719,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -20514,31 +19733,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 20521 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $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 +@@ -20550,7 +19748,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -20559,7 +19757,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -21755,7 +20953,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -21795,7 +20993,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -21882,27 +21080,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + has_option=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22020,27 +21201,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22076,17 +21240,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22217,27 +21374,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -22246,7 +21387,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -22303,7 +21444,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -22346,7 +21487,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -22411,12 +21552,12 @@ + pkg_cv_PANEL_CFLAGS="$PANEL_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED lpint-bonobo launchpad-integration libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_PANEL_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` ++ pkg_cv_PANEL_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22429,12 +21570,12 @@ + pkg_cv_PANEL_LIBS="$PANEL_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED lpint-bonobo launchpad-integration libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` ++ pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22453,14 +21594,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` ++ PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` + else +- PANEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` ++ PANEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$PANEL_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: + + $PANEL_PKG_ERRORS + +@@ -22471,7 +21612,7 @@ + and PANEL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: + + $PANEL_PKG_ERRORS + +@@ -22639,12 +21780,12 @@ + pkg_cv_WNCKLET_CFLAGS="$WNCKLET_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_WNCKLET_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null` ++ pkg_cv_WNCKLET_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22657,12 +21798,12 @@ + pkg_cv_WNCKLET_LIBS="$WNCKLET_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_WNCKLET_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null` ++ pkg_cv_WNCKLET_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22681,14 +21822,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- WNCKLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"` ++ WNCKLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"` + else +- WNCKLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"` ++ WNCKLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$WNCKLET_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met: + + $WNCKLET_PKG_ERRORS + +@@ -22699,7 +21840,7 @@ + and WNCKLET_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met: + + $WNCKLET_PKG_ERRORS + +@@ -22782,27 +21923,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22838,17 +21962,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22979,27 +22096,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -23008,7 +22109,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -23400,544 +22501,154 @@ + + + # For the run dialog ++gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE ++ ++ ++# ++# If Pango included the shared library dependencies from X11 in ++# the pkg-config output, then we use that (to avoid duplicates). ++# but if they were omitted to avoid binary compatibility problems ++# then we need to repeat the checks. ++# ++if $PKG_CONFIG --exists pangoxft ; then ++ PANGO_PACKAGES="pangox pangoxft" ++else ++ PANGO_PACKAGES="pangox" ++fi + ++x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`" ++case x_libs in ++ *-lX11*) pango_omitted_x_deps=no ;; ++ *) pango_omitted_x_deps=yes ;; ++esac + ++if test $pango_omitted_x_deps = yes ; then ++ { echo "$as_me:$LINENO: checking for X" >&5 ++echo $ECHO_N "checking for X... $ECHO_C" >&6; } + + ++# Check whether --with-x was given. ++if test "${with_x+set}" = set; then ++ withval=$with_x; ++fi + +-ac_header_dirent=no +-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do +- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++# $have_x is `yes', `no', `disabled', or empty when we do not yet know. ++if test "x$with_x" = xno; then ++ # The user explicitly disabled X. ++ have_x=disabled ++else ++ case $x_includes,$x_libraries in #( ++ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 ++echo "$as_me: error: Cannot use X directory names containing '" >&2;} ++ { (exit 1); exit 1; }; };; #( ++ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ # One or both of the vars are not set, and there is no cached value. ++ac_x_includes=no ac_x_libraries=no ++rm -f -r conftest.dir ++if mkdir conftest.dir; then ++ cd conftest.dir ++ cat >Imakefile <<'_ACEOF' ++incroot: ++ @echo incroot='${INCROOT}' ++usrlibdir: ++ @echo usrlibdir='${USRLIBDIR}' ++libdir: ++ @echo libdir='${LIBDIR}' ++_ACEOF ++ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then ++ # GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++ for ac_var in incroot usrlibdir libdir; do ++ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" ++ done ++ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. ++ for ac_extension in a so sl; do ++ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && ++ test -f "$ac_im_libdir/libX11.$ac_extension"; then ++ ac_im_usrlibdir=$ac_im_libdir; break ++ fi ++ done ++ # Screen out bogus values from the imake configuration. They are ++ # bogus both because they are the default anyway, and because ++ # using them would break gcc on systems where it needs fixed includes. ++ case $ac_im_incroot in ++ /usr/include) ac_x_includes= ;; ++ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; ++ esac ++ case $ac_im_usrlibdir in ++ /usr/lib | /lib) ;; ++ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; ++ esac ++ fi ++ cd .. ++ rm -f -r conftest.dir ++fi ++ ++# Standard set of common directories for X headers. ++# Check X11 before X11Rn because it is often a symlink to the current release. ++ac_x_header_dirs=' ++/usr/X11/include ++/usr/X11R6/include ++/usr/X11R5/include ++/usr/X11R4/include ++ ++/usr/include/X11 ++/usr/include/X11R6 ++/usr/include/X11R5 ++/usr/include/X11R4 ++ ++/usr/local/X11/include ++/usr/local/X11R6/include ++/usr/local/X11R5/include ++/usr/local/X11R4/include ++ ++/usr/local/include/X11 ++/usr/local/include/X11R6 ++/usr/local/include/X11R5 ++/usr/local/include/X11R4 ++ ++/usr/X386/include ++/usr/x386/include ++/usr/XFree86/include/X11 ++ ++/usr/include ++/usr/local/include ++/usr/unsupported/include ++/usr/athena/include ++/usr/local/x11r5/include ++/usr/lpp/Xamples/include ++ ++/usr/openwin/include ++/usr/openwin/share/include' ++ ++if test "$ac_x_includes" = no; then ++ # Guess where to find include files, by looking for Xlib.h. ++ # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include +-#include <$ac_hdr> +- +-int +-main () +-{ +-if ((DIR *) 0) +-return 0; +- ; +- return 0; +-} ++#include + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" ++if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "$as_ac_Header=yes" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +-_ACEOF +- +-ac_header_dirent=$ac_hdr; break +-fi +- +-done +-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +-if test $ac_header_dirent = dirent.h; then +- { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } +-if test "${ac_cv_search_opendir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char opendir (); +-int +-main () +-{ +-return opendir (); +- ; +- return 0; +-} +-_ACEOF +-for ac_lib in '' dir; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_search_opendir=$ac_res +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext +- if test "${ac_cv_search_opendir+set}" = set; then +- break +-fi +-done +-if test "${ac_cv_search_opendir+set}" = set; then +- : +-else +- ac_cv_search_opendir=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +-echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +-ac_res=$ac_cv_search_opendir +-if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +- +-fi +- +-else +- { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } +-if test "${ac_cv_search_opendir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char opendir (); +-int +-main () +-{ +-return opendir (); +- ; +- return 0; +-} +-_ACEOF +-for ac_lib in '' x; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_search_opendir=$ac_res +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext +- if test "${ac_cv_search_opendir+set}" = set; then +- break +-fi +-done +-if test "${ac_cv_search_opendir+set}" = set; then +- : +-else +- ac_cv_search_opendir=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +-echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +-ac_res=$ac_cv_search_opendir +-if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +- +-fi +- +-fi +- +- { echo "$as_me:$LINENO: checking for d_type member in directory struct" >&5 +-echo $ECHO_N "checking for d_type member in directory struct... $ECHO_C" >&6; } +-if test "${jm_cv_struct_dirent_d_type+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include +-#ifdef HAVE_DIRENT_H +-# include +-#else /* not HAVE_DIRENT_H */ +-# define dirent direct +-# ifdef HAVE_SYS_NDIR_H +-# include +-# endif /* HAVE_SYS_NDIR_H */ +-# ifdef HAVE_SYS_DIR_H +-# include +-# endif /* HAVE_SYS_DIR_H */ +-# ifdef HAVE_NDIR_H +-# include +-# endif /* HAVE_NDIR_H */ +-#endif /* HAVE_DIRENT_H */ +- +-int +-main () +-{ +-struct dirent dp; dp.d_type = 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- jm_cv_struct_dirent_d_type=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- jm_cv_struct_dirent_d_type=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- +- +-fi +-{ echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_type" >&5 +-echo "${ECHO_T}$jm_cv_struct_dirent_d_type" >&6; } +- if test $jm_cv_struct_dirent_d_type = yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_DIRENT_D_TYPE 1 +-_ACEOF +- +- fi +- +- +- +- +-# +-# If Pango included the shared library dependencies from X11 in +-# the pkg-config output, then we use that (to avoid duplicates). +-# but if they were omitted to avoid binary compatibility problems +-# then we need to repeat the checks. +-# +-if $PKG_CONFIG --exists pangoxft ; then +- PANGO_PACKAGES="pangox pangoxft" +-else +- PANGO_PACKAGES="pangox" +-fi +- +-x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`" +-case x_libs in +- *-lX11*) pango_omitted_x_deps=no ;; +- *) pango_omitted_x_deps=yes ;; +-esac +- +-if test $pango_omitted_x_deps = yes ; then +- { echo "$as_me:$LINENO: checking for X" >&5 +-echo $ECHO_N "checking for X... $ECHO_C" >&6; } +- +- +-# Check whether --with-x was given. +-if test "${with_x+set}" = set; then +- withval=$with_x; +-fi +- +-# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +-if test "x$with_x" = xno; then +- # The user explicitly disabled X. +- have_x=disabled +-else +- case $x_includes,$x_libraries in #( +- *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 +-echo "$as_me: error: Cannot use X directory names containing '" >&2;} +- { (exit 1); exit 1; }; };; #( +- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- # One or both of the vars are not set, and there is no cached value. +-ac_x_includes=no ac_x_libraries=no +-rm -f -r conftest.dir +-if mkdir conftest.dir; then +- cd conftest.dir +- cat >Imakefile <<'_ACEOF' +-incroot: +- @echo incroot='${INCROOT}' +-usrlibdir: +- @echo usrlibdir='${USRLIBDIR}' +-libdir: +- @echo libdir='${LIBDIR}' +-_ACEOF +- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then +- # GNU make sometimes prints "make[1]: Entering...", which would confuse us. +- for ac_var in incroot usrlibdir libdir; do +- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" +- done +- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. +- for ac_extension in a so sl; do +- if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && +- test -f "$ac_im_libdir/libX11.$ac_extension"; then +- ac_im_usrlibdir=$ac_im_libdir; break +- fi +- done +- # Screen out bogus values from the imake configuration. They are +- # bogus both because they are the default anyway, and because +- # using them would break gcc on systems where it needs fixed includes. +- case $ac_im_incroot in +- /usr/include) ac_x_includes= ;; +- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; +- esac +- case $ac_im_usrlibdir in +- /usr/lib | /lib) ;; +- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; +- esac +- fi +- cd .. +- rm -f -r conftest.dir +-fi +- +-# Standard set of common directories for X headers. +-# Check X11 before X11Rn because it is often a symlink to the current release. +-ac_x_header_dirs=' +-/usr/X11/include +-/usr/X11R6/include +-/usr/X11R5/include +-/usr/X11R4/include +- +-/usr/include/X11 +-/usr/include/X11R6 +-/usr/include/X11R5 +-/usr/include/X11R4 +- +-/usr/local/X11/include +-/usr/local/X11R6/include +-/usr/local/X11R5/include +-/usr/local/X11R4/include +- +-/usr/local/include/X11 +-/usr/local/include/X11R6 +-/usr/local/include/X11R5 +-/usr/local/include/X11R4 +- +-/usr/X386/include +-/usr/x386/include +-/usr/XFree86/include/X11 +- +-/usr/include +-/usr/local/include +-/usr/unsupported/include +-/usr/athena/include +-/usr/local/x11r5/include +-/usr/lpp/Xamples/include +- +-/usr/openwin/include +-/usr/openwin/share/include' +- +-if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Xlib.h. +- # First, try using that file with no special directory specified. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # We can compile using X headers with no special include directory. + ac_x_includes= + else +@@ -23960,7 +22671,7 @@ + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS +- LIBS="-lXt $LIBS" ++ LIBS="-lX11 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23989,27 +22700,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + ac_x_libraries= +@@ -24022,7 +22717,7 @@ + do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl; do +- if test -r "$ac_dir/libXt.$ac_extension"; then ++ if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 + fi +@@ -24030,7 +22725,7 @@ + done + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi # $ac_x_libraries = no + +@@ -24085,12 +22780,12 @@ + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . +- case `(uname -sr) 2>/dev/null` in +- "SunOS 5"*) +- { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 ++ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 + echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } +- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" +- cat >conftest.$ac_ext <<_ACEOF ++ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ++ ac_xsave_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -24118,44 +22813,20 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_R_nospace=yes ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ X_LIBS="$X_LIBS -R$x_libraries" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_R_nospace=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- if test $ac_R_nospace = yes; then +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- X_LIBS="$X_LIBS -R$x_libraries" +- else + LIBS="$ac_xsave_LIBS -R $x_libraries" +- cat >conftest.$ac_ext <<_ACEOF ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -24183,48 +22854,30 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_R_space=yes ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ X_LIBS="$X_LIBS -R $x_libraries" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_R_space=no ++ { echo "$as_me:$LINENO: result: neither works" >&5 ++echo "${ECHO_T}neither works" >&6; } ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +- if test $ac_R_space = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- X_LIBS="$X_LIBS -R $x_libraries" +- else +- { echo "$as_me:$LINENO: result: neither works" >&5 +-echo "${ECHO_T}neither works" >&6; } +- fi +- fi +- LIBS=$ac_xsave_LIBS +- esac ++ ac_c_werror_flag=$ac_xsave_c_werror_flag ++ LIBS=$ac_xsave_LIBS + fi + + # Check for system-dependent libraries X programs must link with. +@@ -24273,27 +22926,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -24329,39 +22966,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in ++if { (ac_try="$ac_link" ++case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_dnet_ntoa=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24370,7 +22991,7 @@ + ac_cv_lib_dnet_dnet_ntoa=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24423,27 +23044,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24452,7 +23057,7 @@ + ac_cv_lib_dnet_stub_dnet_ntoa=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24465,7 +23070,7 @@ + fi + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" + +@@ -24540,27 +23145,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24569,7 +23158,7 @@ + ac_cv_func_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +@@ -24618,27 +23207,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_nsl_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24647,7 +23220,7 @@ + ac_cv_lib_nsl_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24700,27 +23273,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_bsd_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24729,7 +23286,7 @@ + ac_cv_lib_bsd_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24812,27 +23369,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_connect=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24841,7 +23382,7 @@ + ac_cv_func_connect=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +@@ -24890,27 +23431,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_socket_connect=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24919,7 +23444,7 @@ + ac_cv_lib_socket_connect=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24995,27 +23520,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_remove=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25024,7 +23533,7 @@ + ac_cv_func_remove=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +@@ -25073,27 +23582,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_posix_remove=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25102,7 +23595,7 @@ + ac_cv_lib_posix_remove=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -25178,27 +23671,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_shmat=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25207,7 +23684,7 @@ + ac_cv_func_shmat=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +@@ -25256,27 +23733,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_ipc_shmat=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25285,7 +23746,7 @@ + ac_cv_lib_ipc_shmat=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -25349,27 +23810,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25378,7 +23823,7 @@ + ac_cv_lib_ICE_IceConnectionNumber=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -25444,27 +23889,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xau_XauFileName=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25473,7 +23902,7 @@ + ac_cv_lib_Xau_XauFileName=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -25551,27 +23980,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25607,17 +24019,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25701,41 +24106,25 @@ + ; + return 0; + } +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + am_cv_val_LC_MESSAGES=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25744,7 +24133,7 @@ + am_cv_val_LC_MESSAGES=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +@@ -25800,27 +24189,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25856,17 +24228,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25962,27 +24327,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gt_cv_func_ngettext_libc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25991,7 +24340,7 @@ + gt_cv_func_ngettext_libc=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + fi +@@ -26034,27 +24383,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gt_cv_func_dgettext_libc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26063,7 +24396,7 @@ + gt_cv_func_dgettext_libc=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + fi +@@ -26139,27 +24472,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -26168,7 +24485,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -26233,27 +24550,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_bindtextdomain=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26262,7 +24563,7 @@ + ac_cv_lib_intl_bindtextdomain=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26311,27 +24612,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_ngettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26340,7 +24625,7 @@ + ac_cv_lib_intl_ngettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26389,27 +24674,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_dgettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26418,7 +24687,7 @@ + ac_cv_lib_intl_dgettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26480,27 +24749,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_ngettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26509,7 +24762,7 @@ + ac_cv_lib_intl_ngettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26558,27 +24811,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_dcgettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26587,7 +24824,7 @@ + ac_cv_lib_intl_dcgettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26682,27 +24919,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -26711,7 +24932,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -26858,27 +25079,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -26887,7 +25092,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -26901,6 +25106,35 @@ + fi + done + ++ MSGFMT_OPTS= ++ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 ++echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } ++ cat >conftest.foo <<_ACEOF ++ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test \n" ++"Language-Team: C \n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++_ACEOF ++if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5 ++ (msgfmt -c -o /dev/null conftest.foo) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++else { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++echo "$as_me: failed input was:" >&5 ++sed 's/^/| /' conftest.foo >&5 ++fi ++ + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 +@@ -26919,7 +25153,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -27007,27 +25241,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + CATOBJEXT=.gmo + DATADIRNAME=share + else +@@ -27099,27 +25317,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_bind_textdomain_codeset=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27128,7 +25330,7 @@ + ac_cv_func_bind_textdomain_codeset=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +@@ -27149,7 +25351,7 @@ + esac + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo +@@ -27307,7 +25509,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -27483,7 +25685,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -27587,7 +25789,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -27632,7 +25834,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -27905,7 +26107,8 @@ + ## M4sh Initialization. ## + ## --------------------- ## + +-# Be Bourne compatible ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -27914,10 +26117,13 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ ++ + + + # PATH needs CR +@@ -28141,19 +26347,28 @@ + as_mkdir_p=false + fi + +-# Find out whether ``test -x'' works. Don't use a zero-byte file, as +-# systems may use methods other than mode bits to determine executability. +-cat >conf$$.file <<_ASEOF +-#! /bin/sh +-exit 0 +-_ASEOF +-chmod +x conf$$.file +-if test -x conf$$.file >/dev/null 2>&1; then +- as_executable_p="test -x" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' + else +- as_executable_p=: ++ 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 +-rm -f conf$$.file ++as_executable_p=$as_test_x + + # 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'" +@@ -28169,7 +26384,7 @@ + # values after options handling. + ac_log=" + This file was extended by gnome-panel $as_me 2.18.0, which was +-generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -28198,7 +26413,7 @@ + Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit ++ -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +@@ -28222,7 +26437,7 @@ + cat >>$CONFIG_STATUS <<_ACEOF + ac_cs_version="\\ + gnome-panel config.status 2.18.0 +-configured by $0, generated by GNU Autoconf 2.60, ++configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + + Copyright (C) 2006 Free Software Foundation, Inc. +@@ -28668,6 +26883,7 @@ + GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim + USE_NLS!$USE_NLS$ac_delim + MSGFMT!$MSGFMT$ac_delim ++MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim + GMSGFMT!$GMSGFMT$ac_delim + XGETTEXT!$XGETTEXT$ac_delim + CATALOGS!$CATALOGS$ac_delim +@@ -28688,7 +26904,6 @@ + HELP_DIR!$HELP_DIR$ac_delim + OMF_DIR!$OMF_DIR$ac_delim + DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim +-ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -28730,6 +26945,7 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim + ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim + HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim + HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim +@@ -28744,7 +26960,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +diff -Nur gnome-panel-2.18.0/doc/Makefile.in gnome-panel-2.18.0.new/doc/Makefile.in +--- gnome-panel-2.18.0/doc/Makefile.in 2007-03-12 20:06:16.000000000 +0100 ++++ gnome-panel-2.18.0.new/doc/Makefile.in 2007-03-13 00:55:56.000000000 +0100 +@@ -38,10 +38,7 @@ + subdir = doc + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -177,6 +174,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/doc/reference/Makefile.in gnome-panel-2.18.0.new/doc/reference/Makefile.in +--- gnome-panel-2.18.0/doc/reference/Makefile.in 2007-03-12 20:06:17.000000000 +0100 ++++ gnome-panel-2.18.0.new/doc/reference/Makefile.in 2007-03-13 00:55:56.000000000 +0100 +@@ -38,10 +38,7 @@ + subdir = doc/reference + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -177,6 +174,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/doc/reference/panel-applet/Makefile.in gnome-panel-2.18.0.new/doc/reference/panel-applet/Makefile.in +--- gnome-panel-2.18.0/doc/reference/panel-applet/Makefile.in 2007-03-12 20:06:18.000000000 +0100 ++++ gnome-panel-2.18.0.new/doc/reference/panel-applet/Makefile.in 2007-03-13 00:55:56.000000000 +0100 +@@ -45,10 +45,7 @@ + $(top_srcdir)/gtk-doc.make ChangeLog + subdir = doc/reference/panel-applet + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -175,6 +172,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/gnome-panel/Makefile.in gnome-panel-2.18.0.new/gnome-panel/Makefile.in +--- gnome-panel-2.18.0/gnome-panel/Makefile.in 2007-03-12 20:06:19.000000000 +0100 ++++ gnome-panel-2.18.0.new/gnome-panel/Makefile.in 2007-03-13 00:55:57.000000000 +0100 +@@ -42,10 +42,7 @@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/gnome-panel.desktop.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -88,7 +85,9 @@ + panel-multiscreen.$(OBJEXT) panel-a11y.$(OBJEXT) \ + panel-bindings.$(OBJEXT) panel-profile.$(OBJEXT) \ + panel-force-quit.$(OBJEXT) panel-lockdown.$(OBJEXT) \ +- panel-addto.$(OBJEXT) panel-logout.$(OBJEXT) \ ++ panel-addto.$(OBJEXT) panel-addto-canvas.$(OBJEXT) \ ++ panel-addto-rounded-rect.$(OBJEXT) \ ++ panel-addto-event-box.$(OBJEXT) panel-logout.$(OBJEXT) \ + panel-gdm.$(OBJEXT) panel-power-manager.$(OBJEXT) \ + panel-ditem-editor.$(OBJEXT) $(am__objects_1) + am__objects_4 = $(am__objects_1) +@@ -246,6 +245,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +@@ -419,6 +419,9 @@ + panel-force-quit.c \ + panel-lockdown.c \ + panel-addto.c \ ++ panel-addto-canvas.c \ ++ panel-addto-rounded-rect.c \ ++ panel-addto-event-box.c \ + panel-logout.c \ + panel-gdm.c \ + panel-power-manager.c \ +@@ -468,6 +471,10 @@ + panel-force-quit.h \ + panel-lockdown.h \ + panel-addto.h \ ++ panel-addto-canvas.h \ ++ panel-addto-rounded-rect.h \ ++ panel-addto-rounded-rect-pixbuf.h \ ++ panel-addto-event-box.h \ + panel-logout.h \ + panel-gdm.h \ + panel-power-manager.h \ +@@ -636,6 +643,9 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-a11y.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-action-button.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-action-protocol.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-addto-canvas.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-addto-event-box.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-addto-rounded-rect.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-addto.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-applet-frame.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-background-monitor.Po@am__quote@ +diff -Nur gnome-panel-2.18.0/help/clock/Makefile.in gnome-panel-2.18.0.new/help/clock/Makefile.in +--- gnome-panel-2.18.0/help/clock/Makefile.in 2007-03-12 20:06:20.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/clock/Makefile.in 2007-03-13 00:55:57.000000000 +0100 +@@ -63,10 +63,7 @@ + $(top_srcdir)/gnome-doc-utils.make + subdir = help/clock + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +190,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/de/fish/Makefile.in gnome-panel-2.18.0.new/help/de/fish/Makefile.in +--- gnome-panel-2.18.0/help/de/fish/Makefile.in 2007-03-12 20:06:21.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/de/fish/Makefile.in 2007-03-13 00:55:57.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/de/fish + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/de/Makefile.in gnome-panel-2.18.0.new/help/de/Makefile.in +--- gnome-panel-2.18.0/help/de/Makefile.in 2007-03-12 20:06:20.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/de/Makefile.in 2007-03-13 00:55:57.000000000 +0100 +@@ -38,10 +38,7 @@ + subdir = help/de + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -177,6 +174,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/de/window-list/Makefile.in gnome-panel-2.18.0.new/help/de/window-list/Makefile.in +--- gnome-panel-2.18.0/help/de/window-list/Makefile.in 2007-03-12 20:06:21.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/de/window-list/Makefile.in 2007-03-13 00:55:58.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/de/window-list + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/de/workspace-switcher/Makefile.in gnome-panel-2.18.0.new/help/de/workspace-switcher/Makefile.in +--- gnome-panel-2.18.0/help/de/workspace-switcher/Makefile.in 2007-03-12 20:06:22.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/de/workspace-switcher/Makefile.in 2007-03-13 00:55:58.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/de/workspace-switcher + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/fish/Makefile.in gnome-panel-2.18.0.new/help/fish/Makefile.in +--- gnome-panel-2.18.0/help/fish/Makefile.in 2007-03-12 20:06:23.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/fish/Makefile.in 2007-03-13 00:55:58.000000000 +0100 +@@ -63,10 +63,7 @@ + $(top_srcdir)/gnome-doc-utils.make + subdir = help/fish + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +190,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/ja/fish/Makefile.in gnome-panel-2.18.0.new/help/ja/fish/Makefile.in +--- gnome-panel-2.18.0/help/ja/fish/Makefile.in 2007-03-12 20:06:24.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/ja/fish/Makefile.in 2007-03-13 00:55:59.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/ja/fish + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/ja/Makefile.in gnome-panel-2.18.0.new/help/ja/Makefile.in +--- gnome-panel-2.18.0/help/ja/Makefile.in 2007-03-12 20:06:23.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/ja/Makefile.in 2007-03-13 00:55:59.000000000 +0100 +@@ -38,10 +38,7 @@ + subdir = help/ja + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -177,6 +174,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/ja/window-list/Makefile.in gnome-panel-2.18.0.new/help/ja/window-list/Makefile.in +--- gnome-panel-2.18.0/help/ja/window-list/Makefile.in 2007-03-12 20:06:25.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/ja/window-list/Makefile.in 2007-03-13 00:55:59.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/ja/window-list + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/ja/workspace-switcher/Makefile.in gnome-panel-2.18.0.new/help/ja/workspace-switcher/Makefile.in +--- gnome-panel-2.18.0/help/ja/workspace-switcher/Makefile.in 2007-03-12 20:06:26.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/ja/workspace-switcher/Makefile.in 2007-03-13 00:56:00.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/ja/workspace-switcher + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/ko/fish/Makefile.in gnome-panel-2.18.0.new/help/ko/fish/Makefile.in +--- gnome-panel-2.18.0/help/ko/fish/Makefile.in 2007-03-12 20:06:27.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/ko/fish/Makefile.in 2007-03-13 00:56:00.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/ko/fish + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/ko/Makefile.in gnome-panel-2.18.0.new/help/ko/Makefile.in +--- gnome-panel-2.18.0/help/ko/Makefile.in 2007-03-12 20:06:26.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/ko/Makefile.in 2007-03-13 00:56:00.000000000 +0100 +@@ -38,10 +38,7 @@ + subdir = help/ko + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -177,6 +174,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/ko/window-list/Makefile.in gnome-panel-2.18.0.new/help/ko/window-list/Makefile.in +--- gnome-panel-2.18.0/help/ko/window-list/Makefile.in 2007-03-12 20:06:27.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/ko/window-list/Makefile.in 2007-03-13 00:56:00.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/ko/window-list + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/ko/workspace-switcher/Makefile.in gnome-panel-2.18.0.new/help/ko/workspace-switcher/Makefile.in +--- gnome-panel-2.18.0/help/ko/workspace-switcher/Makefile.in 2007-03-12 20:06:28.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/ko/workspace-switcher/Makefile.in 2007-03-13 00:56:00.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/ko/workspace-switcher + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/Makefile.in gnome-panel-2.18.0.new/help/Makefile.in +--- gnome-panel-2.18.0/help/Makefile.in 2007-03-12 20:06:19.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/Makefile.in 2007-03-13 00:55:57.000000000 +0100 +@@ -38,10 +38,7 @@ + subdir = help + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -177,6 +174,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/window-list/Makefile.in gnome-panel-2.18.0.new/help/window-list/Makefile.in +--- gnome-panel-2.18.0/help/window-list/Makefile.in 2007-03-12 20:06:30.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/window-list/Makefile.in 2007-03-13 00:56:00.000000000 +0100 +@@ -63,10 +63,7 @@ + $(top_srcdir)/gnome-doc-utils.make + subdir = help/window-list + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +190,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/workspace-switcher/Makefile.in gnome-panel-2.18.0.new/help/workspace-switcher/Makefile.in +--- gnome-panel-2.18.0/help/workspace-switcher/Makefile.in 2007-03-12 20:06:31.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/workspace-switcher/Makefile.in 2007-03-13 00:56:01.000000000 +0100 +@@ -63,10 +63,7 @@ + $(top_srcdir)/gnome-doc-utils.make + subdir = help/workspace-switcher + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +190,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/zh_CN/fish/Makefile.in gnome-panel-2.18.0.new/help/zh_CN/fish/Makefile.in +--- gnome-panel-2.18.0/help/zh_CN/fish/Makefile.in 2007-03-12 20:06:32.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/zh_CN/fish/Makefile.in 2007-03-13 00:56:01.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/zh_CN/fish + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/zh_CN/Makefile.in gnome-panel-2.18.0.new/help/zh_CN/Makefile.in +--- gnome-panel-2.18.0/help/zh_CN/Makefile.in 2007-03-12 20:06:32.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/zh_CN/Makefile.in 2007-03-13 00:56:01.000000000 +0100 +@@ -38,10 +38,7 @@ + subdir = help/zh_CN + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -177,6 +174,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/zh_CN/workspace-switcher/Makefile.in gnome-panel-2.18.0.new/help/zh_CN/workspace-switcher/Makefile.in +--- gnome-panel-2.18.0/help/zh_CN/workspace-switcher/Makefile.in 2007-03-12 20:06:33.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/zh_CN/workspace-switcher/Makefile.in 2007-03-13 00:56:01.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/zh_CN/workspace-switcher + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/zh_TW/fish/Makefile.in gnome-panel-2.18.0.new/help/zh_TW/fish/Makefile.in +--- gnome-panel-2.18.0/help/zh_TW/fish/Makefile.in 2007-03-12 20:06:34.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/zh_TW/fish/Makefile.in 2007-03-13 00:56:02.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/zh_TW/fish + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/zh_TW/Makefile.in gnome-panel-2.18.0.new/help/zh_TW/Makefile.in +--- gnome-panel-2.18.0/help/zh_TW/Makefile.in 2007-03-12 20:06:33.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/zh_TW/Makefile.in 2007-03-13 00:56:02.000000000 +0100 +@@ -38,10 +38,7 @@ + subdir = help/zh_TW + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -177,6 +174,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/zh_TW/window-list/Makefile.in gnome-panel-2.18.0.new/help/zh_TW/window-list/Makefile.in +--- gnome-panel-2.18.0/help/zh_TW/window-list/Makefile.in 2007-03-12 20:06:34.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/zh_TW/window-list/Makefile.in 2007-03-13 00:56:02.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/zh_TW/window-list + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/help/zh_TW/workspace-switcher/Makefile.in gnome-panel-2.18.0.new/help/zh_TW/workspace-switcher/Makefile.in +--- gnome-panel-2.18.0/help/zh_TW/workspace-switcher/Makefile.in 2007-03-12 20:06:35.000000000 +0100 ++++ gnome-panel-2.18.0.new/help/zh_TW/workspace-switcher/Makefile.in 2007-03-13 00:56:03.000000000 +0100 +@@ -101,10 +101,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/zh_TW/workspace-switcher + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -231,6 +228,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/icons/16x16/Makefile.in gnome-panel-2.18.0.new/icons/16x16/Makefile.in +--- gnome-panel-2.18.0/icons/16x16/Makefile.in 2007-03-12 20:06:35.000000000 +0100 ++++ gnome-panel-2.18.0.new/icons/16x16/Makefile.in 2007-03-13 00:56:03.000000000 +0100 +@@ -39,10 +39,7 @@ + subdir = icons/16x16 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -178,6 +175,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/icons/22x22/Makefile.in gnome-panel-2.18.0.new/icons/22x22/Makefile.in +--- gnome-panel-2.18.0/icons/22x22/Makefile.in 2007-03-12 20:06:36.000000000 +0100 ++++ gnome-panel-2.18.0.new/icons/22x22/Makefile.in 2007-03-13 00:56:03.000000000 +0100 +@@ -39,10 +39,7 @@ + subdir = icons/22x22 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -178,6 +175,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/icons/24x24/Makefile.in gnome-panel-2.18.0.new/icons/24x24/Makefile.in +--- gnome-panel-2.18.0/icons/24x24/Makefile.in 2007-03-12 20:06:36.000000000 +0100 ++++ gnome-panel-2.18.0.new/icons/24x24/Makefile.in 2007-03-13 00:56:03.000000000 +0100 +@@ -39,10 +39,7 @@ + subdir = icons/24x24 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -178,6 +175,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/icons/32x32/Makefile.in gnome-panel-2.18.0.new/icons/32x32/Makefile.in +--- gnome-panel-2.18.0/icons/32x32/Makefile.in 2007-03-12 20:06:37.000000000 +0100 ++++ gnome-panel-2.18.0.new/icons/32x32/Makefile.in 2007-03-13 00:56:03.000000000 +0100 +@@ -39,10 +39,7 @@ + subdir = icons/32x32 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -178,6 +175,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/icons/Makefile.in gnome-panel-2.18.0.new/icons/Makefile.in +--- gnome-panel-2.18.0/icons/Makefile.in 2007-03-12 20:06:37.000000000 +0100 ++++ gnome-panel-2.18.0.new/icons/Makefile.in 2007-03-13 00:56:03.000000000 +0100 +@@ -39,10 +39,7 @@ + subdir = icons + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -187,6 +184,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/icons/scalable/Makefile.in gnome-panel-2.18.0.new/icons/scalable/Makefile.in +--- gnome-panel-2.18.0/icons/scalable/Makefile.in 2007-03-12 20:06:38.000000000 +0100 ++++ gnome-panel-2.18.0.new/icons/scalable/Makefile.in 2007-03-13 00:56:04.000000000 +0100 +@@ -39,10 +39,7 @@ + subdir = icons/scalable + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -178,6 +175,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/idl/Makefile.in gnome-panel-2.18.0.new/idl/Makefile.in +--- gnome-panel-2.18.0/idl/Makefile.in 2007-03-12 20:06:38.000000000 +0100 ++++ gnome-panel-2.18.0.new/idl/Makefile.in 2007-03-13 00:56:04.000000000 +0100 +@@ -39,10 +39,7 @@ + subdir = idl + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -178,6 +175,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/libpanel-applet/Makefile.in gnome-panel-2.18.0.new/libpanel-applet/Makefile.in +--- gnome-panel-2.18.0/libpanel-applet/Makefile.in 2007-03-12 20:06:39.000000000 +0100 ++++ gnome-panel-2.18.0.new/libpanel-applet/Makefile.in 2007-03-13 00:56:04.000000000 +0100 +@@ -47,10 +47,7 @@ + $(srcdir)/libpanelapplet-2.0-uninstalled.pc.in \ + $(srcdir)/libpanelapplet-2.0.pc.in ChangeLog TODO + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -227,6 +224,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +diff -Nur gnome-panel-2.18.0/Makefile.in gnome-panel-2.18.0.new/Makefile.in +--- gnome-panel-2.18.0/Makefile.in 2007-03-12 20:06:41.000000000 +0100 ++++ gnome-panel-2.18.0.new/Makefile.in 2007-03-13 00:56:04.000000000 +0100 +@@ -42,10 +42,7 @@ + install-sh ltmain.sh missing mkinstalldirs + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +@@ -192,6 +189,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ +@@ -508,7 +506,7 @@ + distdir: $(DISTFILES) + $(am__remove_distdir) + mkdir $(distdir) +- $(mkdir_p) $(distdir)/gnome-panel $(distdir)/libpanel-applet $(distdir)/m4 $(distdir)/po ++ $(mkdir_p) $(distdir)/gnome-panel $(distdir)/libpanel-applet $(distdir)/po + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ +diff -Nur gnome-panel-2.18.0/man/Makefile.in gnome-panel-2.18.0.new/man/Makefile.in +--- gnome-panel-2.18.0/man/Makefile.in 2007-03-12 20:06:40.000000000 +0100 ++++ gnome-panel-2.18.0.new/man/Makefile.in 2007-03-13 00:56:04.000000000 +0100 +@@ -38,10 +38,7 @@ + subdir = man + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -172,6 +169,7 @@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ + NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ --- gnome-panel-2.18.0.orig/debian/patches/15_clock_start_evo_midday.patch +++ gnome-panel-2.18.0/debian/patches/15_clock_start_evo_midday.patch @@ -0,0 +1,12 @@ +diff -Nur gnome-panel-2.17.90/applets/clock/clock.c gnome-panel-2.17.90.new/applets/clock/clock.c +--- gnome-panel-2.17.90/applets/clock/clock.c 2007-01-24 10:44:29.000000000 +0100 ++++ gnome-panel-2.17.90.new/applets/clock/clock.c 2007-01-24 10:45:07.000000000 +0100 +@@ -1311,7 +1311,7 @@ + gtk_calendar_get_date (GTK_CALENDAR (cd->calendar), + &year, &month, &day); + +- argument = g_strdup_printf ("calendar:///?startdate=%.4d%.2d%.2d", ++ argument = g_strdup_printf ("calendar:///?startdate=%.4d%.2d%.2dT120000", + year, month + 1, day); + + clock_launch_evolution (cd, argument); --- gnome-panel-2.18.0.orig/debian/patches/11_panel_addto_dialog.patch +++ gnome-panel-2.18.0/debian/patches/11_panel_addto_dialog.patch @@ -0,0 +1,7933 @@ +diff -Nur gnome-panel-2.17.92/gnome-panel/Makefile.am gnome-panel-2.17.92.new/gnome-panel/Makefile.am +--- gnome-panel-2.17.92/gnome-panel/Makefile.am 2007-02-26 21:40:23.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/Makefile.am 2007-02-27 01:49:24.000000000 +0100 +@@ -95,6 +95,9 @@ + panel-force-quit.c \ + panel-lockdown.c \ + panel-addto.c \ ++ panel-addto-canvas.c \ ++ panel-addto-rounded-rect.c \ ++ panel-addto-event-box.c \ + panel-logout.c \ + panel-gdm.c \ + panel-power-manager.c \ +@@ -144,6 +147,10 @@ + panel-force-quit.h \ + panel-lockdown.h \ + panel-addto.h \ ++ panel-addto-canvas.h \ ++ panel-addto-rounded-rect.h \ ++ panel-addto-rounded-rect-pixbuf.h \ ++ panel-addto-event-box.h \ + panel-logout.h \ + panel-gdm.h \ + panel-power-manager.h \ +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-action-button.c gnome-panel-2.17.92.new/gnome-panel/panel-action-button.c +--- gnome-panel-2.17.92/gnome-panel/panel-action-button.c 2007-02-27 01:49:07.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-action-button.c 2007-02-27 01:49:24.000000000 +0100 +@@ -173,6 +173,7 @@ + gtk_get_current_event_time ()); + } + } ++} + + static void + panel_action_shutdown (GtkWidget *widget) +@@ -262,6 +263,8 @@ + PanelActionButtonType type; + char *icon_name; + char *text; ++ char *category; ++ char *english_category; + char *tooltip; + char *help_index; + char *drag_id; +@@ -284,6 +287,8 @@ + PANEL_ACTION_LOCK, + "gnome-lockscreen", + N_("Lock Screen"), ++ N_("Desktop & Windows"), ++ "Desktop & Windows", + N_("Protect your computer from unauthorized use"), + "gospanel-21", + "ACTION:lock:NEW", +@@ -299,6 +304,8 @@ + * update the ones in panel-menu-items.c (look for + * panel:showusername|1) */ + N_("Quit..."), ++ N_("Desktop & Windows"), ++ "Desktop & Windows", + N_("Log off, switch user, lock screen or power down the computer"), + "gospanel-20", + "ACTION:logout:NEW", +@@ -309,6 +316,8 @@ + PANEL_ACTION_RUN, + PANEL_RUN_ICON, + N_("Run Application..."), ++ N_("Utilities"), ++ "Utilities", + N_("Run an application by typing a command or choosing from a list"), + "gospanel-555", + "ACTION:run:NEW", +@@ -319,6 +328,8 @@ + PANEL_ACTION_SEARCH, + "gnome-searchtool", + N_("Search for Files..."), ++ N_("Utilities"), ++ "Utilities", + N_("Locate documents and folders on this computer by name or content"), + "gospanel-554", + "ACTION:search:NEW", +@@ -328,6 +339,8 @@ + PANEL_ACTION_FORCE_QUIT, + PANEL_FORCE_QUIT_ICON, + N_("Force Quit"), ++ N_("Desktop & Windows"), ++ "Desktop & Windows", + N_("Force a misbehaving application to quit"), + "gospanel-563", + "ACTION:force-quit:NEW", +@@ -338,6 +351,8 @@ + PANEL_ACTION_CONNECT_SERVER, + "gnome-globe", //FIXME icon + N_("Connect to Server..."), ++ N_("Utilities"), ++ "Utilities", + N_("Connect to a remote computer or shared disk"), + "gospanel-563", //FIXME + "ACTION:connect-server:NEW", +@@ -347,6 +362,8 @@ + PANEL_ACTION_SHUTDOWN, + "gnome-shutdown", + N_("Shut Down..."), ++ N_("Utilities"), ++ "Utilities", + N_("Shut down the computer"), + "gospanel-20", + "ACTION:shutdown:NEW", +@@ -410,6 +427,22 @@ + } + + G_CONST_RETURN char* ++panel_action_get_category (PanelActionButtonType type) ++{ ++ g_return_val_if_fail (type > PANEL_ACTION_NONE && type < PANEL_ACTION_LAST, NULL); ++ ++ return _(actions[type].category); ++} ++ ++G_CONST_RETURN char* ++panel_action_get_english_category (PanelActionButtonType type) ++{ ++ g_return_val_if_fail (type > PANEL_ACTION_NONE && type < PANEL_ACTION_LAST, NULL); ++ ++ return actions[type].english_category; ++} ++ ++G_CONST_RETURN char* + panel_action_get_tooltip (PanelActionButtonType type) + { + g_return_val_if_fail (type > PANEL_ACTION_NONE && type < PANEL_ACTION_LAST, NULL); +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-action-button.h gnome-panel-2.17.92.new/gnome-panel/panel-action-button.h +--- gnome-panel-2.17.92/gnome-panel/panel-action-button.h 2007-02-26 21:40:23.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-action-button.h 2007-02-27 01:49:24.000000000 +0100 +@@ -87,12 +87,14 @@ + const char *drag_string, + int *old_applet_idx); + +-gboolean panel_action_get_is_disabled (PanelActionButtonType type); +-GCallback panel_action_get_invoke (PanelActionButtonType type); +-G_CONST_RETURN char *panel_action_get_icon_name (PanelActionButtonType type); +-G_CONST_RETURN char *panel_action_get_text (PanelActionButtonType type); +-G_CONST_RETURN char *panel_action_get_tooltip (PanelActionButtonType type); +-G_CONST_RETURN char *panel_action_get_drag_id (PanelActionButtonType type); ++gboolean panel_action_get_is_disabled (PanelActionButtonType type); ++GCallback panel_action_get_invoke (PanelActionButtonType type); ++G_CONST_RETURN char *panel_action_get_icon_name (PanelActionButtonType type); ++G_CONST_RETURN char *panel_action_get_text (PanelActionButtonType type); ++G_CONST_RETURN char *panel_action_get_category (PanelActionButtonType type); ++G_CONST_RETURN char *panel_action_get_english_category (PanelActionButtonType type); ++G_CONST_RETURN char *panel_action_get_tooltip (PanelActionButtonType type); ++G_CONST_RETURN char *panel_action_get_drag_id (PanelActionButtonType type); + + G_END_DECLS + +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-addto.c gnome-panel-2.17.92.new/gnome-panel/panel-addto.c +--- gnome-panel-2.17.92/gnome-panel/panel-addto.c 2007-02-27 01:49:06.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-addto.c 2007-02-27 01:49:55.000000000 +0100 +@@ -25,118 +25,55 @@ + #include + #include + +-#include +- + #include + +-#include "launcher.h" +-#include "panel.h" +-#include "drawer.h" +-#include "panel-applet-frame.h" +-#include "panel-action-button.h" +-#include "panel-menu-bar.h" +-#include "panel-separator.h" +-#include "panel-toplevel.h" +-#include "panel-menu-button.h" +-#include "panel-globals.h" +-#include "panel-lockdown.h" +-#include "panel-util.h" +-#include "panel-profile.h" +-#include "panel-addto.h" +- +-typedef struct { +- PanelWidget *panel_widget; +- +- GtkWidget *addto_dialog; +- GtkWidget *label; +- GtkWidget *search_entry; +- GtkWidget *back_button; +- GtkWidget *add_button; +- GtkWidget *tree_view; +- GtkTreeModel *applet_model; +- GtkTreeModel *filter_applet_model; +- GtkTreeModel *application_model; +- GtkTreeModel *filter_application_model; +- +- GMenuTree *menu_tree; +- +- GSList *applet_list; +- GSList *application_list; +- GSList *settings_list; +- +- gchar *search_text; +- gchar *applet_search_text; ++#include ++#include + +- guint name_notify; ++#include "panel-addto.h" ++#include "panel-addto-canvas.h" + +- int insertion_position; +-} PanelAddtoDialog; ++#define PANEL_ADDTO_CANVAS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasPrivate)) + + static GQuark panel_addto_dialog_quark = 0; + +-typedef enum { +- PANEL_ADDTO_APPLET, +- PANEL_ADDTO_ACTION, +- PANEL_ADDTO_LAUNCHER_MENU, +- PANEL_ADDTO_LAUNCHER, +- PANEL_ADDTO_LAUNCHER_NEW, +- PANEL_ADDTO_MENU, +- PANEL_ADDTO_MENUBAR, +- PANEL_ADDTO_SEPARATOR, +- PANEL_ADDTO_DRAWER +-} PanelAddtoItemType; +- +-typedef struct { +- PanelAddtoItemType type; +- char *name; +- char *description; +- char *icon; +- PanelActionButtonType action_type; +- char *launcher_path; +- char *menu_filename; +- char *menu_path; +- char *iid; +- gboolean static_data; +-} PanelAddtoItemInfo; +- +-typedef struct { +- GSList *children; +- PanelAddtoItemInfo item_info; +-} PanelAddtoAppList; +- +-static PanelAddtoItemInfo special_addto_items [] = { +- +- { PANEL_ADDTO_LAUNCHER_NEW, +- N_("Custom Application Launcher"), +- N_("Create a new launcher"), +- "gnome-panel-launcher", +- PANEL_ACTION_NONE, +- NULL, +- NULL, +- NULL, +- "LAUNCHER:ASK", +- TRUE }, +- +- { PANEL_ADDTO_LAUNCHER_MENU, +- N_("Application Launcher..."), +- N_("Copy a launcher from the applications menu"), +- "gnome-panel-launcher", +- PANEL_ACTION_NONE, +- NULL, +- NULL, +- NULL, +- "LAUNCHER:MENU", +- TRUE } +- +-}; ++typedef struct EntryInfo { ++ PanelAddtoCanvas *canvas; ++ ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *text; ++ GnomeCanvasItem *pixbuf; ++ GnomeCanvasItem *highlight_pixbuf; ++ GnomeCanvasItem *cover; ++ GnomeCanvasItem *selection; ++ ++ double icon_height; ++ double icon_width; ++ double text_height; ++ guint launching : 1; ++ guint selected : 1; ++ guint highlighted : 1; ++ ++ gint n_category; ++ gint n_entry; ++ gint index; ++} EntryInfo; ++ ++ typedef struct CategoryInfo { ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *title; ++ GnomeCanvasItem *line; ++ } CategoryInfo; + + static PanelAddtoItemInfo internal_addto_items [] = { + + { PANEL_ADDTO_MENU, ++ PANEL_ACTION_NONE, ++ N_("Utilities"), ++ "Utilities", + N_("Main Menu"), + N_("The main GNOME menu"), + PANEL_MAIN_MENU_ICON, +- PANEL_ACTION_NONE, + NULL, + NULL, + NULL, +@@ -144,10 +81,12 @@ + TRUE }, + + { PANEL_ADDTO_MENUBAR, ++ PANEL_ACTION_NONE, ++ N_("Utilities"), ++ "Utilities", + N_("Menu Bar"), + N_("A custom menu bar"), + PANEL_GNOME_LOGO_ICON, +- PANEL_ACTION_NONE, + NULL, + NULL, + NULL, +@@ -155,10 +94,12 @@ + TRUE }, + + { PANEL_ADDTO_SEPARATOR, ++ PANEL_ACTION_NONE, ++ N_("Utilities"), ++ "Utilities", + N_("Separator"), + N_("A separator to organize the panel items"), + PANEL_SEPARATOR_ICON, +- PANEL_ACTION_NONE, + NULL, + NULL, + NULL, +@@ -166,10 +107,12 @@ + TRUE }, + + { PANEL_ADDTO_DRAWER, ++ PANEL_ACTION_NONE, ++ N_("Desktop & Windows"), ++ "Desktop & Windows", + N_("Drawer"), + N_("A pop out drawer to store other items in"), + PANEL_DRAWER_ICON, +- PANEL_ACTION_NONE, + NULL, + NULL, + NULL, +@@ -202,9 +145,7 @@ + + static void panel_addto_present_applications (PanelAddtoDialog *dialog); + static void panel_addto_present_applets (PanelAddtoDialog *dialog); +-static gboolean panel_addto_filter_func (GtkTreeModel *model, +- GtkTreeIter *iter, +- gpointer data); ++static void panel_addto_init_categories (PanelAddtoDialog *dialog); + + static int + panel_addto_applet_info_sort_func (PanelAddtoItemInfo *a, +@@ -223,6 +164,7 @@ + if (!translated) { + internal_addto_items [i].name = _(internal_addto_items [i].name); + internal_addto_items [i].description = _(internal_addto_items [i].description); ++ internal_addto_items [i].category = _(internal_addto_items [i].category); + } + + if (internal_addto_items [i].type == PANEL_ADDTO_MENU || +@@ -245,14 +187,16 @@ + if (panel_action_get_is_disabled (i)) + continue; + +- info = g_new0 (PanelAddtoItemInfo, 1); +- info->type = PANEL_ADDTO_ACTION; +- info->action_type = i; +- info->name = g_strdup (panel_action_get_text (i)); +- info->description = g_strdup (panel_action_get_tooltip (i)); +- info->icon = g_strdup (panel_action_get_icon_name (i)); +- info->iid = g_strdup (panel_action_get_drag_id (i)); +- info->static_data = FALSE; ++ info = g_new0 (PanelAddtoItemInfo, 1); ++ info->type = PANEL_ADDTO_ACTION; ++ info->action_type = i; ++ info->name = g_strdup (panel_action_get_text (i)); ++ info->description = g_strdup (panel_action_get_tooltip (i)); ++ info->category = g_strdup (panel_action_get_category (i)); ++ info->english_category = g_strdup (panel_action_get_english_category (i)); ++ info->icon = g_strdup (panel_action_get_icon_name (i)); ++ info->iid = g_strdup (panel_action_get_drag_id (i)); ++ info->static_data = FALSE; + + list = g_slist_prepend (list, info); + } +@@ -281,6 +225,7 @@ + } + + #define ICON_SIZE 32 ++#define LAUNCHER_ICON_SIZE 20 + + static GdkPixbuf * + panel_addto_make_pixbuf (const char *filename) +@@ -292,8 +237,18 @@ + NULL); + } + ++static GdkPixbuf * ++panel_addto_make_pixbuf_for_launcher (const char *filename) ++{ ++ //FIXME: size shouldn't be fixed but should depend on the font size ++ return panel_load_icon (gtk_icon_theme_get_default (), ++ filename, ++ LAUNCHER_ICON_SIZE, LAUNCHER_ICON_SIZE, LAUNCHER_ICON_SIZE, ++ NULL); ++} ++ + static void +-panel_addto_drag_data_get_cb (GtkWidget *widget, ++panel_addto_applications_drag_data_get_cb (GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *selection_data, + guint info, +@@ -306,27 +261,22 @@ + } + + static void +-panel_addto_drag_begin_cb (GtkWidget *widget, ++panel_addto_applications_drag_begin_cb (GtkWidget *widget, + GdkDragContext *context, + gpointer data) + { +- GtkTreeModel *filter_model; +- GtkTreeModel *child_model; ++ GtkTreeModel *model; + GtkTreePath *path; + GtkTreeIter iter; +- GtkTreeIter filter_iter; + GdkPixbuf *pixbuf; + +- filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); ++ model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); + + gtk_tree_view_get_cursor (GTK_TREE_VIEW (widget), &path, NULL); +- gtk_tree_model_get_iter (filter_model, &filter_iter, path); ++ gtk_tree_model_get_iter (model, &iter, path); + gtk_tree_path_free (path); +- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model), +- &iter, &filter_iter); + +- child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); +- gtk_tree_model_get (child_model, &iter, ++ gtk_tree_model_get (model, &iter, + COLUMN_ICON, &pixbuf, + -1); + +@@ -335,7 +285,7 @@ + } + + static void +-panel_addto_setup_drag (GtkTreeView *tree_view, ++panel_addto_applications_setup_drag (GtkTreeView *tree_view, + const GtkTargetEntry *target, + const char *text) + { +@@ -347,17 +297,17 @@ + target, 1, GDK_ACTION_COPY); + + g_signal_connect_data (G_OBJECT (tree_view), "drag_data_get", +- G_CALLBACK (panel_addto_drag_data_get_cb), ++ G_CALLBACK (panel_addto_applications_drag_data_get_cb), + g_strdup (text), + (GClosureNotify) g_free, + 0 /* connect_flags */); + g_signal_connect_after (G_OBJECT (tree_view), "drag-begin", +- G_CALLBACK (panel_addto_drag_begin_cb), ++ G_CALLBACK (panel_addto_applications_drag_begin_cb), + NULL); + } + + static void +-panel_addto_setup_launcher_drag (GtkTreeView *tree_view, ++panel_addto_applications_setup_launcher_drag (GtkTreeView *tree_view, + const char *uri) + { + static GtkTargetEntry target[] = { +@@ -366,30 +316,19 @@ + char *uri_list; + + uri_list = g_strconcat (uri, "\r\n", NULL); +- panel_addto_setup_drag (tree_view, target, uri_list); ++ panel_addto_applications_setup_drag (tree_view, target, uri_list); + g_free (uri_list); + } + + static void +-panel_addto_setup_applet_drag (GtkTreeView *tree_view, +- const char *iid) +-{ +- static GtkTargetEntry target[] = { +- { "application/x-panel-applet-iid", 0, 0 } +- }; +- +- panel_addto_setup_drag (tree_view, target, iid); +-} +- +-static void +-panel_addto_setup_internal_applet_drag (GtkTreeView *tree_view, ++panel_addto_applications_setup_internal_applet_drag (GtkTreeView *tree_view, + const char *applet_type) + { + static GtkTargetEntry target[] = { + { "application/x-panel-applet-internal", 0, 0 } + }; + +- panel_addto_setup_drag (tree_view, target, applet_type); ++ panel_addto_applications_setup_drag (tree_view, target, applet_type); + } + + static GSList * +@@ -428,20 +367,26 @@ + + for (i = 0; i < applet_list->_length; i++) { + Bonobo_ServerInfo *info; +- const char *name, *description, *icon; ++ const char *name, *description, *category, *english_category, *icon; + PanelAddtoItemInfo *applet; + + info = &applet_list->_buffer[i]; + +- name = bonobo_server_info_prop_lookup (info, +- "name", +- langs_gslist); +- description = bonobo_server_info_prop_lookup (info, +- "description", +- langs_gslist); +- icon = bonobo_server_info_prop_lookup (info, +- "panel:icon", +- NULL); ++ name = bonobo_server_info_prop_lookup (info, ++ "name", ++ langs_gslist); ++ description = bonobo_server_info_prop_lookup (info, ++ "description", ++ langs_gslist); ++ category = bonobo_server_info_prop_lookup (info, ++ "panel:category", ++ langs_gslist); ++ english_category = bonobo_server_info_prop_lookup (info, ++ "panel:category", ++ NULL); ++ icon = bonobo_server_info_prop_lookup (info, ++ "panel:icon", ++ NULL); + + if (!name || + panel_lockdown_is_applet_disabled (info->iid)) { +@@ -455,7 +400,13 @@ + applet->icon = g_strdup (icon); + applet->iid = g_strdup (info->iid); + applet->static_data = FALSE; +- ++ if (!category) { ++ applet->category = g_strdup_printf (_("Miscellaneous")); ++ applet->english_category = g_strdup_printf ("Miscellaneous"); ++ } else { ++ applet->category = g_markup_escape_text (category, -1); ++ applet->english_category = g_markup_escape_text (english_category, -1); ++ } + list = g_slist_prepend (list, applet); + } + +@@ -508,38 +459,12 @@ + } + } + +-static void +-panel_addto_append_special_applets (PanelAddtoDialog *dialog, +- GtkListStore *model) +-{ +- static gboolean translated = FALSE; +- int i; +- +- for (i = 0; i < G_N_ELEMENTS (special_addto_items); i++) { +- if (!translated) { +- special_addto_items [i].name = _(special_addto_items [i].name); +- special_addto_items [i].description = _(special_addto_items [i].description); +- } +- +- if (special_addto_items [i].type == PANEL_ADDTO_LAUNCHER_NEW +- && panel_lockdown_get_disable_command_line ()) +- continue; +- +- panel_addto_append_item (dialog, model, &special_addto_items [i]); +- } +- +- translated = TRUE; +-} +- +-static void ++static GtkTreeModel * + panel_addto_make_applet_model (PanelAddtoDialog *dialog) + { + GtkListStore *model; + GSList *l; + +- if (dialog->filter_applet_model != NULL) +- return; +- + if (panel_profile_id_lists_are_writable ()) { + dialog->applet_list = panel_addto_query_applets (dialog->applet_list); + dialog->applet_list = panel_addto_prepend_internal_applets (dialog->applet_list); +@@ -554,21 +479,14 @@ + G_TYPE_POINTER, + G_TYPE_STRING); + +- if (panel_profile_id_lists_are_writable ()) { +- panel_addto_append_special_applets (dialog, model); +- if (dialog->applet_list) ++ if (panel_profile_id_lists_are_writable () && dialog->applet_list) { + panel_addto_append_item (dialog, model, NULL); + } + + for (l = dialog->applet_list; l; l = l->next) + panel_addto_append_item (dialog, model, l->data); + +- dialog->applet_model = GTK_TREE_MODEL (model); +- dialog->filter_applet_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dialog->applet_model), +- NULL); +- gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (dialog->filter_applet_model), +- panel_addto_filter_func, +- dialog, NULL); ++ return (GtkTreeModel *) model; + } + + static void panel_addto_make_application_list (GSList **parent_list, +@@ -726,16 +644,13 @@ + } + } + +-static void ++static GtkTreeModel * + panel_addto_make_application_model (PanelAddtoDialog *dialog) + { + GtkTreeStore *store; + GMenuTree *tree; + GMenuTreeDirectory *root; + +- if (dialog->filter_application_model != NULL) +- return; +- + store = gtk_tree_store_new (NUMBER_COLUMNS, + GDK_TYPE_PIXBUF, + G_TYPE_STRING, +@@ -777,20 +692,19 @@ + + gmenu_tree_unref (tree); + +- dialog->application_model = GTK_TREE_MODEL (store); +- dialog->filter_application_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dialog->application_model), +- NULL); +- gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (dialog->filter_application_model), +- panel_addto_filter_func, +- dialog, NULL); ++ return GTK_TREE_MODEL (store); + } + +-static void ++gboolean + panel_addto_add_item (PanelAddtoDialog *dialog, + PanelAddtoItemInfo *item_info) + { ++ gboolean destroy; ++ + g_assert (item_info != NULL); + ++ destroy = TRUE; ++ + switch (item_info->type) { + case PANEL_ADDTO_APPLET: + panel_applet_frame_create (dialog->panel_widget->toplevel, +@@ -804,6 +718,7 @@ + break; + case PANEL_ADDTO_LAUNCHER_MENU: + panel_addto_present_applications (dialog); ++ destroy = FALSE; + break; + case PANEL_ADDTO_LAUNCHER: + panel_launcher_create (dialog->panel_widget->toplevel, +@@ -836,18 +751,21 @@ + NULL, FALSE, NULL); + break; + } ++ ++ return destroy; + } + +-static void ++void + panel_addto_dialog_response (GtkWidget *widget_dialog, + guint response_id, + PanelAddtoDialog *dialog) + { +- GtkTreeSelection *selection; +- GtkTreeModel *filter_model; +- GtkTreeModel *child_model; +- GtkTreeIter iter; +- GtkTreeIter filter_iter; ++ PanelAddtoItemInfo *data; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoEntry *selected_applet; ++ GtkTreeSelection *selected_application; ++ GtkTreeModel *model; ++ GtkTreeIter iter; + + switch (response_id) { + case GTK_RESPONSE_HELP: +@@ -856,28 +774,44 @@ + break; + + case PANEL_ADDTO_RESPONSE_ADD: +- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); +- if (gtk_tree_selection_get_selected (selection, &filter_model, +- &filter_iter)) { +- PanelAddtoItemInfo *data; +- +- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model), +- &iter, +- &filter_iter); +- child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); +- gtk_tree_model_get (child_model, &iter, +- COLUMN_DATA, &data, -1); + +- if (data != NULL) ++ if (dialog->status == APPLETS) { ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ selected_applet = priv->selected; ++ data = selected_applet->item_info; ++ if (data) { + panel_addto_add_item (dialog, data); +- } ++ } ++ } else if (dialog->status == APPLICATIONS) { ++ selected_application = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); ++ if (gtk_tree_selection_get_selected (selected_application, ++ &model, &iter)) { ++ gtk_tree_model_get (model, &iter, ++ COLUMN_DATA, &data, -1); ++ ++ if (data != NULL) { ++ panel_addto_add_item (dialog, data); ++ } ++ } ++ } ++ + break; + ++ + case PANEL_ADDTO_RESPONSE_BACK: + /* This response only happens when we're showing the + * application list and the user wants to go back to the + * applet list. */ +- panel_addto_present_applets (dialog); ++ gtk_widget_hide (dialog->applications_sw); ++ dialog->status = APPLETS; ++ panel_addto_present_applets (dialog); ++ gtk_widget_show_all (dialog->applets_sw); ++ gtk_widget_show (dialog->statuslabel); ++ gtk_widget_show (dialog->search_entry); ++ gtk_widget_show (dialog->search_label); ++ gtk_widget_set_sensitive (dialog->launcher_button, TRUE); ++ if (!panel_lockdown_get_disable_command_line ()) ++ gtk_widget_set_sensitive (dialog->custom_launcher_button, TRUE); + break; + + case GTK_RESPONSE_CLOSE: +@@ -890,6 +824,40 @@ + } + + static void ++panel_addto_add_launcher (PanelAddtoDialog *dialog) ++{ ++ PanelAddtoEntry *launcher_applet; ++ PanelAddtoItemInfo *data; ++ ++ launcher_applet = g_new (PanelAddtoEntry, 1); ++ data = launcher_applet->item_info; ++ data = g_new (PanelAddtoItemInfo, 1); ++ data->type = PANEL_ADDTO_LAUNCHER_MENU; ++ ++ panel_addto_add_item (dialog, data); ++ ++ g_free (launcher_applet); ++ g_free (data); ++} ++ ++static void ++panel_addto_add_custom_launcher (PanelAddtoDialog *dialog) ++{ ++ PanelAddtoEntry *launcher_applet; ++ PanelAddtoItemInfo *data; ++ ++ launcher_applet = g_new (PanelAddtoEntry, 1); ++ data = launcher_applet->item_info; ++ data = g_new (PanelAddtoItemInfo, 1); ++ data->type = PANEL_ADDTO_LAUNCHER_NEW; ++ ++ panel_addto_add_item (dialog, data); ++ ++ g_free (launcher_applet); ++ g_free (data); ++} ++ ++static void + panel_addto_dialog_destroy (GtkWidget *widget_dialog, + PanelAddtoDialog *dialog) + { +@@ -899,45 +867,268 @@ + NULL); + } + ++ ++static PanelAddtoCategory * ++panel_addto_category_new (const gchar *title, ++ const gchar *english_title, ++ gboolean real_category) ++{ ++ PanelAddtoCategory *retval; ++ retval = g_new0 (PanelAddtoCategory, 1); ++ ++ retval->title = g_strdup (title); ++ retval->english_title = g_strdup (english_title); ++ retval->real_category = real_category != FALSE; ++ retval->entries = NULL; /* We will populate it in init_categories */ ++ ++ return retval; ++} ++ ++static int ++compare_categories (PanelAddtoCategory *a, ++ PanelAddtoCategory *b) ++{ ++ return g_utf8_collate (a->title, b->title); ++} ++ ++static void ++panel_addto_init_categories (PanelAddtoDialog *dialog) ++{ ++ PanelAddtoInformation *info; ++ PanelAddtoItemInfo *applet; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *current_category; ++ GSList *categories = NULL; ++ GSList *l, *m; ++ gchar *category_title, *category_english_title; ++ gboolean found; ++ ++ info = g_new0 (PanelAddtoInformation, 1); ++ ++ for (l = dialog->applet_list; l; l = l->next) { ++ applet = l->data; ++ category_title = g_strdup (applet->category); ++ category_english_title = g_strdup (applet->english_category); ++ found = FALSE; ++ for (m = categories; m; m = m->next) { ++ current_category = m->data; ++ if (!g_utf8_collate (current_category->english_title, category_english_title)) { ++ found = TRUE; ++ current_category->n_entries++; ++ if (!current_category->translated && strcmp (category_title, category_english_title)) { ++ current_category->title = category_title; ++ current_category->translated = TRUE; ++ } ++ break; ++ } ++ } ++ if (!found) { ++ categories = g_slist_prepend (categories, ++ panel_addto_category_new (category_title, category_english_title, TRUE)); ++ current_category = categories->data; ++ current_category->translated = strcmp (category_title, category_english_title) ? TRUE : FALSE; ++ current_category->n_entries = 1; ++ } ++ ++ entry = g_new0 (PanelAddtoEntry, 1); ++ entry->title = g_strdup (applet->name); ++ entry->comment = g_strdup (applet->description); ++ entry->item_info = applet; ++ entry->category = current_category; ++ entry->dialog = dialog; ++ entry->icon_pixbuf = panel_addto_make_pixbuf (applet->icon); ++ current_category->entries = g_slist_append (current_category->entries, entry); ++ } ++ ++ categories = g_slist_sort (categories, ++ (GCompareFunc) compare_categories); ++ ++ info->n_categories = g_slist_length (categories); ++ info->categories = categories; ++ ++ dialog->info = info; ++} ++ ++static gboolean ++panel_addto_separator_func (GtkTreeModel *model, ++ GtkTreeIter *iter, ++ gpointer data) ++{ ++ int column = GPOINTER_TO_INT (data); ++ char *text; ++ ++ gtk_tree_model_get (model, iter, column, &text, -1); ++ ++ if (!text) ++ return TRUE; ++ ++ g_free(text); ++ return FALSE; ++} ++ ++static void ++panel_addto_applications_selection_changed (GtkTreeSelection *selection, ++ PanelAddtoDialog *dialog) ++{ ++ GtkTreeModel *model; ++ GtkTreeIter iter; ++ PanelAddtoItemInfo *data; ++ char *iid; ++ ++ ++ if (!gtk_tree_selection_get_selected (selection, &model, &iter)) { ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE); ++ return; ++ } ++ ++ gtk_tree_model_get (model, &iter, COLUMN_DATA, &data, -1); ++ ++ if (!data) { ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE); ++ return; ++ } ++ ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), TRUE); ++ ++ gtk_button_set_label (GTK_BUTTON (dialog->add_button), ++ GTK_STOCK_ADD); ++ gtk_button_set_use_stock (GTK_BUTTON (dialog->add_button), ++ TRUE); ++ ++ /* only allow dragging applets if we can add applets */ ++ ++ if (panel_profile_id_lists_are_writable ()) { ++ switch (data->type) { ++ case PANEL_ADDTO_LAUNCHER: ++ panel_addto_applications_setup_launcher_drag (GTK_TREE_VIEW (dialog->tree_view), ++ data->launcher_path); ++ break; ++ case PANEL_ADDTO_MENU: ++ ++ /* build the iid for menus other than the main menu */ ++ ++ if (data->iid == NULL) { ++ iid = g_strdup_printf ("MENU:%s/%s", ++ data->menu_filename, ++ data->menu_path); ++ } else { ++ iid = g_strdup (data->iid); ++ } ++ panel_addto_applications_setup_internal_applet_drag (GTK_TREE_VIEW (dialog->tree_view), ++ iid); ++ g_free (iid); ++ break; ++ default: ++ break; ++ } ++ } ++} ++ ++ ++static void ++panel_addto_applications_selection_activated (GtkTreeView *view, ++ GtkTreePath *path, ++ GtkTreeViewColumn *column, ++ PanelAddtoDialog *dialog) ++{ ++ gtk_dialog_response (GTK_DIALOG (dialog->addto_dialog), ++ PANEL_ADDTO_RESPONSE_ADD); ++} ++ + static void + panel_addto_present_applications (PanelAddtoDialog *dialog) + { +- if (dialog->filter_application_model == NULL) +- panel_addto_make_application_model (dialog); +- gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->tree_view), +- dialog->filter_application_model); +- gtk_window_set_focus (GTK_WINDOW (dialog->addto_dialog), +- dialog->search_entry); +- gtk_widget_set_sensitive (dialog->back_button, TRUE); ++ GtkTreeSelection *selection; ++ GtkTreeViewColumn *column; ++ ++ if (dialog->application_model == NULL) { ++ dialog->application_model = panel_addto_make_application_model (dialog); ++ } ++ gtk_widget_hide (dialog->applets_sw); ++ gtk_widget_hide (dialog->statuslabel); ++ gtk_widget_hide (dialog->search_entry); ++ gtk_widget_hide (dialog->search_label); + +- if (dialog->applet_search_text) +- g_free (dialog->applet_search_text); ++ gtk_widget_set_sensitive (dialog->launcher_button, FALSE); ++ gtk_widget_set_sensitive (dialog->custom_launcher_button, FALSE); + +- dialog->applet_search_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->search_entry))); +- /* show everything */ +- gtk_entry_set_text (GTK_ENTRY (dialog->search_entry), ""); ++ dialog->status = APPLICATIONS; ++ ++ dialog->applications_sw = gtk_scrolled_window_new (NULL, NULL); ++ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dialog->applications_sw), ++ GTK_POLICY_AUTOMATIC, ++ GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (dialog->applications_sw), ++ GTK_SHADOW_IN); ++ dialog->tree_view = gtk_tree_view_new (); ++ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dialog->tree_view), ++ FALSE); ++ gtk_tree_view_expand_all (GTK_TREE_VIEW (dialog->tree_view)); ++ ++ dialog->renderer = g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF, ++ "xpad", 4, ++ "ypad", 4, ++ NULL); ++ ++ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dialog->tree_view), ++ -1, NULL, ++ dialog->renderer, ++ "pixbuf", COLUMN_ICON, ++ NULL); ++ ++ dialog->renderer = gtk_cell_renderer_text_new (); ++ g_object_set (dialog->renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); ++ ++ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dialog->tree_view), ++ -1, NULL, ++ dialog->renderer, ++ "markup", COLUMN_TEXT, ++ NULL); ++ gtk_tree_view_set_search_column (GTK_TREE_VIEW (dialog->tree_view), ++ COLUMN_SEARCH); ++ ++ gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (dialog->tree_view), ++ panel_addto_separator_func, ++ GINT_TO_POINTER (COLUMN_TEXT), ++ NULL); ++ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); ++ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); ++ ++ column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->tree_view), ++ COLUMN_TEXT); ++ gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); ++ ++ g_signal_connect (selection, "changed", ++ G_CALLBACK (panel_addto_applications_selection_changed), ++ dialog); ++ ++ g_signal_connect (dialog->tree_view, "row-activated", ++ G_CALLBACK (panel_addto_applications_selection_activated), ++ dialog); ++ ++ gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->tree_view), ++ dialog->application_model); ++ gtk_container_add (GTK_CONTAINER (dialog->applications_sw), ++ GTK_WIDGET (dialog->tree_view)); ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), ++ GTK_WIDGET (dialog->applications_sw), TRUE, TRUE, 0); ++ ++ ++ gtk_window_set_focus (GTK_WINDOW (dialog->addto_dialog), ++ dialog->tree_view); ++ gtk_widget_set_sensitive (dialog->back_button, TRUE); ++ gtk_widget_show_all (GTK_WIDGET (dialog->applications_sw)); + } + + static void + panel_addto_present_applets (PanelAddtoDialog *dialog) + { +- if (dialog->filter_applet_model == NULL) +- panel_addto_make_applet_model (dialog); +- gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->tree_view), +- dialog->filter_applet_model); +- gtk_window_set_focus (GTK_WINDOW (dialog->addto_dialog), +- dialog->search_entry); +- gtk_widget_set_sensitive (dialog->back_button, FALSE); + +- if (dialog->applet_search_text) { +- gtk_entry_set_text (GTK_ENTRY (dialog->search_entry), +- dialog->applet_search_text); +- gtk_editable_set_position (GTK_EDITABLE (dialog->search_entry), +- -1); ++ if (dialog->applet_model == NULL) ++ dialog->applet_model = panel_addto_make_applet_model (dialog); + +- g_free (dialog->applet_search_text); +- dialog->applet_search_text = NULL; +- } ++ gtk_widget_set_sensitive (dialog->back_button, FALSE); ++ + } + + static void +@@ -998,8 +1189,10 @@ + static void + panel_addto_dialog_free (PanelAddtoDialog *dialog) + { +- GConfClient *client; +- GSList *item; ++ GConfClient *client; ++ GSList *item, *l, *m; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; + + client = panel_gconf_get_client (); + +@@ -1007,18 +1200,14 @@ + gconf_client_notify_remove (client, dialog->name_notify); + dialog->name_notify = 0; + +- if (dialog->search_text) +- g_free (dialog->search_text); +- dialog->search_text = NULL; +- +- if (dialog->applet_search_text) +- g_free (dialog->applet_search_text); +- dialog->applet_search_text = NULL; +- + if (dialog->addto_dialog) +- gtk_widget_destroy (dialog->addto_dialog); ++ gtk_widget_destroy (dialog->addto_dialog); + dialog->addto_dialog = NULL; +- ++ ++ if (dialog->label) { ++ dialog->label = NULL; ++ } ++ + for (item = dialog->applet_list; item != NULL; item = item->next) { + PanelAddtoItemInfo *applet; + +@@ -1032,19 +1221,33 @@ + + panel_addto_dialog_free_application_list (dialog->application_list); + panel_addto_dialog_free_application_list (dialog->settings_list); ++ ++ if (dialog->canvas) { ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ if (priv) { ++ if (priv && priv->info && priv->info->categories) { ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ for (m = current_category->entries; m; m = m->next) { ++ g_free (m->data); ++ } ++ if (current_category->user_data) ++ g_free (current_category->user_data); ++ g_slist_free (current_category->entries); ++ g_free (current_category); ++ } ++ g_slist_free (priv->info->categories); ++ } ++ g_free (priv->search_text); ++ } ++ } + +- if (dialog->filter_applet_model) +- g_object_unref (dialog->filter_applet_model); +- dialog->filter_applet_model = NULL; ++ + + if (dialog->applet_model) +- g_object_unref (dialog->applet_model); ++ g_object_unref (dialog->applet_model); + dialog->applet_model = NULL; + +- if (dialog->filter_application_model) +- g_object_unref (dialog->filter_application_model); +- dialog->filter_application_model = NULL; +- + if (dialog->application_model) + g_object_unref (dialog->application_model); + dialog->application_model = NULL; +@@ -1066,17 +1269,18 @@ + label = NULL; + + if (!string_empty (name)) +- label = g_strdup_printf (_("Find an _item to add to \"%s\":"), ++ label = g_strdup_printf (_("Select an item to add to \"%s\":"), + name); + + if (panel_toplevel_get_is_attached (dialog->panel_widget->toplevel)) { + title = g_strdup_printf (_("Add to Drawer")); + if (label == NULL) +- label = g_strdup (_("Find an _item to add to the drawer:")); ++ label = g_strdup (_("Select an item to add to the drawer:")); + } else { + title = g_strdup_printf (_("Add to Panel")); + if (label == NULL) +- label = g_strdup (_("Find an _item to add to the panel:")); ++ label = g_strdup (_("Select an item to add to the panel \n\ ++(you can also directly drag and drop items onto the panel):")); + } + + gtk_window_set_title (GTK_WINDOW (dialog->addto_dialog), title); +@@ -1110,199 +1314,24 @@ + panel_addto_name_change (dialog, text); + } + +-static gboolean +-panel_addto_filter_func (GtkTreeModel *model, +- GtkTreeIter *iter, +- gpointer userdata) +-{ +- PanelAddtoDialog *dialog; +- PanelAddtoItemInfo *data; +- +- dialog = (PanelAddtoDialog *) userdata; +- +- if (!dialog->search_text || !dialog->search_text[0]) +- return TRUE; +- +- gtk_tree_model_get (model, iter, COLUMN_DATA, &data, -1); +- +- if (data == NULL) +- return FALSE; +- +- /* This is more a workaround than anything else: show all the root +- * items in a tree store */ +- if (GTK_IS_TREE_STORE (model) && +- gtk_tree_store_iter_depth (GTK_TREE_STORE (model), iter) == 0) +- return TRUE; +- +- return (panel_util_utf8_strstrcase (data->name, +- dialog->search_text) != NULL || +- panel_util_utf8_strstrcase (data->description, +- dialog->search_text) != NULL); +-} +- +-static void +-panel_addto_search_entry_changed (GtkWidget *entry, +- PanelAddtoDialog *dialog) +-{ +- GtkTreeModel *model; +- char *new_text; +- GtkTreeIter iter; +- GtkTreePath *path; +- +- new_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->search_entry))); +- g_strchomp (new_text); +- +- if (dialog->search_text && +- g_utf8_collate (new_text, dialog->search_text) == 0) { +- g_free (new_text); +- return; +- } +- +- if (dialog->search_text) +- g_free (dialog->search_text); +- dialog->search_text = new_text; +- +- model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view)); +- gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); +- +- path = gtk_tree_path_new_first (); +- if (gtk_tree_model_get_iter (model, &iter, path)) { +- GtkTreeSelection *selection; +- +- gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (dialog->tree_view), +- path, NULL, FALSE, 0, 0); +- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); +- gtk_tree_selection_select_path (selection, path); +- } +- gtk_tree_path_free (path); +-} +- +-static void +-panel_addto_search_entry_activated (GtkWidget *entry, +- PanelAddtoDialog *dialog) +-{ +- gtk_dialog_response (GTK_DIALOG (dialog->addto_dialog), +- PANEL_ADDTO_RESPONSE_ADD); +-} +- +-static void +-panel_addto_selection_changed (GtkTreeSelection *selection, +- PanelAddtoDialog *dialog) +-{ +- GtkTreeModel *filter_model; +- GtkTreeModel *child_model; +- GtkTreeIter iter; +- GtkTreeIter filter_iter; +- PanelAddtoItemInfo *data; +- char *iid; +- +- if (!gtk_tree_selection_get_selected (selection, +- &filter_model, +- &filter_iter)) { +- gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), +- FALSE); +- return; +- } +- +- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model), +- &iter, &filter_iter); +- child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); +- gtk_tree_model_get (child_model, &iter, COLUMN_DATA, &data, -1); +- +- if (!data) { +- gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), +- FALSE); +- return; +- } +- +- gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), TRUE); +- +- if (data->type == PANEL_ADDTO_LAUNCHER_MENU) { +- gtk_button_set_label (GTK_BUTTON (dialog->add_button), +- GTK_STOCK_GO_FORWARD); +- } else { +- gtk_button_set_label (GTK_BUTTON (dialog->add_button), +- GTK_STOCK_ADD); +- } +- gtk_button_set_use_stock (GTK_BUTTON (dialog->add_button), +- TRUE); +- +- /* only allow dragging applets if we can add applets */ +- if (panel_profile_id_lists_are_writable ()) { +- switch (data->type) { +- case PANEL_ADDTO_LAUNCHER: +- panel_addto_setup_launcher_drag (GTK_TREE_VIEW (dialog->tree_view), +- data->launcher_path); +- break; +- case PANEL_ADDTO_APPLET: +- panel_addto_setup_applet_drag (GTK_TREE_VIEW (dialog->tree_view), +- data->iid); +- break; +- case PANEL_ADDTO_LAUNCHER_MENU: +- gtk_tree_view_unset_rows_drag_source (GTK_TREE_VIEW (dialog->tree_view)); +- break; +- case PANEL_ADDTO_MENU: +- /* build the iid for menus other than the main menu */ +- if (data->iid == NULL) { +- iid = g_strdup_printf ("MENU:%s/%s", +- data->menu_filename, +- data->menu_path); +- } else { +- iid = g_strdup (data->iid); +- } +- panel_addto_setup_internal_applet_drag (GTK_TREE_VIEW (dialog->tree_view), +- iid); +- g_free (iid); +- break; +- default: +- panel_addto_setup_internal_applet_drag (GTK_TREE_VIEW (dialog->tree_view), +- data->iid); +- break; +- } +- } +-} +- +-static void +-panel_addto_selection_activated (GtkTreeView *view, +- GtkTreePath *path, +- GtkTreeViewColumn *column, +- PanelAddtoDialog *dialog) +-{ +- gtk_dialog_response (GTK_DIALOG (dialog->addto_dialog), +- PANEL_ADDTO_RESPONSE_ADD); +-} +- +-static gboolean +-panel_addto_separator_func (GtkTreeModel *model, +- GtkTreeIter *iter, +- gpointer data) +-{ +- int column = GPOINTER_TO_INT (data); +- char *text; +- +- gtk_tree_model_get (model, iter, column, &text, -1); +- +- if (!text) +- return TRUE; +- +- g_free(text); +- return FALSE; +-} + + static PanelAddtoDialog * + panel_addto_dialog_new (PanelWidget *panel_widget) + { + PanelAddtoDialog *dialog; +- GtkWidget *vbox; +- GtkWidget *inner_vbox; +- GtkWidget *find_hbox; +- GtkWidget *sw; +- GtkCellRenderer *renderer; +- GtkTreeSelection *selection; +- GtkTreeViewColumn *column; ++ GtkWidget *vbox; ++ GtkWidget *top_hbox; ++ GtkWidget *launchers_hbox; ++ GdkPixbuf *launcher_pixbuf; ++ GtkWidget *launcher_image; ++ GtkWidget *bottom_hbox; ++ GtkTooltips *launchers_tooltips; ++ GtkImage *label_image; + + dialog = g_new0 (PanelAddtoDialog, 1); + ++ dialog->status = APPLETS; ++ + g_object_set_qdata_full (G_OBJECT (panel_widget->toplevel), + panel_addto_dialog_quark, + dialog, +@@ -1310,14 +1339,14 @@ + + dialog->panel_widget = panel_widget; + dialog->name_notify = +- panel_profile_toplevel_notify_add ( +- dialog->panel_widget->toplevel, +- "name", +- (GConfClientNotifyFunc) panel_addto_name_notify, +- dialog); +- +- ++ panel_profile_toplevel_notify_add (dialog->panel_widget->toplevel, ++ "name", ++ (GConfClientNotifyFunc) panel_addto_name_notify, ++ dialog); + dialog->addto_dialog = gtk_dialog_new (); ++ ++ dialog->statuslabel = gtk_label_new (""); ++ + gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog), + GTK_STOCK_HELP, GTK_RESPONSE_HELP); + dialog->back_button = gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog), +@@ -1345,104 +1374,103 @@ + vbox = gtk_vbox_new (FALSE, 12); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->addto_dialog)->vbox), +- vbox); +- +- inner_vbox = gtk_vbox_new (FALSE, 6); +- gtk_box_pack_start (GTK_BOX (vbox), inner_vbox, TRUE, TRUE, 0); ++ GTK_WIDGET (vbox)); + +- find_hbox = gtk_hbox_new (FALSE, 6); +- gtk_box_pack_start (GTK_BOX (inner_vbox), find_hbox, FALSE, FALSE, 0); ++ dialog->inner_vbox = gtk_vbox_new (FALSE, 6); ++ gtk_box_pack_start (GTK_BOX (vbox), dialog->inner_vbox, TRUE, TRUE, 0); + ++ top_hbox = gtk_hbox_new (FALSE, 6); ++ launchers_hbox = gtk_hbox_new (FALSE, 6); ++ bottom_hbox = gtk_hbox_new (FALSE, 0); + dialog->label = gtk_label_new_with_mnemonic (""); + gtk_misc_set_alignment (GTK_MISC (dialog->label), 0.0, 0.5); + gtk_label_set_use_markup (GTK_LABEL (dialog->label), TRUE); + +- gtk_box_pack_start (GTK_BOX (find_hbox), dialog->label, +- FALSE, FALSE, 0); ++ label_image = g_object_new (GTK_TYPE_IMAGE, ++ "stock", GTK_STOCK_DIALOG_INFO, ++ "icon-size", GTK_ICON_SIZE_DND, ++ NULL); ++ dialog->search_label = gtk_label_new_with_mnemonic (_("_Search: ")); ++ dialog->search_entry = gtk_entry_new (); ++ g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->search_entry))); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (dialog->search_label), GTK_WIDGET (dialog->search_entry)); + +- dialog->search_entry = gtk_entry_new (); + g_signal_connect (G_OBJECT (dialog->search_entry), "changed", +- G_CALLBACK (panel_addto_search_entry_changed), dialog); ++ G_CALLBACK (panel_addto_relayout_for_search), dialog); + g_signal_connect (G_OBJECT (dialog->search_entry), "activate", +- G_CALLBACK (panel_addto_search_entry_activated), dialog); +- +- gtk_box_pack_end (GTK_BOX (find_hbox), dialog->search_entry, +- TRUE, TRUE, 0); +- +- gtk_label_set_mnemonic_widget (GTK_LABEL (dialog->label), +- dialog->search_entry); +- +- sw = gtk_scrolled_window_new (NULL, NULL); +- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), +- GTK_POLICY_AUTOMATIC, +- GTK_POLICY_AUTOMATIC); +- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), +- GTK_SHADOW_IN); +- gtk_box_pack_start (GTK_BOX (inner_vbox), sw, TRUE, TRUE, 0); +- +- dialog->tree_view = gtk_tree_view_new (); +- gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dialog->tree_view), +- FALSE); +- gtk_tree_view_expand_all (GTK_TREE_VIEW (dialog->tree_view)); ++ G_CALLBACK (panel_addto_activate_from_searchbar), dialog); ++ ++ gtk_box_pack_start (GTK_BOX (top_hbox), GTK_WIDGET(label_image), ++ FALSE, FALSE, 0); ++ ++ gtk_box_pack_start (GTK_BOX (top_hbox), dialog->label, ++ TRUE, TRUE, 0); ++ ++ gtk_box_pack_start (GTK_BOX (top_hbox), GTK_WIDGET (dialog->search_label), ++ FALSE, FALSE, 0); + +- renderer = g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF, +- "xpad", 4, +- "ypad", 4, +- NULL); ++ gtk_box_pack_start (GTK_BOX (top_hbox), GTK_WIDGET (dialog->search_entry), ++ TRUE, TRUE, 0); + +- gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dialog->tree_view), +- -1, NULL, +- renderer, +- "pixbuf", COLUMN_ICON, +- NULL); +- renderer = gtk_cell_renderer_text_new (); +- g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); +- gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dialog->tree_view), +- -1, NULL, +- renderer, +- "markup", COLUMN_TEXT, +- NULL); ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), top_hbox, ++ FALSE, FALSE, 0); + +- //FIXME use the same search than the one for the search entry? +- gtk_tree_view_set_search_column (GTK_TREE_VIEW (dialog->tree_view), +- COLUMN_SEARCH); ++ /* Launcher button */ ++ launchers_tooltips = gtk_tooltips_new (); ++ dialog->launcher_button = gtk_button_new_with_mnemonic (_("A_pplication Launcher...")); ++ launcher_pixbuf = panel_addto_make_pixbuf_for_launcher ("launcher-program"); ++ launcher_image = gtk_image_new_from_pixbuf (launcher_pixbuf); ++ gtk_button_set_image (GTK_BUTTON (dialog->launcher_button), launcher_image); ++ gtk_tooltips_set_tip (launchers_tooltips, dialog->launcher_button, _("Launch a program that is already in the GNOME menu"), NULL); ++ g_signal_connect_swapped (dialog->launcher_button, "clicked", ++ G_CALLBACK (panel_addto_add_launcher), dialog); ++ gtk_box_pack_start (GTK_BOX (launchers_hbox), dialog->launcher_button, ++ FALSE, FALSE, 0); + +- gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (dialog->tree_view), +- panel_addto_separator_func, +- GINT_TO_POINTER (COLUMN_TEXT), +- NULL); +- ++ /* Custom launcher button*/ ++ dialog->custom_launcher_button = gtk_button_new_with_mnemonic (_("Custom Application _Launcher")); ++ launcher_image = gtk_image_new_from_pixbuf (launcher_pixbuf); ++ gtk_button_set_image (GTK_BUTTON (dialog->custom_launcher_button), launcher_image); ++ gtk_tooltips_set_tip (launchers_tooltips, dialog->custom_launcher_button, _("Create a new launcher"), NULL); ++ g_signal_connect_swapped (dialog->custom_launcher_button, "clicked", ++ G_CALLBACK (panel_addto_add_custom_launcher), dialog); ++ gtk_box_pack_start (GTK_BOX (launchers_hbox), dialog->custom_launcher_button, ++ FALSE, FALSE, 0); + +- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); +- gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); ++ if (panel_lockdown_get_disable_command_line ()) ++ gtk_widget_set_sensitive (dialog->custom_launcher_button, FALSE); + +- column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->tree_view), +- COLUMN_TEXT); +- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), launchers_hbox, ++ FALSE, FALSE, 0); + +- g_signal_connect (selection, "changed", +- G_CALLBACK (panel_addto_selection_changed), +- dialog); ++ dialog->applets_sw = gtk_scrolled_window_new (NULL, NULL); ++ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dialog->applets_sw), ++ GTK_POLICY_AUTOMATIC, ++ GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (dialog->applets_sw), ++ GTK_SHADOW_IN); + +- g_signal_connect (dialog->tree_view, "row-activated", +- G_CALLBACK (panel_addto_selection_activated), +- dialog); ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), dialog->applets_sw, TRUE, TRUE, 0); ++ gtk_box_pack_start (GTK_BOX (bottom_hbox), dialog->statuslabel, FALSE, FALSE, 0); + +- gtk_container_add (GTK_CONTAINER (sw), dialog->tree_view); ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), bottom_hbox, ++ FALSE, FALSE, 0); + + gtk_widget_show_all (vbox); + ++ gtk_label_set_mnemonic_widget (GTK_LABEL (dialog->label), ++ dialog->canvas); ++ + panel_toplevel_push_autohide_disabler (dialog->panel_widget->toplevel); + panel_widget_register_open_dialog (panel_widget, + dialog->addto_dialog); +- + panel_addto_name_change (dialog, + panel_toplevel_get_name (dialog->panel_widget->toplevel)); + + return dialog; + } + +-#define MAX_ADDTOPANEL_HEIGHT 490 ++#define MAX_ADDTOPANEL_HEIGHT 540 + + void + panel_addto_present (GtkMenuItem *item, +@@ -1451,6 +1479,7 @@ + PanelAddtoDialog *dialog; + PanelToplevel *toplevel; + PanelData *pd; ++ GtkAdjustment *sw_adjustment = NULL; + GdkScreen *screen; + gint screen_height; + gint height; +@@ -1471,12 +1500,24 @@ + + if (!dialog) { + dialog = panel_addto_dialog_new (panel_widget); ++ + panel_addto_present_applets (dialog); ++ panel_addto_init_categories (dialog); ++ ++ dialog->canvas = panel_addto_canvas_new (dialog->info); ++ gtk_container_add (GTK_CONTAINER (dialog->applets_sw), ++ GTK_WIDGET (dialog->canvas)); + } + ++ sw_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (dialog->applets_sw)); + dialog->insertion_position = pd ? pd->insertion_pos : -1; + gtk_window_set_screen (GTK_WINDOW (dialog->addto_dialog), screen); + gtk_window_set_default_size (GTK_WINDOW (dialog->addto_dialog), +- height * 8 / 7, height); ++ height * 1.35, height); + gtk_window_present (GTK_WINDOW (dialog->addto_dialog)); ++ ++ sw_adjustment->value = sw_adjustment->lower; ++ sw_adjustment->step_increment = 55; ++ gtk_adjustment_clamp_page (sw_adjustment, sw_adjustment->lower, sw_adjustment->upper); ++ gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (dialog->applets_sw), sw_adjustment); + } +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-addto-canvas.c gnome-panel-2.17.92.new/gnome-panel/panel-addto-canvas.c +--- gnome-panel-2.17.92/gnome-panel/panel-addto-canvas.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-addto-canvas.c 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,2309 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* Copyright (C) 2005 Carlos Garnacho ++ * ++ * 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 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. ++ * ++ * Authors: Jody Goldberg ++ * Carlos Garnacho Parro ++ * Manu Cornet ++ */ ++ ++ ++#include "panel-addto-canvas.h" ++#include "panel-addto.h" ++#include "panel-profile.h" ++ ++#define PAD 5 /*when scrolling keep a few pixels above or below if possible */ ++#define ABOVE_LINE_SPACING 0 ++#define UNDER_LINE_SPACING 0 ++#define UNDER_TITLE_SPACING 0 /* manually insert 1 blank line of text */ ++#define LINE_HEIGHT 1 ++#define BORDERS 7 ++#define MAX_ITEM_WIDTH 125 ++#define ITEMS_SEPARATION 7 ++ ++#include "panel-addto-canvas.h" ++#include "panel-addto-event-box.h" ++#include "panel-addto-rounded-rect.h" ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define PANEL_ADDTO_CANVAS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasPrivate)) ++ ++typedef struct EntryInfo { ++ PanelAddtoCanvas *canvas; ++ ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *text; ++ GnomeCanvasItem *pixbuf; ++ GnomeCanvasItem *highlight_pixbuf; ++ GnomeCanvasItem *cover; ++ GnomeCanvasItem *selection; ++ ++ double icon_height; ++ double icon_width; ++ double text_height; ++ guint launching : 1; ++ guint selected : 1; ++ guint highlighted : 1; ++ gboolean visible; ++ ++ gint n_category; ++ gint n_entry; ++ gint index; ++} EntryInfo; ++ ++typedef struct { ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *title; ++ GnomeCanvasItem *line; ++ gboolean visible; ++} CategoryInfo; ++ ++enum { ++ SELECTION_CHANGED, ++ LAST_SIGNAL ++}; ++ ++enum { ++ PROP_0, ++ PROP_INFO ++}; ++ ++ ++static guint panel_addto_canvas_signals [LAST_SIGNAL] = { 0 }; ++ ++ ++static void panel_addto_canvas_class_init (PanelAddtoCanvasClass *class); ++static void panel_addto_canvas_init (PanelAddtoCanvas *canvas); ++static void panel_addto_canvas_finalize (GObject *object); ++static void panel_addto_canvas_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec); ++static void panel_addto_canvas_get_property (GObject *object, ++ guint prop_id, ++ GValue *value, ++ GParamSpec *pspec); ++static void panel_addto_canvas_draw_background (GnomeCanvas *canvas, GdkDrawable *drawable, ++ int x, int y, int width, int height); ++static void panel_addto_canvas_size_allocate (GtkWidget *canvas, ++ GtkAllocation *allocation); ++static void panel_addto_canvas_style_set (GtkWidget *canvas, ++ GtkStyle *previous_style); ++static void panel_addto_canvas_realize (GtkWidget *canvas); ++ ++static void panel_addto_select_east_entry (EntryInfo *ei, PanelAddtoCanvas *canvas); ++static void build_canvas (PanelAddtoCanvas *canvas); ++static void relayout_canvas (PanelAddtoCanvas *canvas); ++static void set_style (PanelAddtoCanvas *canvas, gboolean font_changed); ++ ++G_DEFINE_TYPE (PanelAddtoCanvas, panel_addto_canvas, GNOME_TYPE_CANVAS); ++ ++ ++static AtkObject* panel_addto_canvas_get_accessible (GtkWidget *widget); ++ ++#include "panel-addto-event-box.h" ++#include "panel-addto-rounded-rect.h" ++#include "panel-profile.h" ++ ++static void ++panel_addto_canvas_class_init (PanelAddtoCanvasClass *class) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (class); ++ GnomeCanvasClass *canvas_class = GNOME_CANVAS_CLASS (class); ++ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); ++ ++ object_class->set_property = panel_addto_canvas_set_property; ++ object_class->get_property = panel_addto_canvas_get_property; ++ object_class->finalize = panel_addto_canvas_finalize; ++ canvas_class->draw_background = panel_addto_canvas_draw_background; ++ ++ widget_class->style_set = panel_addto_canvas_style_set; ++ widget_class->size_allocate = panel_addto_canvas_size_allocate; ++ widget_class->realize = panel_addto_canvas_realize; ++ widget_class->get_accessible = panel_addto_canvas_get_accessible; ++ ++ class->changed = NULL; ++ ++ g_object_class_install_property (object_class, ++ PROP_INFO, ++ g_param_spec_pointer ("info", ++ "information for the canvas", ++ "information for the canvas", ++ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); ++ panel_addto_canvas_signals [SELECTION_CHANGED] = ++ g_signal_new ("selection-changed", ++ G_OBJECT_CLASS_TYPE (object_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (PanelAddtoCanvasClass, changed), ++ NULL, NULL, ++ g_cclosure_marshal_VOID__STRING, ++ G_TYPE_NONE, 1, ++ G_TYPE_STRING); ++ ++ g_type_class_add_private (object_class, ++ sizeof (PanelAddtoCanvasPrivate)); ++} ++ ++ ++static void ++panel_addto_canvas_init (PanelAddtoCanvas *canvas) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ g_return_if_fail (PANEL_ADDTO_IS_CANVAS (canvas)); ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ priv->max_width = 300; ++ priv->min_height = 0; ++ priv->info = NULL; ++ priv->selected = NULL; ++ ++ priv->max_item_width = 0; ++ priv->max_item_height = 0; ++ priv->items_per_row = 0; ++ priv->rtl = (gtk_widget_get_direction (GTK_WIDGET (canvas)) == GTK_TEXT_DIR_RTL); ++ priv->accessible_children = g_hash_table_new (g_int_hash, g_int_equal); ++ ++ gtk_widget_show_all (GTK_WIDGET (canvas)); ++} ++ ++static void ++panel_addto_canvas_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (object); ++ ++ switch (prop_id) { ++ case PROP_INFO: ++ priv->info = g_value_get_pointer (value); ++ build_canvas (PANEL_ADDTO_CANVAS (object)); ++ break; ++ } ++} ++ ++static void ++panel_addto_canvas_get_property (GObject *object, ++ guint prop_id, ++ GValue *value, ++ GParamSpec *pspec) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (object); ++ ++ switch (prop_id) { ++ case PROP_INFO: ++ g_value_set_pointer (value, priv->info); ++ break; ++ } ++} ++ ++static void ++panel_addto_canvas_finalize (GObject *object) ++{ ++ if (G_OBJECT_CLASS (panel_addto_canvas_parent_class)->finalize) ++ (* G_OBJECT_CLASS (panel_addto_canvas_parent_class)->finalize) (object); ++} ++ ++ ++static void ++panel_addto_canvas_draw_background (GnomeCanvas *canvas, GdkDrawable *drawable, ++ int x, int y, int width, int height) ++{ ++ /* By default, we use the style base color. */ ++ gdk_gc_set_foreground (canvas->pixmap_gc, ++ >K_WIDGET (canvas)->style->base[GTK_STATE_NORMAL]); ++ gdk_draw_rectangle (drawable, ++ canvas->pixmap_gc, ++ TRUE, ++ 0, 0, ++ width, height); ++} ++ ++static void ++panel_addto_canvas_size_allocate(GtkWidget *canvas, GtkAllocation *allocation) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ if (GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->size_allocate) ++ (* GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->size_allocate) (canvas, allocation); ++ ++ if (allocation->height == 1 || allocation->width == 1) ++ return; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ priv->max_width = allocation->width; ++ priv->min_height = allocation->height; ++ ++ relayout_canvas (PANEL_ADDTO_CANVAS (canvas)); ++ ++ gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0, 0, priv->width - 1, priv->height - 1); ++ g_object_set (priv->under_cover, ++ "x2", priv->width, ++ "y2", priv->height, ++ NULL); ++} ++ ++static void ++panel_addto_canvas_realize (GtkWidget *canvas) ++{ ++ if (GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->realize) ++ (* GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->realize) (canvas); ++ ++ set_style (PANEL_ADDTO_CANVAS (canvas), FALSE); ++} ++ ++static void ++panel_addto_canvas_style_set (GtkWidget *canvas, GtkStyle *previous_style) ++{ ++ if (!GTK_WIDGET_REALIZED (canvas)) ++ return; ++ ++ set_style (PANEL_ADDTO_CANVAS (canvas), (previous_style && ++ canvas->style && ++ !pango_font_description_equal (canvas->style->font_desc, ++ previous_style->font_desc))); ++} ++ ++static void ++gnome_canvas_item_show_hide (GnomeCanvasItem *item, gboolean show) ++{ ++ if (show) ++ gnome_canvas_item_show (item); ++ else ++ gnome_canvas_item_hide (item); ++} ++ ++static void ++setup_entry (PanelAddtoCanvas *canvas, PanelAddtoEntry *entry) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ EntryInfo *ei; ++ GtkWidget *widget; ++ GtkStateType state; ++ ++ if (!entry) ++ return; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ widget = GTK_WIDGET (canvas); ++ ei = entry->user_data; ++ ++ if (ei->pixbuf) { ++ gnome_canvas_item_show_hide (ei->highlight_pixbuf, ei->highlighted); ++ gnome_canvas_item_show_hide (ei->pixbuf, !ei->highlighted); ++ } ++ if (!ei->selected) ++ state = GTK_STATE_NORMAL; ++ else if (gtk_window_has_toplevel_focus (GTK_WINDOW (gtk_widget_get_toplevel (widget)))) ++ state = GTK_STATE_SELECTED; ++ else ++ state = GTK_STATE_ACTIVE; ++ gnome_canvas_item_show_hide (ei->selection, ei->selected); ++ g_object_set (ei->selection, ++ "fill_color_gdk", &widget->style->base [state], ++ NULL); ++ g_object_set (ei->text, ++ "fill_color_gdk", &widget->style->text [state], ++ NULL); ++} ++ ++static gboolean ++cb_entry_info_reset (gpointer data) ++{ ++ EntryInfo *ei = data; ++ ei->launching = FALSE; ++ return FALSE; ++} ++ ++ ++void ++activate_entry (PanelAddtoEntry *entry) ++{ ++ EntryInfo *ei = entry->user_data; ++ ++ if (!ei->launching) { ++ ei->launching = TRUE; ++ gtk_timeout_add (1000, cb_entry_info_reset, ei); ++ ++ if (panel_addto_add_item (entry->dialog, entry->item_info)) ++ gtk_widget_destroy (entry->dialog->addto_dialog); ++ } ++} ++ ++static void ++panel_addto_drag_data_get_cb (GtkWidget *widget, ++ GdkDragContext *context, ++ GtkSelectionData *selection_data, ++ guint info, ++ guint time, ++ const char *string) ++{ ++ gtk_selection_data_set (selection_data, ++ selection_data->target, 8, (guchar *) string, ++ strlen (string)); ++} ++ ++static void ++panel_addto_drag_begin_cb (GtkWidget *canvas, ++ GdkDragContext *context, ++ gpointer data) ++{ ++ PanelAddtoEntry *entry; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ entry = priv->selected; ++ gtk_drag_set_icon_pixbuf (context, entry->icon_pixbuf, 0, 0); ++} ++ ++static void ++panel_addto_setup_drag (PanelAddtoCanvas *canvas, ++ const GtkTargetEntry *target, ++ const char *text) ++{ ++ if (!text || panel_lockdown_get_locked_down ()) ++ return; ++ ++ ++ gtk_drag_source_set (GTK_WIDGET (canvas), ++ GDK_BUTTON1_MASK|GDK_BUTTON2_MASK, ++ target, 1, GDK_ACTION_COPY); ++ ++ g_signal_connect_data (G_OBJECT (canvas), "drag_data_get", ++ G_CALLBACK (panel_addto_drag_data_get_cb), ++ g_strdup (text), ++ (GClosureNotify) g_free, ++ 0 /* connect_flags */); ++ g_signal_connect_after (G_OBJECT (canvas), "drag-begin", ++ G_CALLBACK (panel_addto_drag_begin_cb), ++ NULL); ++} ++ ++static void ++panel_addto_setup_launcher_drag (PanelAddtoCanvas *canvas, ++ const char *uri) ++{ ++ static GtkTargetEntry target[] = { ++ { "text/uri-list", 0, 0 } ++ }; ++ char *uri_list; ++ ++ uri_list = g_strconcat (uri, "\r\n", NULL); ++ panel_addto_setup_drag (canvas, target, uri_list); ++ g_free (uri_list); ++} ++ ++static void ++panel_addto_setup_applet_drag (PanelAddtoCanvas *canvas, ++ const char *iid) ++{ ++ static GtkTargetEntry target[] = { ++ { "application/x-panel-applet-iid", 0, 0 } ++ }; ++ ++ panel_addto_setup_drag (canvas, target, iid); ++} ++ ++ ++ ++static void ++panel_addto_setup_internal_applet_drag (PanelAddtoCanvas *canvas, ++ const char *applet_type) ++{ ++ static GtkTargetEntry target[] = { ++ { "application/x-panel-applet-internal", 0, 0 } ++ }; ++ ++ panel_addto_setup_drag (canvas, target, applet_type); ++} ++ ++static void ++panel_addto_selection_changed (PanelAddtoCanvas *canvas, ++ const gchar *status_display, ++ PanelAddtoDialog *dialog) ++{ ++ PanelAddtoItemInfo *data; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ data = priv->selected ? priv->selected->item_info : NULL; ++ ++ ++ if ((!priv->selected) || (!data)) { ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE); ++ return; ++ } ++ ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), TRUE); ++ ++ if (dialog->statuslabel) ++ gtk_label_set_text (GTK_LABEL (dialog->statuslabel), priv->selected->comment); ++ ++ if (data->type == PANEL_ADDTO_LAUNCHER_MENU) { ++ gtk_button_set_label (GTK_BUTTON (dialog->add_button), ++ GTK_STOCK_GO_FORWARD); ++ } else { ++ gtk_button_set_label (GTK_BUTTON (dialog->add_button), ++ GTK_STOCK_ADD); ++ } ++ gtk_button_set_use_stock (GTK_BUTTON (dialog->add_button), ++ TRUE); ++ ++} ++ ++static void ++select_entry (PanelAddtoCanvas *canvas, PanelAddtoEntry *entry) ++{ ++ PanelAddtoDialog *dialog; ++ PanelAddtoCanvasPrivate *priv; ++ EntryInfo *ei = NULL; ++ GtkAdjustment *pos; ++ double affine[6]; ++ PanelAddtoEntry *selected; ++ ++ dialog = entry->dialog; ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ selected = priv->selected; ++ ++ if (selected == entry) ++ return; ++ ++ if (selected && selected->user_data) ++ ((EntryInfo *) selected->user_data)->selected = FALSE; ++ setup_entry (canvas, selected); ++ ++ priv->selected = selected = entry; ++ ++ if (selected && selected->user_data) ++ ((EntryInfo *) selected->user_data)->selected = TRUE; ++ setup_entry (canvas, selected); ++ ++ g_signal_emit (canvas, panel_addto_canvas_signals [SELECTION_CHANGED], 0, ++ (entry) ? entry->comment : NULL); ++ ++ if (!entry) ++ return; ++ ++ ei = entry->user_data; ++ gnome_canvas_item_i2c_affine (GNOME_CANVAS_ITEM (ei->group), affine); ++ pos = gtk_layout_get_vadjustment (GTK_LAYOUT (ei->cover->canvas)); ++ ++ if (affine[5] < pos->value) ++ gtk_adjustment_set_value (pos, MAX (affine[5] - PAD, 0)); ++ else if ((affine[5] + priv->max_item_height) > (pos->value+pos->page_size)) ++ gtk_adjustment_set_value (pos, MAX (MIN (affine[5] + priv->max_item_height + PAD, pos->upper) - pos->page_size, 0)); ++} ++ ++static gboolean ++cover_event (GnomeCanvasItem *item, GdkEvent *event, PanelAddtoEntry *entry) ++{ ++ EntryInfo *ei = entry->user_data; ++ PanelAddtoCanvas *canvas = ei->canvas; ++ PanelAddtoItemInfo *data; ++ PanelAddtoDialog *dialog = entry->dialog; ++ char *iid; ++ ++ data = entry->item_info; ++ ++ switch (event->type) { ++ case GDK_ENTER_NOTIFY: ++ ei->highlighted = TRUE; ++ setup_entry (canvas, entry); /* highlight even if it is already selected */ ++ ++ /* only allow dragging applets if we can add applets */ ++ if (panel_profile_id_lists_are_writable ()) { ++ switch (data->type) { ++ case PANEL_ADDTO_LAUNCHER: ++ panel_addto_setup_launcher_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ data->launcher_path); ++ break; ++ case PANEL_ADDTO_APPLET: ++ panel_addto_setup_applet_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ data->iid); ++ break; ++ case PANEL_ADDTO_LAUNCHER_MENU: ++ break; ++ case PANEL_ADDTO_MENU: ++ /* build the iid for menus other than the main menu */ ++ if (data->iid == NULL) { ++ iid = g_strdup_printf ("MENU:%s/%s", ++ data->menu_filename, ++ data->menu_path); ++ } else { ++ iid = g_strdup (data->iid); ++ } ++ panel_addto_setup_internal_applet_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ iid); ++ g_free (iid); ++ break; ++ default: ++ panel_addto_setup_internal_applet_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ data->iid); ++ break; ++ } ++ } ++ ++ return TRUE; ++ case GDK_LEAVE_NOTIFY: ++ ei->highlighted = FALSE; ++ setup_entry (canvas, entry); ++ return TRUE; ++ case GDK_BUTTON_PRESS: ++ select_entry (canvas, entry); ++ gtk_widget_grab_focus (GTK_WIDGET (canvas)); ++ return TRUE; ++ case GDK_2BUTTON_PRESS: ++ if (event->button.button == 1) ++ activate_entry (entry); ++ return TRUE; ++ default: ++ return FALSE; ++ } ++} ++ ++static void ++panel_addto_select_first_entry (PanelAddtoCanvas *canvas) ++{ ++ PanelAddtoCategory *category; ++ PanelAddtoEntry *entry; ++ PanelAddtoCanvasPrivate *priv; ++ EntryInfo *ei; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ category = g_slist_nth_data (priv->info->categories, 0); ++ entry = g_slist_nth_data (category->entries, 0); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ select_entry (canvas, entry); ++} ++ ++static gint ++panel_addto_count_visible_entries (PanelAddtoCategory *category) ++{ ++ GSList *l; ++ PanelAddtoEntry *entry; ++ EntryInfo *ei; ++ gint n_visible_entries = 0; ++ ++ for (l = category->entries; l; l = l->next) { ++ entry = l->data; ++ ei = entry->user_data; ++ if (ei->visible) ++ n_visible_entries++; ++ } ++ return n_visible_entries; ++} ++ ++static gint ++panel_addto_get_rank_of_nth_visible_entry (PanelAddtoCategory *category, gint n) ++{ ++ GSList *l; ++ PanelAddtoEntry *entry; ++ EntryInfo *ei; ++ gint seen_visible_entries = 0; ++ gint seen_entries = 0; ++ gint farthest_visible_entry = 0; ++ ++ l = category->entries; ++ ++ while (seen_visible_entries < n) { ++ if (!l) break; ++ seen_entries++; ++ entry = l->data; ++ ei = entry->user_data; ++ if (ei->visible) { ++ seen_visible_entries++; ++ farthest_visible_entry = seen_entries; ++ } ++ l = l->next; ++ } ++ ++ return (farthest_visible_entry - 1); ++} ++ ++static gint ++panel_addto_how_many_visible_entries_before_me (PanelAddtoCategory *category, gint rank) ++{ ++ GSList *l; ++ PanelAddtoEntry *entry; ++ EntryInfo *ei; ++ gint seen_entries = 0; ++ gint seen_visible_entries = 0; ++ ++ l = category->entries; ++ while (seen_entries < rank) { ++ entry = l->data; ++ ei = entry->user_data; ++ if (ei->visible) ++ seen_visible_entries++; ++ l = l->next; ++ seen_entries++; ++ } ++ return seen_visible_entries; ++} ++ ++static void ++panel_addto_select_east_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category, n_entry; ++ gint n_categories; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_entry = 0; ++ n_category = 0; ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ if (ei->n_entry == category->n_entries - 1) { ++ if (n_category == priv->info->n_categories - 1) ++ return; ++ category = g_slist_nth_data (priv->info->categories, ei->n_category + 1); ++ entry = g_slist_nth_data (category->entries, 0); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry + 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static void ++panel_addto_select_west_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category, n_entry; ++ gint n_categories; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_entry = 0; ++ n_category = 0; ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ if (ei->n_entry == 0) { ++ if (n_category == 0) ++ return; ++ category = g_slist_nth_data (priv->info->categories, ei->n_category - 1); ++ entry = g_slist_nth_data (category->entries, category->n_entries - 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_west_entry (ei, canvas); ++ return; ++ } ++ } else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry - 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_west_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static void ++panel_addto_select_north_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category = 0; ++ gint n_categories; ++ gint n_visible_entries = 0; ++ gint n_visible_entries_before_me = 0; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ CategoryInfo *catinfo; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ n_visible_entries_before_me = ++ panel_addto_how_many_visible_entries_before_me (category, ei->n_entry); ++ if (n_visible_entries_before_me + 1 - priv->items_per_row <= 0) { ++ if (n_category == 0) { ++ panel_addto_select_first_entry (canvas); ++ return; ++ } ++ n_category--; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ catinfo = category->user_data; ++ if (!catinfo->visible) { ++ while (!catinfo->visible) { ++ category = g_slist_nth_data (priv->info->categories, --n_category); ++ if (!category) ++ return; ++ catinfo = category->user_data; ++ if (!catinfo) ++ return; ++ } ++ } ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ entry = g_slist_nth_data (category->entries, ++ panel_addto_get_rank_of_nth_visible_entry ++ (category, ++ ((n_visible_entries - 1) / priv->items_per_row) * priv->items_per_row ++ + ((n_visible_entries_before_me + 1) % priv->items_per_row))); ++ if (!entry) ++ entry = g_slist_nth_data (category->entries, n_visible_entries - 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry - priv->items_per_row); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static void ++panel_addto_select_south_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category = 0; ++ gint n_categories; ++ gint n_visible_entries = 0; ++ gint n_visible_entries_before_me = 0; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ CategoryInfo *catinfo; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ n_visible_entries_before_me = ++ panel_addto_how_many_visible_entries_before_me (category, ei->n_entry); ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ if (n_visible_entries_before_me + 1 + priv->items_per_row > n_visible_entries - 1) { ++ if (n_visible_entries_before_me + 1 ++ <= ((n_visible_entries - 1) / priv->items_per_row) * priv->items_per_row) { ++ entry = g_slist_nth_data (category->entries, n_visible_entries - 1); ++ } else { ++ if (n_category == priv->info->n_categories - 1) ++ return; ++ n_category++; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ catinfo = category->user_data; ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ entry = g_slist_nth_data (category->entries, ei->n_entry % priv->items_per_row); ++ if (!catinfo->visible) { ++ while (!catinfo->visible) { ++ category = g_slist_nth_data (priv->info->categories, ++n_category); ++ if (!category) ++ return; ++ catinfo = category->user_data; ++ if (!catinfo) ++ return; ++ } ++ } ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ entry = g_slist_nth_data (category->entries, ++ panel_addto_get_rank_of_nth_visible_entry ++ (category, ++ (n_visible_entries_before_me + 1) % priv->items_per_row)); ++ ++ if (!entry) ++ entry = g_slist_nth_data (category->entries, n_visible_entries - 1); ++ } ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry + priv->items_per_row); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static gboolean ++cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, PanelAddtoDialog *dialog) ++{ ++ PanelAddtoCanvas *canvas = (PanelAddtoCanvas *) dialog->canvas; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ EntryInfo *ei = NULL; ++ gint n_category, n_entry; ++ gint n_categories, n_entries; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (event->type == GDK_BUTTON_PRESS) { ++ gtk_drag_source_unset (GTK_WIDGET (canvas)); ++ select_entry (canvas, NULL); ++ gtk_widget_grab_focus (GTK_WIDGET (dialog->canvas)); ++ return TRUE; ++ } ++ ++ if (event->type != GDK_KEY_PRESS) ++ return FALSE; ++ ++ n_entry = 0; ++ n_category = 0; ++ n_categories = priv->info->n_categories; ++ ++ if (priv->selected) { ++ ei = priv->selected->user_data; ++ current_category = g_slist_nth_data (priv->info->categories, ei->n_category); ++ n_entries = current_category->n_entries; ++ } ++ ++ switch (event->key.keyval) { ++ case GDK_KP_Right: ++ case GDK_Right: ++ if (priv->rtl) ++ panel_addto_select_west_entry (ei, canvas); ++ else ++ panel_addto_select_east_entry (ei, canvas); ++ return TRUE; ++ case GDK_KP_Left: ++ case GDK_Left: ++ if (priv->rtl) ++ panel_addto_select_east_entry (ei, canvas); ++ else ++ panel_addto_select_west_entry (ei, canvas); ++ return TRUE; ++ case GDK_KP_Down: ++ case GDK_Down: ++ panel_addto_select_south_entry (ei, canvas); ++ return TRUE; ++ case GDK_KP_Up: ++ case GDK_Up: ++ panel_addto_select_north_entry (ei, canvas); ++ return TRUE; ++ case GDK_Tab: ++ case GDK_KP_Tab: ++ case GDK_ISO_Left_Tab: ++ gtk_widget_grab_focus (dialog->search_entry); ++ break; ++ case GDK_Return: ++ case GDK_KP_Enter: ++ if (priv->selected) ++ activate_entry (priv->selected); ++ ++ return TRUE; ++ break; ++ case GDK_Escape: ++ panel_addto_dialog_response (dialog->addto_dialog, ++ GTK_RESPONSE_CANCEL, ++ dialog); ++ return TRUE; ++ default: ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++ ++static void ++calculate_item_width (PanelAddtoCanvas *canvas, EntryInfo *ei) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PangoLayout *layout; ++ PangoRectangle rectangle; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ layout = GNOME_CANVAS_TEXT (ei->text)->layout; ++ ++ pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR); ++ pango_layout_set_width (layout, -1); ++ pango_layout_get_pixel_extents (layout, NULL, &rectangle); ++ ++ /* If its too big wrap at the max and regen to find the layout */ ++ if (rectangle.width > MAX_ITEM_WIDTH) { ++ pango_layout_set_width (layout, MAX_ITEM_WIDTH * PANGO_SCALE); ++ pango_layout_get_pixel_extents (layout, NULL, &rectangle); ++ rectangle.width = MAX_ITEM_WIDTH; ++ } ++ ++ ei->text_height = rectangle.height; ++ ++ priv->max_item_width = MAX (priv->max_item_width, rectangle.width); ++} ++ ++static void ++calculate_item_height (PanelAddtoCanvas *canvas, EntryInfo *ei) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ gint item_height; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (ei->pixbuf) ++ priv->max_icon_height = MAX (priv->max_icon_height, ei->icon_height); ++ ++ item_height = ei->icon_height + ei->text_height; ++ priv->max_item_height = MAX (priv->max_item_height, item_height); ++} ++ ++static void ++calculate_sizes (PanelAddtoCanvas *canvas) ++{ ++ GSList *l, *m; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ PanelAddtoEntry *current_entry; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ priv->max_item_height = 0; ++ priv->max_icon_height = 0; ++ priv->max_item_width = 0; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ for (m = current_category->entries; m; m = m->next) { ++ current_entry = m->data; ++ EntryInfo *ei = current_entry->user_data; ++ calculate_item_width (canvas, ei); ++ calculate_item_height (canvas, ei); ++ } ++ } ++} ++ ++static void ++gnome_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy) ++{ ++ double translate[6]; ++ ++ g_return_if_fail (item != NULL); ++ g_return_if_fail (GNOME_IS_CANVAS_ITEM (item)); ++ ++ art_affine_translate (translate, dx, dy); ++ ++ gnome_canvas_item_affine_absolute (item, translate); ++} ++ ++static guchar ++lighten_component (guchar cur_value) ++{ ++ int new_value = cur_value; ++ new_value += 24 + (new_value >> 3); ++ if (new_value > 255) { ++ new_value = 255; ++ } ++ return (guchar) new_value; ++} ++ ++static GdkPixbuf * ++create_spotlight_pixbuf (GdkPixbuf* src) ++{ ++ GdkPixbuf *dest; ++ int i, j; ++ int width, height, has_alpha, src_row_stride, dst_row_stride; ++ guchar *target_pixels, *original_pixels; ++ guchar *pixsrc, *pixdest; ++ ++ g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL); ++ g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src) ++ && gdk_pixbuf_get_n_channels (src) == 3) ++ || (gdk_pixbuf_get_has_alpha (src) ++ && gdk_pixbuf_get_n_channels (src) == 4), NULL); ++ g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL); ++ ++ dest = gdk_pixbuf_copy (src); ++ ++ has_alpha = gdk_pixbuf_get_has_alpha (src); ++ width = gdk_pixbuf_get_width (src); ++ height = gdk_pixbuf_get_height (src); ++ dst_row_stride = gdk_pixbuf_get_rowstride (dest); ++ src_row_stride = gdk_pixbuf_get_rowstride (src); ++ target_pixels = gdk_pixbuf_get_pixels (dest); ++ original_pixels = gdk_pixbuf_get_pixels (src); ++ ++ for (i = 0; i < height; i++) { ++ pixdest = target_pixels + i * dst_row_stride; ++ pixsrc = original_pixels + i * src_row_stride; ++ for (j = 0; j < width; j++) { ++ *pixdest++ = lighten_component (*pixsrc++); ++ *pixdest++ = lighten_component (*pixsrc++); ++ *pixdest++ = lighten_component (*pixsrc++); ++ if (has_alpha) { ++ *pixdest++ = *pixsrc++; ++ } ++ } ++ } ++ ++ return dest; ++} ++ ++static void ++build_canvas (PanelAddtoCanvas *canvas) ++{ ++ GSList *l, *m; ++ EntryInfo *ei; ++ PanelAddtoDialog *dialog; ++ PanelAddtoCategory *current_category = NULL; ++ PanelAddtoInformation *current_info = NULL; ++ PanelAddtoEntry *current_entry = NULL; ++ PanelAddtoCanvasPrivate *priv; ++ GnomeCanvas *gcanvas; ++ GnomeCanvasGroup *hidden_group; ++ int i, j, index; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ gcanvas = GNOME_CANVAS (canvas); ++ current_category = priv->info->categories->data; ++ current_entry = current_category->entries->data; ++ dialog = current_entry->dialog; ++ index = 0; ++ ++ priv->under_cover = gnome_canvas_item_new (gnome_canvas_root (gcanvas), ++ panel_addto_event_box_get_type(), ++ NULL); ++ ++ current_info = priv->info; ++ gnome_canvas_item_grab_focus (GNOME_CANVAS_ITEM (gnome_canvas_root (gcanvas))); ++ g_signal_connect (gnome_canvas_root (gcanvas), "event", ++ G_CALLBACK (cb_canvas_event), dialog); ++ ++ hidden_group = GNOME_CANVAS_GROUP (gnome_canvas_item_new (gnome_canvas_root (gcanvas), ++ gnome_canvas_group_get_type (), ++ NULL)); ++ for (l = priv->info->categories, i = 0; l; l = l->next, i++) { ++ ++ CategoryInfo *catinfo; ++ current_category = l->data; ++ ++ if (current_category->user_data == NULL) ++ current_category->user_data = g_new (CategoryInfo, 1); ++ ++ catinfo = current_category->user_data; ++ catinfo->group = NULL; ++ catinfo->title = NULL; ++ catinfo->line = NULL; ++ ++ catinfo->group = ++ GNOME_CANVAS_GROUP (gnome_canvas_item_new (gnome_canvas_root (gcanvas), ++ gnome_canvas_group_get_type (), ++ NULL)); ++ gnome_canvas_item_move_absolute (GNOME_CANVAS_ITEM (catinfo->group), 0, BORDERS); ++ ++ catinfo->line = gnome_canvas_item_new (catinfo->group, ++ gnome_canvas_rect_get_type (), ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) LINE_HEIGHT, ++ NULL); ++ ++ catinfo->title = NULL; ++ ++ if (current_category && (priv->info->n_categories != 1)) { ++ char *label = g_strdup_printf ("%s", current_category->title); ++ catinfo->title = gnome_canvas_item_new (catinfo->group, ++ gnome_canvas_text_get_type (), ++ "text", current_category->title, ++ "markup", label, ++ "anchor", GTK_ANCHOR_NW, ++ NULL); ++ g_free (label); ++ } ++ ++ for (m = current_category->entries, j = 0; m; m = m->next, j++) { ++ current_entry = m->data; ++ ++ if (current_entry->user_data == NULL) ++ current_entry->user_data = g_new0 (EntryInfo, 1); ++ ++ ei = current_entry->user_data; ++ ++ ei->canvas = canvas; ++ ei->group = GNOME_CANVAS_GROUP ( ++ gnome_canvas_item_new (catinfo->group, ++ gnome_canvas_group_get_type (), ++ NULL)); ++ ei->selection = gnome_canvas_item_new ( ++ ei->group, ++ PANEL_ADDTO_TYPE_ROUNDED_RECT, ++ NULL); ++ ++ if (current_entry->title) { ++ ei->text = gnome_canvas_item_new (ei->group, ++ gnome_canvas_text_get_type (), ++ "anchor", GTK_ANCHOR_NW, ++ "justification", GTK_JUSTIFY_CENTER, ++ "clip", TRUE, ++ NULL); ++ pango_layout_set_alignment (GNOME_CANVAS_TEXT (ei->text)->layout, ++ PANGO_ALIGN_CENTER); ++ pango_layout_set_justify (GNOME_CANVAS_TEXT (ei->text)->layout, ++ FALSE); ++ g_object_set (ei->text, ++ "text", current_entry->title, ++ NULL); ++ } else ++ ei->text = NULL; ++ ++ if (current_entry->icon_pixbuf) { ++ GdkPixbuf *pixbuf = current_entry->icon_pixbuf; ++ GdkPixbuf *highlight_pixbuf = ++ create_spotlight_pixbuf (pixbuf); ++ ++ ei->icon_height = gdk_pixbuf_get_height (pixbuf); ++ ei->icon_width = gdk_pixbuf_get_width (pixbuf); ++ ei->pixbuf = gnome_canvas_item_new (ei->group, ++ gnome_canvas_pixbuf_get_type (), ++ "pixbuf", pixbuf, ++ NULL); ++ g_object_unref (pixbuf); ++ ei->highlight_pixbuf = gnome_canvas_item_new (ei->group, ++ gnome_canvas_pixbuf_get_type (), ++ "pixbuf", highlight_pixbuf, ++ NULL); ++ g_object_unref (highlight_pixbuf); ++ } else { ++ ei->pixbuf = NULL; ++ ei->highlight_pixbuf = NULL; ++ } ++ ++ ei->cover = gnome_canvas_item_new (ei->group, ++ panel_addto_event_box_get_type(), ++ NULL); ++ calculate_item_width (canvas, ei); ++ calculate_item_height (canvas, ei); ++ ++ ei->n_category = i; ++ ei->n_entry = j; ++ ei->index = index; ++ ++ setup_entry (canvas, current_entry); ++ ++ g_signal_connect (ei->cover, "event", ++ G_CALLBACK (cover_event), ++ current_entry); ++ index++; ++ } ++ } ++ ++ dialog = current_entry->dialog; ++ ++ g_signal_connect (G_OBJECT (canvas), "selection-changed", ++ G_CALLBACK (panel_addto_selection_changed), current_entry->dialog); ++} ++ ++ ++static const char * ++panel_addto_utf8_casestrstr (const char *haystack, const char *needle) ++{ ++ ++ if (!haystack) ++ return NULL; ++ ++ haystack = g_utf8_strdown (haystack, -1); ++ needle = g_utf8_strdown (needle, -1); ++ ++ const char *s; ++ gsize i; ++ gsize haystack_len = g_utf8_strlen (haystack, -1); ++ gsize needle_len = g_utf8_strlen (needle, -1); ++ int needle_size = strlen (needle); ++ ++ if (needle_len > haystack_len) ++ return NULL; ++ ++ s = haystack; ++ for (i = 0; i <= haystack_len - needle_len; i++) { ++ if (strncmp (s, needle, needle_size) == 0) ++ return s; ++ s = g_utf8_next_char (s); ++ } ++ ++ return NULL; ++} ++ ++void ++panel_addto_relayout_for_search (GtkWidget *search_entry, PanelAddtoDialog *dialog) ++{ ++ gchar *search_text; ++ PanelAddtoCanvasPrivate *priv; ++ ++ search_text = g_malloc (strlen ((gchar*) gtk_entry_get_text (GTK_ENTRY (search_entry))) + 1); ++ g_stpcpy (search_text, gtk_entry_get_text (GTK_ENTRY (search_entry))); ++ g_strchomp (search_text); ++ if (dialog->canvas) { ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ priv->search_text = search_text; ++ gtk_widget_queue_resize (GTK_WIDGET (dialog->canvas)); ++ } ++} ++ ++void ++panel_addto_activate_from_searchbar (GtkWidget *search_entry, PanelAddtoDialog *dialog) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ if (priv->selected) ++ activate_entry (priv->selected); ++} ++ ++/* If we can't find the search query in the applet's name, in the applet's ++ * description, nor in the applet's category, then the applet has to be hidden. ++ */ ++ ++static gboolean ++panel_addto_entry_must_be_hidden (PanelAddtoEntry *entry, const gchar **search_terms) ++{ ++ gint i; ++ gint nb_search_terms = 0, nb_found = 0; ++ gboolean search_is_null = TRUE; ++ ++ for (i = 0; search_terms[i] != NULL; i++) { ++ nb_search_terms ++; ++ search_is_null = FALSE; ++ if ( ++ (entry->title ++ && panel_addto_utf8_casestrstr (g_locale_to_utf8 (entry->title, -1, NULL, NULL, NULL), ++ g_locale_to_utf8 (search_terms[i], -1, NULL, NULL, NULL))) ++ || (entry->comment ++ && panel_addto_utf8_casestrstr (g_locale_to_utf8 (entry->comment, -1, NULL, NULL, NULL), ++ g_locale_to_utf8 (search_terms[i], -1, NULL, NULL, NULL))) ++ || (entry->category->title ++ && panel_addto_utf8_casestrstr (g_locale_to_utf8 (entry->category->title, -1, NULL, NULL, NULL), ++ g_locale_to_utf8 (search_terms[i], -1, NULL, NULL, NULL)))) ++ nb_found++; ++ } ++ ++ if (search_is_null || nb_found == nb_search_terms) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++/* A category canvas item contains all the elements ++ * for the category, as well as the title and a separator ++ */ ++static void ++relayout_category (PanelAddtoCanvas *canvas, CategoryInfo *catinfo, ++ gint vert_pos, gint *category_vert_pos) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ gnome_canvas_item_move_absolute (GNOME_CANVAS_ITEM (catinfo->group), ++ 0, vert_pos); ++ ++ if (catinfo->line) { ++ gnome_canvas_item_move_absolute (catinfo->line, BORDERS, ABOVE_LINE_SPACING); ++ ++ gnome_canvas_item_set (catinfo->line, ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) LINE_HEIGHT, ++ NULL); ++ } ++ ++ if (catinfo->title) { ++ double text_height, text_width; ++ ++ g_object_get (catinfo->title, ++ "text_height", &text_height, ++ "text_width", &text_width, ++ NULL); ++ ++ *category_vert_pos += text_height; /* move it down 1 line */ ++ gnome_canvas_item_move_absolute (catinfo->title, ++ (priv->rtl) ? priv->max_width - BORDERS - text_width : BORDERS, ++ *category_vert_pos); ++ *category_vert_pos += text_height + text_height/2 + UNDER_TITLE_SPACING; ++ } ++} ++ ++static void ++relayout_item (PanelAddtoCanvas *canvas, EntryInfo *ei, ++ gint category_horiz_pos, gint category_vert_pos) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ gnome_canvas_item_move_absolute (GNOME_CANVAS_ITEM (ei->group), ++ category_horiz_pos, ++ category_vert_pos); ++ ++ gnome_canvas_item_set (ei->selection, ++ "x2", (double) priv->max_item_width + 2 * PAD, ++ "y2", (double) ei->text_height + 1, /* expand it down slightly */ ++ NULL); ++ ++ gnome_canvas_item_move_absolute (ei->selection, -PAD, priv->max_icon_height); ++ ++ if (ei->text) { ++ /* canvas asks layout for its extent, layout gives real ++ * size, not fixed width and drawing gets confused. ++ */ ++ gnome_canvas_item_set (ei->text, ++ "clip_width", (double) priv->max_item_width, ++ "clip_height", (double) priv->max_item_height, ++ NULL); ++ ++ /* text is centered by pango */ ++ pango_layout_set_width (GNOME_CANVAS_TEXT (ei->text)->layout, ++ (gint) priv->max_item_width * PANGO_SCALE); ++ ++ gnome_canvas_item_move_absolute (ei->text, ++ 0, priv->max_icon_height); ++ } ++ ++ if (ei->pixbuf) { ++ /* manually center the icon */ ++ gnome_canvas_item_move_absolute (ei->pixbuf, ++ priv->max_item_width / 2 - ei->icon_width / 2, 0); ++ gnome_canvas_item_move_absolute (ei->highlight_pixbuf, ++ priv->max_item_width / 2 - ei->icon_width / 2, 0); ++ } ++ ++ /* cover the item */ ++ gnome_canvas_item_set (ei->cover, ++ "x2", (double) priv->max_item_width, ++ "y2", (double) priv->max_item_height, ++ NULL); ++} ++ ++static void ++relayout_canvas (PanelAddtoCanvas *canvas) ++{ ++ gint entry; ++ gint vert_pos, category_vert_pos, category_horiz_pos; ++ gint real_width; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ PanelAddtoEntry *current_entry; ++ CategoryInfo *catinfo; ++ EntryInfo *ei; ++ GSList *l, *m; ++ gboolean at_least_one_found, first_shown_category, first_shown_entry; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ real_width = priv->max_width - 2 * BORDERS + ITEMS_SEPARATION; ++ priv->items_per_row = real_width / ((gint) priv->max_item_width + ITEMS_SEPARATION); ++ ++ vert_pos = BORDERS; ++ ++ const gchar *search_text = priv->search_text; ++ gchar **search_terms; ++ search_terms = search_text ? g_strsplit (search_text, " ", 0) : NULL; ++ ++ first_shown_category = TRUE; ++ first_shown_entry = TRUE; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ ++ at_least_one_found = FALSE; ++ category_vert_pos = 0; ++ ++ category_horiz_pos = (priv->rtl) ? priv->max_width - (gint) priv->max_item_width - BORDERS : BORDERS; ++ ++ current_category = l->data; ++ catinfo = current_category->user_data; ++ ++ relayout_category (canvas, catinfo, vert_pos, &category_vert_pos); ++ category_vert_pos += UNDER_LINE_SPACING; ++ ++ for (m = current_category->entries, entry = 0; m; m = m->next, entry++) { ++ ++ current_entry = m->data; ++ ei = current_entry->user_data; ++ ++ /* we don't want the first item to wrap, it would ++ be too separated from the section title */ ++ ++ if (!search_text || !panel_addto_entry_must_be_hidden (current_entry, (const gchar **)search_terms)) { ++ at_least_one_found = TRUE; ++ gnome_canvas_item_show (GNOME_CANVAS_ITEM (ei->group)); ++ ei->visible = TRUE; ++ if ((entry > 0) && ++ ((priv->items_per_row == 0) || ++ (priv->items_per_row > 0 && (entry % priv->items_per_row == 0)))) { ++ ++ category_horiz_pos = (priv->rtl) ? ++ priv->max_width - (gint) priv->max_item_width - BORDERS : BORDERS; ++ category_vert_pos += (gint) priv->max_item_height + ITEMS_SEPARATION; ++ } ++ ++ relayout_item (canvas, ei, category_horiz_pos, category_vert_pos); ++ ++ if (priv->rtl) ++ category_horiz_pos -= (gint) priv->max_item_width + ITEMS_SEPARATION; ++ else ++ category_horiz_pos += (gint) priv->max_item_width + ITEMS_SEPARATION; ++ ++ /* If the user is actually using the search bar, select ++ * the first shown entry. ++ */ ++ if (search_text && first_shown_entry) { ++ select_entry (canvas, current_entry); ++ first_shown_entry = FALSE; ++ } ++ } else { ++ gnome_canvas_item_hide (GNOME_CANVAS_ITEM (ei->group)); ++ ei->visible = FALSE; ++ entry --; ++ } ++ ++ } ++ if (at_least_one_found) { ++ gnome_canvas_item_show (GNOME_CANVAS_ITEM (catinfo->group)); ++ catinfo->visible = TRUE; ++ category_vert_pos += (gint) priv->max_item_height; ++ vert_pos += category_vert_pos + ITEMS_SEPARATION; ++ ++ if (first_shown_category) { ++ g_object_set (catinfo->line, ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) 0, ++ NULL); ++ first_shown_category = FALSE; ++ } else { ++ g_object_set (catinfo->line, ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) LINE_HEIGHT, ++ NULL); ++ } ++ ++ } else { ++ gnome_canvas_item_hide (GNOME_CANVAS_ITEM (catinfo->group)); ++ catinfo->visible = FALSE; ++ } ++ } ++ ++ /* substract the last ITEMS_SEPARATION to ++ adjust the canvas size a bit more */ ++ vert_pos -= ITEMS_SEPARATION; ++ ++ priv->height = MAX (vert_pos, priv->min_height); ++ priv->width = priv->max_width; ++} ++ ++ ++static void ++set_style (PanelAddtoCanvas *canvas, gboolean font_changed) ++{ ++ GSList *l, *m; ++ PanelAddtoCategory *current_category; ++ PanelAddtoEntry *current_entry; ++ PanelAddtoCanvasPrivate *priv; ++ GtkWidget *widget = GTK_WIDGET (canvas); ++ ++ ++ if (!GTK_WIDGET_REALIZED (widget)) ++ return; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ CategoryInfo *catinfo = current_category->user_data; ++ ++ if (catinfo->line) { ++ g_object_set (catinfo->line, ++ "fill_color_gdk", &widget->style->text_aa[GTK_STATE_NORMAL], ++ NULL); ++ } ++ if (catinfo->title) { ++ g_object_set (catinfo->title, ++ "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL], ++ NULL); ++ ++ if (font_changed) ++ g_object_set (catinfo->title, ++ "font", NULL, ++ NULL); ++ } ++ ++ for (m = current_category->entries; m; m = m->next) { ++ current_entry = m->data; ++ EntryInfo *entryinfo = current_entry->user_data; ++ if (font_changed && entryinfo->text) ++ g_object_set (entryinfo->text, ++ "font", NULL, ++ NULL); ++ setup_entry (canvas, current_entry); ++ } ++ } ++ ++ if (font_changed) { ++ calculate_sizes (canvas); ++ relayout_canvas (canvas); ++ } ++} ++ ++ ++GtkWidget* ++panel_addto_canvas_new (PanelAddtoInformation *info) ++{ ++ ++ return g_object_new (PANEL_ADDTO_TYPE_CANVAS, ++ "info", info, ++ NULL); ++} ++ ++/* Accessibility support */ ++ ++static gpointer accessible_parent_class; ++static gpointer accessible_item_parent_class; ++ ++enum { ++ ACTION_ACTIVATE, ++ LAST_ACTION ++}; ++ ++typedef struct { ++ AtkObject parent; ++ ++ PanelAddtoEntry *entry; ++ AtkStateSet *state_set; ++ ++ guint action_idle_handler; ++} PanelAddtoCanvasItemAccessible; ++ ++typedef struct { ++ AtkObjectClass parent_class; ++} PanelAddtoCanvasItemAccessibleClass; ++ ++static const gchar *const action_names[] = ++{ ++ "activate", ++ NULL ++}; ++ ++static const gchar *const action_descriptions[] = ++{ ++ "Activate item", ++ NULL ++}; ++ ++static void ++panel_addto_canvas_item_accessible_get_extents (AtkComponent *component, ++ gint *x, ++ gint *y, ++ gint *width, ++ gint *height, ++ AtkCoordType coord_type) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoCanvas *canvas; ++ GnomeCanvasItem *cover; ++ AtkObject *parent_object; ++ gint p_x, p_y; ++ ++ item = (PanelAddtoCanvasItemAccessible *) component; ++ ++ canvas = ((EntryInfo *) item->entry->user_data)->canvas; ++ parent_object = gtk_widget_get_accessible (GTK_WIDGET (canvas)); ++ atk_component_get_position (ATK_COMPONENT (parent_object), &p_x, &p_y, coord_type); ++ ++ ++ /* the cover pretty much represents the item size */ ++ ++ ++ cover = GNOME_CANVAS_ITEM (((EntryInfo *)item->entry->user_data)->cover); ++ ++ *x = p_x + cover->x1; ++ *y = p_y + cover->y1; ++ *width = cover->x2 - cover->x1; ++ *height = cover->y2 - cover->y1; ++} ++ ++static void ++atk_component_item_interface_init (AtkComponentIface *iface) ++{ ++ iface->get_extents = panel_addto_canvas_item_accessible_get_extents; ++} ++ ++static gboolean ++idle_do_action (gpointer data) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ item = (PanelAddtoCanvasItemAccessible *) data; ++ ++ item->action_idle_handler = 0; ++ activate_entry (item->entry); ++ ++ return FALSE; ++} ++ ++ ++static gboolean ++panel_addto_canvas_item_accessible_action_do_action (AtkAction *action, ++ gint index) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ if (index < 0 || index >= LAST_ACTION) ++ return FALSE; ++ ++ item = (PanelAddtoCanvasItemAccessible *) action; ++ ++ switch (index) { ++ case ACTION_ACTIVATE: ++ if (!item->action_idle_handler) ++ item->action_idle_handler = g_idle_add (idle_do_action, item); ++ break; ++ default: ++ g_assert_not_reached (); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++static gint ++panel_addto_canvas_item_accessible_action_get_n_actions (AtkAction *action) ++{ ++ return LAST_ACTION; ++} ++ ++static const gchar * ++panel_addto_canvas_item_accessible_action_get_description (AtkAction *action, ++ gint index) ++{ ++ if (index < 0 || index >= LAST_ACTION) ++ return NULL; ++ ++ return action_descriptions[index]; ++} ++ ++static const gchar * ++panel_addto_canvas_item_accessible_action_get_name (AtkAction *action, ++ gint index) ++{ ++ if (index < 0 || index >= LAST_ACTION) ++ return NULL; ++ ++ return action_names[index]; ++} ++ ++static void ++atk_action_item_interface_init (AtkActionIface *iface) ++{ ++ iface->do_action = panel_addto_canvas_item_accessible_action_do_action; ++ iface->get_n_actions = panel_addto_canvas_item_accessible_action_get_n_actions; ++ iface->get_description = panel_addto_canvas_item_accessible_action_get_description; ++ iface->get_name = panel_addto_canvas_item_accessible_action_get_name; ++} ++ ++static gint ++panel_addto_canvas_item_accessible_get_index_in_parent (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ ++ return ((EntryInfo *) item->entry->user_data)->index; ++} ++ ++static G_CONST_RETURN gchar* ++panel_addto_canvas_item_accessible_get_name (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ if (object->name) ++ return object->name; ++ else { ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ ++ if (item->entry && item->entry->title) ++ return item->entry->title; ++ else ++ return "Item with no description"; ++ } ++} ++ ++static AtkObject* ++panel_addto_canvas_item_accessible_get_parent (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoCanvas *canvas; ++ ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ canvas = ((EntryInfo *) item->entry->user_data)->canvas; ++ ++ return gtk_widget_get_accessible (GTK_WIDGET (canvas)); ++} ++ ++static AtkStateSet* ++panel_addto_canvas_item_accessible_ref_state_set (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ canvas = ((EntryInfo *) item->entry->user_data)->canvas; ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (item->entry == priv->selected) ++ atk_state_set_add_state (item->state_set, ATK_STATE_FOCUSED); ++ else ++ atk_state_set_remove_state (item->state_set, ATK_STATE_FOCUSED); ++ ++ return g_object_ref (item->state_set); ++} ++ ++static void ++panel_addto_canvas_item_accessible_class_init (AtkObjectClass *class) ++{ ++ GObjectClass *object_class; ++ ++ accessible_item_parent_class = g_type_class_peek_parent (class); ++ ++ object_class = (GObjectClass *)class; ++ ++ class->get_index_in_parent = panel_addto_canvas_item_accessible_get_index_in_parent; ++ class->get_name = panel_addto_canvas_item_accessible_get_name; ++ class->get_parent = panel_addto_canvas_item_accessible_get_parent; ++ class->ref_state_set = panel_addto_canvas_item_accessible_ref_state_set; ++} ++ ++static void ++panel_addto_canvas_item_accessible_object_init (PanelAddtoCanvasItemAccessible *item) ++{ ++ item->state_set = atk_state_set_new (); ++ ++ atk_state_set_add_state (item->state_set, ATK_STATE_ENABLED); ++ atk_state_set_add_state (item->state_set, ATK_STATE_FOCUSABLE); ++ atk_state_set_add_state (item->state_set, ATK_STATE_SENSITIVE); ++ atk_state_set_add_state (item->state_set, ATK_STATE_SELECTABLE); ++ atk_state_set_add_state (item->state_set, ATK_STATE_VISIBLE); ++ ++ item->action_idle_handler = 0; ++} ++ ++static GType ++panel_addto_canvas_item_accessible_get_type (void) ++{ ++ static GType type = 0; ++ ++ if (type == 0) { ++ static const GTypeInfo info = { ++ sizeof (PanelAddtoCanvasItemAccessibleClass), ++ (GBaseInitFunc) NULL, /* base init */ ++ (GBaseFinalizeFunc) NULL, /* base finalize */ ++ (GClassInitFunc) panel_addto_canvas_item_accessible_class_init, /* class init */ ++ (GClassFinalizeFunc) NULL, /* class finalize */ ++ NULL, /* class data */ ++ sizeof (PanelAddtoCanvasItemAccessible), /* instance size */ ++ 0, /* nb preallocs */ ++ (GInstanceInitFunc) panel_addto_canvas_item_accessible_object_init, /* instance init */ ++ NULL /* value table */ ++ }; ++ ++ static const GInterfaceInfo atk_component_info = { ++ (GInterfaceInitFunc) atk_component_item_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ static const GInterfaceInfo atk_action_info = { ++ (GInterfaceInitFunc) atk_action_item_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ type = g_type_register_static (ATK_TYPE_OBJECT, ++ "PanelAddtoCanvasItemAccessible", &info, 0); ++ ++ g_type_add_interface_static (type, ATK_TYPE_COMPONENT, ++ &atk_component_info); ++ g_type_add_interface_static (type, ATK_TYPE_ACTION, ++ &atk_action_info); ++ } ++ ++ return type; ++} ++ ++static gint ++panel_addto_canvas_accessible_get_n_children (AtkObject *accessible) ++{ ++ GSList *l; ++ PanelAddtoCategory *current_category; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ gint count; ++ ++ widget = GTK_ACCESSIBLE (accessible)->widget; ++ ++ if (!widget) ++ return 0; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ count = 0; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ count += current_category->n_entries; ++ } ++ ++ return count; ++} ++ ++static PanelAddtoEntry* ++panel_addto_canvas_accessible_get_entry (PanelAddtoCanvas *canvas, gint index) ++{ ++ GSList *l; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ gint count; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ count = 0; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ if (index >= count && ++ index < count + current_category->n_entries) { ++ return g_slist_nth_data (current_category->entries, index - count); ++ } else ++ count += current_category->n_entries; ++ } ++ ++ return NULL; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_ref_child (AtkObject *accessible, gint index) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoEntry *entry; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ AtkObject *object; ++ ++ widget = GTK_ACCESSIBLE (accessible)->widget; ++ ++ if (!widget) ++ return NULL; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ entry = panel_addto_canvas_accessible_get_entry (canvas, index); ++ ++ if (!entry) ++ return NULL; ++ ++ object = g_hash_table_lookup (priv->accessible_children, &index); ++ ++ if (!object) { ++ object = g_object_new (panel_addto_canvas_item_accessible_get_type (), NULL); ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ ++ object->role = ATK_ROLE_ICON; ++ item->entry = entry; ++ ++ g_hash_table_insert (priv->accessible_children, ++ &((EntryInfo *) entry->user_data)->index, object); ++ } ++ ++ return g_object_ref (object); ++} ++ ++static void ++panel_addto_canvas_accessible_initialize (AtkObject *accessible, gpointer data) ++{ ++ if (ATK_OBJECT_CLASS (accessible_parent_class)->initialize) ++ ATK_OBJECT_CLASS (accessible_parent_class)->initialize (accessible, data); ++ ++ accessible->role = ATK_ROLE_LAYERED_PANE; ++} ++ ++static void ++panel_addto_canvas_accessible_class_init (AtkObjectClass *class) ++{ ++ GObjectClass *object_class; ++ GtkAccessibleClass *accessible_class; ++ ++ accessible_parent_class = g_type_class_peek_parent (class); ++ ++ object_class = (GObjectClass *)class; ++ accessible_class = (GtkAccessibleClass *)class; ++ ++ class->get_n_children = panel_addto_canvas_accessible_get_n_children; ++ class->ref_child = panel_addto_canvas_accessible_ref_child; ++ class->initialize = panel_addto_canvas_accessible_initialize; ++} ++ ++static gboolean ++panel_addto_canvas_accessible_add_selection (AtkSelection *selection, gint i) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ PanelAddtoEntry *entry; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return FALSE; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ entry = panel_addto_canvas_accessible_get_entry (canvas, i); ++ select_entry (canvas, entry); ++ ++ return TRUE; ++} ++ ++static gboolean ++panel_addto_canvas_accessible_clear_selection (AtkSelection *selection) ++{ ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return FALSE; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ select_entry (canvas, NULL); ++ ++ return TRUE; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_ref_selection (AtkSelection *selection, gint i) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return NULL; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (priv->selected) ++ return atk_object_ref_accessible_child (gtk_widget_get_accessible (widget), ++ ((EntryInfo *)priv->selected->user_data)->index); ++ return NULL; ++} ++ ++static gint ++panel_addto_canvas_accessible_get_selection_count (AtkSelection *selection) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return 0; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ return (priv->selected) ? 1 : 0; ++} ++ ++static gboolean ++panel_addto_canvas_accessible_is_child_selected (AtkSelection *selection, gint i) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return FALSE; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ return (priv->selected == panel_addto_canvas_accessible_get_entry (canvas, i)); ++} ++ ++static gboolean ++panel_addto_canvas_accessible_remove_selection (AtkSelection *selection, gint i) ++{ ++ /* There can be only one item selected */ ++ return panel_addto_canvas_accessible_clear_selection (selection); ++} ++ ++static gboolean ++panel_addto_canvas_accessible_select_all_selection (AtkSelection *selection) ++{ ++ /* This can't happen */ ++ return FALSE; ++} ++ ++static void ++panel_addto_canvas_accessible_selection_interface_init (AtkSelectionIface *iface) ++{ ++ iface->add_selection = panel_addto_canvas_accessible_add_selection; ++ iface->clear_selection = panel_addto_canvas_accessible_clear_selection; ++ iface->ref_selection = panel_addto_canvas_accessible_ref_selection; ++ iface->get_selection_count = panel_addto_canvas_accessible_get_selection_count; ++ iface->is_child_selected = panel_addto_canvas_accessible_is_child_selected; ++ iface->remove_selection = panel_addto_canvas_accessible_remove_selection; ++ iface->select_all_selection = panel_addto_canvas_accessible_select_all_selection; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_ref_accessible_at_point (AtkComponent *component, ++ gint x, ++ gint y, ++ AtkCoordType coord_type) ++{ ++ GSList *l, *m; ++ GtkWidget *widget; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ PanelAddtoCategory *current_category; ++ EntryInfo *entry; ++ gint x_pos, y_pos, x_w, y_w; ++ ++ widget = GTK_ACCESSIBLE (component)->widget; ++ ++ if (widget == NULL) ++ return NULL; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ atk_component_get_extents (component, &x_pos, &y_pos, NULL, NULL, coord_type); ++ x_w = x - x_pos; ++ y_w = y - y_pos; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ for (m = current_category->entries; m; m = m->next) { ++ entry = (EntryInfo *) m->data; ++ ++ if (x_w > entry->cover->x1 && ++ x_w < entry->cover->x2 && ++ y_w > entry->cover->y1 && ++ y_w < entry->cover->y2) ++ return panel_addto_canvas_accessible_ref_child (ATK_OBJECT (component), entry->index); ++ } ++ } ++ ++ return NULL; ++} ++ ++static void ++atk_component_interface_init (AtkComponentIface *iface) ++{ ++ iface->ref_accessible_at_point = panel_addto_canvas_accessible_ref_accessible_at_point; ++} ++ ++static GType ++panel_addto_canvas_accessible_get_type (void) ++{ ++ static GType type = 0; ++ AtkObjectFactory *factory; ++ GType derived_type; ++ GTypeQuery query; ++ GType derived_atk_type; ++ ++ if (type == 0) { ++ static GTypeInfo info = { ++ 0, /* class size */ ++ (GBaseInitFunc) NULL, /* base init */ ++ (GBaseFinalizeFunc) NULL, /* base finalize */ ++ (GClassInitFunc) panel_addto_canvas_accessible_class_init, ++ (GClassFinalizeFunc) NULL, /* class finalize */ ++ NULL, /* class data */ ++ 0, /* instance size */ ++ 0, /* nb preallocs */ ++ (GInstanceInitFunc) NULL, /* instance init */ ++ NULL /* value table */ ++ }; ++ ++ static const GInterfaceInfo atk_component_info = { ++ (GInterfaceInitFunc) atk_component_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ static const GInterfaceInfo atk_selection_info = { ++ (GInterfaceInitFunc) panel_addto_canvas_accessible_selection_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ derived_type = g_type_parent (PANEL_ADDTO_TYPE_CANVAS); ++ factory = atk_registry_get_factory (atk_get_default_registry (), ++ derived_type); ++ ++ derived_atk_type = atk_object_factory_get_accessible_type (factory); ++ g_type_query (derived_atk_type, &query); ++ ++ info.class_size = query.class_size; ++ info.instance_size = query.instance_size; ++ ++ type = g_type_register_static (derived_atk_type, ++ "PanelAddtoCanvasAccessible", ++ &info, 0); ++ ++ g_type_add_interface_static (type, ++ ATK_TYPE_COMPONENT, ++ &atk_component_info); ++ g_type_add_interface_static (type, ++ ATK_TYPE_SELECTION, ++ &atk_selection_info); ++ } ++ ++ return type; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_new (GObject *object) ++{ ++ AtkObject *accessible; ++ ++ accessible = g_object_new (panel_addto_canvas_accessible_get_type (), NULL); ++ atk_object_initialize (accessible, object); ++ ++ return accessible; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_factory_create_accessible (GObject *object) ++{ ++ return panel_addto_canvas_accessible_new (object); ++} ++ ++static void ++panel_addto_canvas_accessible_factory_class_init (AtkObjectFactoryClass *class) ++{ ++ class->create_accessible = panel_addto_canvas_accessible_factory_create_accessible; ++ class->get_accessible_type = panel_addto_canvas_accessible_get_type; ++} ++ ++static GType ++panel_addto_canvas_accessible_factory_get_type (void) ++{ ++ static GType type = 0; ++ ++ if (type == 0) { ++ static const GTypeInfo info = { ++ sizeof (AtkObjectFactoryClass), ++ NULL, /* base_init */ ++ NULL, /* base_finalize */ ++ (GClassInitFunc) panel_addto_canvas_accessible_factory_class_init, ++ NULL, /* class_finalize */ ++ NULL, /* class_data */ ++ sizeof (AtkObjectFactory), ++ 0, /* n_preallocs */ ++ NULL, NULL ++ }; ++ ++ type = g_type_register_static (ATK_TYPE_OBJECT_FACTORY, ++ "PanelAddtoCanvasAccessibleFactory", ++ &info, 0); ++ } ++ ++ return type; ++} ++ ++static AtkObject* ++panel_addto_canvas_get_accessible (GtkWidget *widget) ++{ ++ static gboolean already_here = FALSE; ++ ++ if (!already_here) { ++ AtkObjectFactory *factory; ++ AtkRegistry *registry; ++ GType derived_type; ++ GType derived_atk_type; ++ ++ already_here = TRUE; ++ ++ derived_type = g_type_parent (PANEL_ADDTO_TYPE_CANVAS); ++ ++ registry = atk_get_default_registry (); ++ factory = atk_registry_get_factory (registry, derived_type); ++ ++ derived_atk_type = atk_object_factory_get_accessible_type (factory); ++ ++ if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) { ++ atk_registry_set_factory_type (registry, ++ PANEL_ADDTO_TYPE_CANVAS, ++ panel_addto_canvas_accessible_factory_get_type ()); ++ } ++ } ++ ++ return (* GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->get_accessible) (widget); ++} +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-addto-canvas.h gnome-panel-2.17.92.new/gnome-panel/panel-addto-canvas.h +--- gnome-panel-2.17.92/gnome-panel/panel-addto-canvas.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-addto-canvas.h 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,88 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* Copyright (C) 2005 Carlos Garnacho ++ * ++ * 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 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. ++ * ++ * Authors: Jody Goldberg ++ * Carlos Garnacho Parro ++ * Manu Cornet ++ */ ++ ++#ifndef PANEL_ADDTO_CANVAS_H ++#define PANEL_ADDTO_CANVAS_H ++ ++#include ++#include ++#include "panel-addto.h" ++ ++G_BEGIN_DECLS ++ ++#define PANEL_ADDTO_TYPE_CANVAS (panel_addto_canvas_get_type ()) ++#define PANEL_ADDTO_CANVAS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvas)) ++#define PANEL_ADDTO_CANVAS_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasClass)) ++#define PANEL_ADDTO_IS_CANVAS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_ADDTO_TYPE_CANVAS)) ++#define PANEL_ADDTO_IS_CANVAS_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), PANEL_ADDTO_TYPE_CANVAS)) ++#define PANEL_ADDTO_CANVAS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasClass)) ++ ++typedef struct _PanelAddtoCanvas PanelAddtoCanvas; ++typedef struct _PanelAddtoCanvasClass PanelAddtoCanvasClass; ++ ++struct _PanelAddtoCanvas { ++ GnomeCanvas parent; ++}; ++ ++struct _PanelAddtoCanvasClass { ++ GnomeCanvasClass parent_class; ++ ++ void (*changed) (PanelAddtoCanvas *canvas, gchar *str); ++}; ++ ++typedef struct _PanelAddtoCanvasPrivate PanelAddtoCanvasPrivate; ++ ++struct _PanelAddtoCanvasPrivate { ++ GnomeCanvasItem *under_cover; ++ double height; ++ double width; ++ ++ double min_height; ++ double max_width; ++ PanelAddtoInformation *info; ++ PanelAddtoEntry *selected; ++ ++ gboolean rtl; ++ gint items_per_row; ++ gint selected_row; ++ ++ gchar *search_text; ++ ++ /* calculated sizes ++ for the elements */ ++ gdouble max_item_width; ++ gdouble max_item_height; ++ gdouble max_icon_height; ++ ++ /* accessibility stuff */ ++ GHashTable *accessible_children; ++}; ++ ++GType panel_addto_canvas_get_type (void); ++void activate_entry (PanelAddtoEntry *entry); ++void panel_addto_relayout_for_search (GtkWidget *search_entry, PanelAddtoDialog *dialog); ++void panel_addto_activate_from_searchbar (GtkWidget *search_entry, PanelAddtoDialog *dialog); ++GtkWidget* panel_addto_canvas_new (PanelAddtoInformation *info); ++ ++G_END_DECLS ++ ++#endif /* PANEL_ADDTO_CANVAS_H */ +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-addto-event-box.c gnome-panel-2.17.92.new/gnome-panel/panel-addto-event-box.c +--- gnome-panel-2.17.92/gnome-panel/panel-addto-event-box.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-addto-event-box.c 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,99 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation ++ * All rights reserved. ++ * ++ * This file is part of the Gnome Library. ++ * ++ * The Gnome Library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * The Gnome Library 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 Library General Public ++ * License along with the Gnome Library; see the file COPYING.LIB. If not, ++ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++/* ++ @NOTATION@ ++ */ ++/* Event box item type for GnomeCanvas widget ++ * ++ * GnomeCanvas is basically a port of the Tk toolkit's most excellent canvas widget. Tk is ++ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties. ++ * ++ * ++ * Author: Chris Lahey ++ */ ++ ++#include ++ ++#include "panel-addto-event-box.h" ++ ++#define noVERBOSE ++ ++static GnomeCanvasItemClass *parent_class; ++ ++static double ++panel_addto_event_box_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, ++ GnomeCanvasItem **actual_item) ++{ ++ double x1, x2, y1, y2; ++ g_object_get (item, ++ "x1", &x1, ++ "x2", &x2, ++ "y1", &y1, ++ "y2", &y2, ++ NULL); ++ if (x <= x2 && x >= x1 && ++ y <= y2 && y >= y1) { ++ *actual_item = item; ++ ++ return 0.0; ++ } ++ return 1e12; ++} ++ ++static void ++panel_addto_event_box_class_init (PanelAddtoEventBoxClass *class) ++{ ++ GnomeCanvasItemClass *item_class; ++ ++ item_class = (GnomeCanvasItemClass *) class; ++ ++ parent_class = g_type_class_peek_parent (class); ++ ++ item_class->point = panel_addto_event_box_point; ++} ++ ++GType ++panel_addto_event_box_get_type (void) ++{ ++ static GType type; ++ ++ if (!type) { ++ static const GTypeInfo object_info = { ++ sizeof (PanelAddtoEventBoxClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) panel_addto_event_box_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (PanelAddtoEventBox), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ type = g_type_register_static (GNOME_TYPE_CANVAS_RECT, "PanelAddtoEventBox", ++ &object_info, 0); ++ } ++ ++ return type; ++} +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-addto-event-box.h gnome-panel-2.17.92.new/gnome-panel/panel-addto-event-box.h +--- gnome-panel-2.17.92/gnome-panel/panel-addto-event-box.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-addto-event-box.h 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,75 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation ++ * All rights reserved. ++ * ++ * This file is part of the Gnome Library. ++ * ++ * The Gnome Library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * The Gnome Library 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 Library General Public ++ * License along with the Gnome Library; see the file COPYING.LIB. If not, ++ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++/* ++ @NOTATION@ ++ */ ++/* Event Box item type for GnomeCanvas widget ++ * ++ * GnomeCanvas is basically a port of the Tk toolkit's most excellent canvas widget. Tk is ++ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties. ++ * ++ * ++ * Author: Chris Lahey ++ */ ++ ++#ifndef PANEL_ADDTO_EVENT_BOX_H ++#define PANEL_ADDTO_EVENT_BOX_H ++ ++ ++#include ++ ++#include ++ ++G_BEGIN_DECLS ++ ++/* Event Box item. No configurable or queryable arguments are available (use those in ++ * GnomeCanvasRE). ++ */ ++ ++ ++#define PANEL_ADDTO_TYPE_EVENT_BOX (panel_addto_event_box_get_type ()) ++#define PANEL_ADDTO_EVENT_BOX(obj) (GTK_CHECK_CAST ((obj), PANEL_ADDTO_TYPE_EVENT_BOX, PanelAddtoEventBox)) ++#define PANEL_ADDTO_EVENT_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), PANEL_ADDTO_TYPE_EVENT_BOX, PanelAddtoEventBoxClass)) ++#define PANEL_ADDTO_IS_EVENT_BOX(obj) (GTK_CHECK_TYPE ((obj), PANEL_ADDTO_TYPE_EVENT_BOX)) ++#define PANEL_ADDTO_IS_EVENT_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), PANEL_ADDTO_TYPE_EVENT_BOX)) ++#define PANEL_ADDTO_EVENT_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), PANEL_ADDTO_TYPE_EVENT_BOX, PanelAddtoEventBoxClass)) ++ ++ ++typedef struct _PanelAddtoEventBox PanelAddtoEventBox; ++typedef struct _PanelAddtoEventBoxClass PanelAddtoEventBoxClass; ++ ++struct _PanelAddtoEventBox { ++ GnomeCanvasRect item; ++}; ++ ++struct _PanelAddtoEventBoxClass { ++ GnomeCanvasRectClass parent_class; ++}; ++ ++ ++/* Standard Gtk function */ ++GType panel_addto_event_box_get_type (void) G_GNUC_CONST; ++ ++G_END_DECLS ++ ++#endif +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-addto.h gnome-panel-2.17.92.new/gnome-panel/panel-addto.h +--- gnome-panel-2.17.92/gnome-panel/panel-addto.h 2007-02-26 21:40:23.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-addto.h 2007-02-27 01:49:24.000000000 +0100 +@@ -20,6 +20,7 @@ + * + * Authors: + * Vincent Untz ++ * Manu Cornet + */ + + #ifndef __PANEL_ADDTO_H__ +@@ -27,8 +28,144 @@ + + G_BEGIN_DECLS + +-void panel_addto_present (GtkMenuItem *item, +- PanelWidget *panel_widget); ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "menu.h" ++ ++#include "launcher.h" ++#include "panel.h" ++#include "drawer.h" ++#include "panel-applet-frame.h" ++#include "panel-action-button.h" ++#include "panel-menu-bar.h" ++#include "panel-separator.h" ++#include "panel-toplevel.h" ++#include "panel-menu-button.h" ++#include "panel-globals.h" ++#include "panel-lockdown.h" ++#include "panel-util.h" ++#include "panel-profile.h" ++ ++typedef struct PanelAddtoEntry PanelAddtoEntry; ++ ++typedef struct PanelAddtoInformation { ++ GSList *categories; ++ int n_categories; ++} PanelAddtoInformation; ++ ++typedef struct { ++ PanelWidget *panel_widget; ++ PanelAddtoInformation *info; ++ ++ GtkWidget *addto_dialog; ++ GtkWidget *label; ++ GtkWidget *back_button; ++ GtkWidget *add_button; ++ GtkWidget *tree_view; ++ GtkWidget *canvas; ++ GtkWidget *applets_sw; ++ GtkWidget *applications_sw; ++ GtkWidget *inner_vbox; ++ GtkWidget *statuslabel; ++ GtkWidget *search_entry; ++ GtkWidget *search_label; ++ GtkWidget *launcher_button; ++ GtkWidget *custom_launcher_button; ++ GtkCellRenderer *renderer; ++ GtkTreeModel *applet_model; ++ GtkTreeModel *application_model; ++ ++ GMenuTree *menu_tree; ++ ++ GSList *applet_list; ++ GSList *application_list; ++ GSList *settings_list; ++ guint name_notify; ++ int insertion_position; ++ ++ gint status; ++} PanelAddtoDialog; ++ ++enum { ++ APPLETS, ++ APPLICATIONS ++}; ++ ++typedef enum { ++ PANEL_ADDTO_APPLET, ++ PANEL_ADDTO_ACTION, ++ PANEL_ADDTO_LAUNCHER_MENU, ++ PANEL_ADDTO_LAUNCHER, ++ PANEL_ADDTO_LAUNCHER_NEW, ++ PANEL_ADDTO_MENU, ++ PANEL_ADDTO_MENUBAR, ++ PANEL_ADDTO_SEPARATOR, ++ PANEL_ADDTO_DRAWER ++} PanelAddtoItemType; ++ ++ ++typedef struct PanelAddtoCategory { ++ GSList *entries; ++ int n_entries; ++ ++ char *title; ++ char *english_title; ++ ++ gboolean translated; ++ ++ gpointer user_data; ++ ++ guint real_category : 1; ++} PanelAddtoCategory; ++ ++typedef struct PanelAddtoItemInfo { ++ PanelAddtoItemType type; ++ PanelActionButtonType action_type; ++ char *category; ++ char *english_category; ++ char *name; ++ char *description; ++ char *icon; ++ char *launcher_path; ++ char *menu_filename; ++ char *menu_path; ++ char *iid; ++ gboolean static_data; ++} PanelAddtoItemInfo; ++ ++struct PanelAddtoEntry { ++ PanelAddtoCategory *category; ++ PanelAddtoItemInfo *item_info; ++ PanelAddtoDialog *dialog; ++ ++ char *title; ++ char *comment; ++ ++ GdkPixbuf *icon_pixbuf; ++ ++ gpointer user_data; ++}; ++ ++ ++typedef struct { ++ GSList *children; ++ PanelAddtoItemInfo item_info; ++} PanelAddtoAppList; ++ ++void ++panel_addto_dialog_response (GtkWidget *widget_dialog, ++ guint response_id, ++ PanelAddtoDialog *dialog); ++gboolean panel_addto_add_item (PanelAddtoDialog *dialog, ++ PanelAddtoItemInfo *item_info); ++void panel_addto_debug_print (PanelAddtoInformation *info); ++void panel_addto_present (GtkMenuItem *item, ++ PanelWidget *panel_widget); + + G_END_DECLS + +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-addto-rounded-rect.c gnome-panel-2.17.92.new/gnome-panel/panel-addto-rounded-rect.c +--- gnome-panel-2.17.92/gnome-panel/panel-addto-rounded-rect.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-addto-rounded-rect.c 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,103 @@ ++/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * panel-addto-rounded-rect.c: A rectangle with rounded corners ++ * ++ * Copyright (C) 2004 Novell Inc ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of version 2 of the GNU General Public ++ * License as published by the Free Software Foundation. ++ * ++ * 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 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 ++ */ ++ ++#include ++#include "panel-addto-rounded-rect.h" ++#include "panel-addto-rounded-rect-pixbuf.h" ++#include ++#include ++ ++struct _PanelAddtoRoundedRect { ++ GnomeCanvasRect base; ++}; ++typedef GnomeCanvasRectClass PanelAddtoRoundedRectClass; ++ ++#define GNOMECC_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNOMECC_TYPE_ROUNDED_RECT, PanelAddtoRoundedRectClass)) ++#define GNOMECC_IS_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOMECC_TYPE_ROUNDED_RECT)) ++ ++G_DEFINE_TYPE (PanelAddtoRoundedRect, panel_addto_rounded_rect, GNOME_TYPE_CANVAS_RECT); ++ ++/************************************************************************* ++ * Adapted from nautilus/libnautilus-private/nautilus-icon-canvas-item.c ++ */ ++/* clear the corners of the selection pixbuf by copying the corners of the passed-in pixbuf */ ++static void ++panel_addto_rounded_rect_draw (GnomeCanvasItem *item, GdkDrawable *drawable, ++ int x, int y, int width, int height) ++{ ++ static GdkPixbuf *corner_pixbuf = NULL; ++ GnomeCanvasRE const *re = GNOME_CANVAS_RE (item); ++ int dest_width, dest_height, src_width, src_height; ++ int dx, dy; ++ int corner_size = 5; ++ double affine[6]; ++ ++ GNOME_CANVAS_ITEM_CLASS (panel_addto_rounded_rect_parent_class)->draw (item, drawable, x, y, width, height); ++ ++ if (corner_pixbuf == NULL) ++ corner_pixbuf = gdk_pixbuf_new_from_inline (-1, ++ panel_addto_rounded_rect_frame, FALSE, NULL); ++ src_width = gdk_pixbuf_get_width (corner_pixbuf); ++ src_height = gdk_pixbuf_get_height (corner_pixbuf); ++ ++ gnome_canvas_item_i2c_affine (item, affine); ++ ++ dest_width = fabs (re->x2 - re->x1); ++ dest_height = fabs (re->y2 - re->y1); ++ dx = affine[4] - x; ++ dy = affine[5] - y; ++ ++ /* draw top left corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ 0, 0, ++ dx, dy, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++ /* draw top right corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ src_width - corner_size, 0, ++ dx + dest_width - corner_size, dy, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++ /* draw bottom left corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ 0, src_height - corner_size, ++ dx, dy + dest_height - corner_size, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++ /* draw bottom right corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ src_width - corner_size, src_height - corner_size, ++ dx + dest_width - corner_size, dy + dest_height - corner_size, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++} ++ ++static void ++panel_addto_rounded_rect_class_init (PanelAddtoRoundedRectClass *klass) ++{ ++ GnomeCanvasItemClass *item_klass = (GnomeCanvasItemClass *) klass; ++ item_klass->draw = panel_addto_rounded_rect_draw; ++} ++static void ++panel_addto_rounded_rect_init (PanelAddtoRoundedRect *rr) ++{ ++} +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-addto-rounded-rect.h gnome-panel-2.17.92.new/gnome-panel/panel-addto-rounded-rect.h +--- gnome-panel-2.17.92/gnome-panel/panel-addto-rounded-rect.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-addto-rounded-rect.h 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,39 @@ ++/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * gnomecc-rounded-rect.c: A rectangle with rounded corners ++ * ++ * Copyright (C) 2004 Novell Inc ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of version 2 of the GNU General Public ++ * License as published by the Free Software Foundation. ++ * ++ * 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 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 PANEL_ADDTO_ROUNDED_RECT_H ++#define PANEL_ADDTO_ROUNDED_RECT_H ++ ++#include ++#include ++#include ++ ++G_BEGIN_DECLS ++ ++#define PANEL_ADDTO_TYPE_ROUNDED_RECT (panel_addto_rounded_rect_get_type ()) ++#define PANEL_ADDTO_ROUNDED_RECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_ADDTO_TYPE_ROUNDED_RECT, PanelAddtoRoundedRect)) ++#define PANEL_ADDTO_IS_ROUNDED_RECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_ADDTO_TYPE_ROUNDED_RECT)) ++ ++typedef struct _PanelAddtoRoundedRect PanelAddtoRoundedRect; ++GType panel_addto_rounded_rect_get_type (void); ++ ++G_END_DECLS ++ ++#endif /* PANEL_ADDTO_ROUNDED_RECT_H */ +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-addto-rounded-rect-pixbuf.h gnome-panel-2.17.92.new/gnome-panel/panel-addto-rounded-rect-pixbuf.h +--- gnome-panel-2.17.92/gnome-panel/panel-addto-rounded-rect-pixbuf.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-addto-rounded-rect-pixbuf.h 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,319 @@ ++/* GdkPixbuf RGBA C-Source image dump */ ++ ++#ifdef __SUNPRO_C ++#pragma align 4 (panel_addto_rounded_rect_frame) ++#endif ++#ifdef __GNUC__ ++static const guint8 panel_addto_rounded_rect_frame[] __attribute__ ((__aligned__ (4))) = ++#else ++static const guint8 panel_addto_rounded_rect_frame[] = ++#endif ++{ "" ++ /* Pixbuf magic (0x47646b50) */ ++ "GdkP" ++ /* length: header (24) + pixel_data (5848) */ ++ "\0\0\26\360" ++ /* pixdata_type (0x1010002) */ ++ "\1\1\0\2" ++ /* rowstride (344) */ ++ "\0\0\1X" ++ /* width (86) */ ++ "\0\0\0V" ++ /* height (17) */ ++ "\0\0\0\21" ++ /* pixel_data: */ ++ "\377\377\377\377\377\377\377\377\377\377\377\303\377\377\377q\377\377" ++ "\377/\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377/\377\377\377q\377\377\377\303\377\377" ++ "\377\377\377\377\377\377\377\377\377\377\377\377\377\242\377\377\377" ++ "(\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377(\377\377\377\242\377\377\377\377\377\377\377\303\377\377" ++ "\377(\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377(\377\377\377\303\377\377" ++ "\377q\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377q\377\377\377/\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377/\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377/\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377/\377\377" ++ "\377q\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377q\377\377\377\303\377\377\377(\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377(\377\377\377\303\377\377\377\377\377\377\377\242\377\377\377(\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377(\377\377\377\242\377\377\377\377\377\377\377\377\377\377\377" ++ "\377\377\377\377\303\377\377\377q\377\377\377/\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377/\377\377\377q\377\377\377\303\377\377\377\377\377\377\377\377"}; ++ ++ +diff -Nur gnome-panel-2.17.92/panel-addto-canvas.c gnome-panel-2.17.92.new/panel-addto-canvas.c +--- gnome-panel-2.17.92/panel-addto-canvas.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/panel-addto-canvas.c 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,2309 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* Copyright (C) 2005 Carlos Garnacho ++ * ++ * 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 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. ++ * ++ * Authors: Jody Goldberg ++ * Carlos Garnacho Parro ++ * Manu Cornet ++ */ ++ ++ ++#include "panel-addto-canvas.h" ++#include "panel-addto.h" ++#include "panel-profile.h" ++ ++#define PAD 5 /*when scrolling keep a few pixels above or below if possible */ ++#define ABOVE_LINE_SPACING 0 ++#define UNDER_LINE_SPACING 0 ++#define UNDER_TITLE_SPACING 0 /* manually insert 1 blank line of text */ ++#define LINE_HEIGHT 1 ++#define BORDERS 7 ++#define MAX_ITEM_WIDTH 125 ++#define ITEMS_SEPARATION 7 ++ ++#include "panel-addto-canvas.h" ++#include "panel-addto-event-box.h" ++#include "panel-addto-rounded-rect.h" ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define PANEL_ADDTO_CANVAS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasPrivate)) ++ ++typedef struct EntryInfo { ++ PanelAddtoCanvas *canvas; ++ ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *text; ++ GnomeCanvasItem *pixbuf; ++ GnomeCanvasItem *highlight_pixbuf; ++ GnomeCanvasItem *cover; ++ GnomeCanvasItem *selection; ++ ++ double icon_height; ++ double icon_width; ++ double text_height; ++ guint launching : 1; ++ guint selected : 1; ++ guint highlighted : 1; ++ gboolean visible; ++ ++ gint n_category; ++ gint n_entry; ++ gint index; ++} EntryInfo; ++ ++typedef struct { ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *title; ++ GnomeCanvasItem *line; ++ gboolean visible; ++} CategoryInfo; ++ ++enum { ++ SELECTION_CHANGED, ++ LAST_SIGNAL ++}; ++ ++enum { ++ PROP_0, ++ PROP_INFO ++}; ++ ++ ++static guint panel_addto_canvas_signals [LAST_SIGNAL] = { 0 }; ++ ++ ++static void panel_addto_canvas_class_init (PanelAddtoCanvasClass *class); ++static void panel_addto_canvas_init (PanelAddtoCanvas *canvas); ++static void panel_addto_canvas_finalize (GObject *object); ++static void panel_addto_canvas_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec); ++static void panel_addto_canvas_get_property (GObject *object, ++ guint prop_id, ++ GValue *value, ++ GParamSpec *pspec); ++static void panel_addto_canvas_draw_background (GnomeCanvas *canvas, GdkDrawable *drawable, ++ int x, int y, int width, int height); ++static void panel_addto_canvas_size_allocate (GtkWidget *canvas, ++ GtkAllocation *allocation); ++static void panel_addto_canvas_style_set (GtkWidget *canvas, ++ GtkStyle *previous_style); ++static void panel_addto_canvas_realize (GtkWidget *canvas); ++ ++static void panel_addto_select_east_entry (EntryInfo *ei, PanelAddtoCanvas *canvas); ++static void build_canvas (PanelAddtoCanvas *canvas); ++static void relayout_canvas (PanelAddtoCanvas *canvas); ++static void set_style (PanelAddtoCanvas *canvas, gboolean font_changed); ++ ++G_DEFINE_TYPE (PanelAddtoCanvas, panel_addto_canvas, GNOME_TYPE_CANVAS); ++ ++ ++static AtkObject* panel_addto_canvas_get_accessible (GtkWidget *widget); ++ ++#include "panel-addto-event-box.h" ++#include "panel-addto-rounded-rect.h" ++#include "panel-profile.h" ++ ++static void ++panel_addto_canvas_class_init (PanelAddtoCanvasClass *class) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (class); ++ GnomeCanvasClass *canvas_class = GNOME_CANVAS_CLASS (class); ++ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); ++ ++ object_class->set_property = panel_addto_canvas_set_property; ++ object_class->get_property = panel_addto_canvas_get_property; ++ object_class->finalize = panel_addto_canvas_finalize; ++ canvas_class->draw_background = panel_addto_canvas_draw_background; ++ ++ widget_class->style_set = panel_addto_canvas_style_set; ++ widget_class->size_allocate = panel_addto_canvas_size_allocate; ++ widget_class->realize = panel_addto_canvas_realize; ++ widget_class->get_accessible = panel_addto_canvas_get_accessible; ++ ++ class->changed = NULL; ++ ++ g_object_class_install_property (object_class, ++ PROP_INFO, ++ g_param_spec_pointer ("info", ++ "information for the canvas", ++ "information for the canvas", ++ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); ++ panel_addto_canvas_signals [SELECTION_CHANGED] = ++ g_signal_new ("selection-changed", ++ G_OBJECT_CLASS_TYPE (object_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (PanelAddtoCanvasClass, changed), ++ NULL, NULL, ++ g_cclosure_marshal_VOID__STRING, ++ G_TYPE_NONE, 1, ++ G_TYPE_STRING); ++ ++ g_type_class_add_private (object_class, ++ sizeof (PanelAddtoCanvasPrivate)); ++} ++ ++ ++static void ++panel_addto_canvas_init (PanelAddtoCanvas *canvas) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ g_return_if_fail (PANEL_ADDTO_IS_CANVAS (canvas)); ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ priv->max_width = 300; ++ priv->min_height = 0; ++ priv->info = NULL; ++ priv->selected = NULL; ++ ++ priv->max_item_width = 0; ++ priv->max_item_height = 0; ++ priv->items_per_row = 0; ++ priv->rtl = (gtk_widget_get_direction (GTK_WIDGET (canvas)) == GTK_TEXT_DIR_RTL); ++ priv->accessible_children = g_hash_table_new (g_int_hash, g_int_equal); ++ ++ gtk_widget_show_all (GTK_WIDGET (canvas)); ++} ++ ++static void ++panel_addto_canvas_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (object); ++ ++ switch (prop_id) { ++ case PROP_INFO: ++ priv->info = g_value_get_pointer (value); ++ build_canvas (PANEL_ADDTO_CANVAS (object)); ++ break; ++ } ++} ++ ++static void ++panel_addto_canvas_get_property (GObject *object, ++ guint prop_id, ++ GValue *value, ++ GParamSpec *pspec) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (object); ++ ++ switch (prop_id) { ++ case PROP_INFO: ++ g_value_set_pointer (value, priv->info); ++ break; ++ } ++} ++ ++static void ++panel_addto_canvas_finalize (GObject *object) ++{ ++ if (G_OBJECT_CLASS (panel_addto_canvas_parent_class)->finalize) ++ (* G_OBJECT_CLASS (panel_addto_canvas_parent_class)->finalize) (object); ++} ++ ++ ++static void ++panel_addto_canvas_draw_background (GnomeCanvas *canvas, GdkDrawable *drawable, ++ int x, int y, int width, int height) ++{ ++ /* By default, we use the style base color. */ ++ gdk_gc_set_foreground (canvas->pixmap_gc, ++ >K_WIDGET (canvas)->style->base[GTK_STATE_NORMAL]); ++ gdk_draw_rectangle (drawable, ++ canvas->pixmap_gc, ++ TRUE, ++ 0, 0, ++ width, height); ++} ++ ++static void ++panel_addto_canvas_size_allocate(GtkWidget *canvas, GtkAllocation *allocation) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ if (GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->size_allocate) ++ (* GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->size_allocate) (canvas, allocation); ++ ++ if (allocation->height == 1 || allocation->width == 1) ++ return; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ priv->max_width = allocation->width; ++ priv->min_height = allocation->height; ++ ++ relayout_canvas (PANEL_ADDTO_CANVAS (canvas)); ++ ++ gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0, 0, priv->width - 1, priv->height - 1); ++ g_object_set (priv->under_cover, ++ "x2", priv->width, ++ "y2", priv->height, ++ NULL); ++} ++ ++static void ++panel_addto_canvas_realize (GtkWidget *canvas) ++{ ++ if (GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->realize) ++ (* GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->realize) (canvas); ++ ++ set_style (PANEL_ADDTO_CANVAS (canvas), FALSE); ++} ++ ++static void ++panel_addto_canvas_style_set (GtkWidget *canvas, GtkStyle *previous_style) ++{ ++ if (!GTK_WIDGET_REALIZED (canvas)) ++ return; ++ ++ set_style (PANEL_ADDTO_CANVAS (canvas), (previous_style && ++ canvas->style && ++ !pango_font_description_equal (canvas->style->font_desc, ++ previous_style->font_desc))); ++} ++ ++static void ++gnome_canvas_item_show_hide (GnomeCanvasItem *item, gboolean show) ++{ ++ if (show) ++ gnome_canvas_item_show (item); ++ else ++ gnome_canvas_item_hide (item); ++} ++ ++static void ++setup_entry (PanelAddtoCanvas *canvas, PanelAddtoEntry *entry) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ EntryInfo *ei; ++ GtkWidget *widget; ++ GtkStateType state; ++ ++ if (!entry) ++ return; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ widget = GTK_WIDGET (canvas); ++ ei = entry->user_data; ++ ++ if (ei->pixbuf) { ++ gnome_canvas_item_show_hide (ei->highlight_pixbuf, ei->highlighted); ++ gnome_canvas_item_show_hide (ei->pixbuf, !ei->highlighted); ++ } ++ if (!ei->selected) ++ state = GTK_STATE_NORMAL; ++ else if (gtk_window_has_toplevel_focus (GTK_WINDOW (gtk_widget_get_toplevel (widget)))) ++ state = GTK_STATE_SELECTED; ++ else ++ state = GTK_STATE_ACTIVE; ++ gnome_canvas_item_show_hide (ei->selection, ei->selected); ++ g_object_set (ei->selection, ++ "fill_color_gdk", &widget->style->base [state], ++ NULL); ++ g_object_set (ei->text, ++ "fill_color_gdk", &widget->style->text [state], ++ NULL); ++} ++ ++static gboolean ++cb_entry_info_reset (gpointer data) ++{ ++ EntryInfo *ei = data; ++ ei->launching = FALSE; ++ return FALSE; ++} ++ ++ ++void ++activate_entry (PanelAddtoEntry *entry) ++{ ++ EntryInfo *ei = entry->user_data; ++ ++ if (!ei->launching) { ++ ei->launching = TRUE; ++ gtk_timeout_add (1000, cb_entry_info_reset, ei); ++ ++ if (panel_addto_add_item (entry->dialog, entry->item_info)) ++ gtk_widget_destroy (entry->dialog->addto_dialog); ++ } ++} ++ ++static void ++panel_addto_drag_data_get_cb (GtkWidget *widget, ++ GdkDragContext *context, ++ GtkSelectionData *selection_data, ++ guint info, ++ guint time, ++ const char *string) ++{ ++ gtk_selection_data_set (selection_data, ++ selection_data->target, 8, (guchar *) string, ++ strlen (string)); ++} ++ ++static void ++panel_addto_drag_begin_cb (GtkWidget *canvas, ++ GdkDragContext *context, ++ gpointer data) ++{ ++ PanelAddtoEntry *entry; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ entry = priv->selected; ++ gtk_drag_set_icon_pixbuf (context, entry->icon_pixbuf, 0, 0); ++} ++ ++static void ++panel_addto_setup_drag (PanelAddtoCanvas *canvas, ++ const GtkTargetEntry *target, ++ const char *text) ++{ ++ if (!text || panel_lockdown_get_locked_down ()) ++ return; ++ ++ ++ gtk_drag_source_set (GTK_WIDGET (canvas), ++ GDK_BUTTON1_MASK|GDK_BUTTON2_MASK, ++ target, 1, GDK_ACTION_COPY); ++ ++ g_signal_connect_data (G_OBJECT (canvas), "drag_data_get", ++ G_CALLBACK (panel_addto_drag_data_get_cb), ++ g_strdup (text), ++ (GClosureNotify) g_free, ++ 0 /* connect_flags */); ++ g_signal_connect_after (G_OBJECT (canvas), "drag-begin", ++ G_CALLBACK (panel_addto_drag_begin_cb), ++ NULL); ++} ++ ++static void ++panel_addto_setup_launcher_drag (PanelAddtoCanvas *canvas, ++ const char *uri) ++{ ++ static GtkTargetEntry target[] = { ++ { "text/uri-list", 0, 0 } ++ }; ++ char *uri_list; ++ ++ uri_list = g_strconcat (uri, "\r\n", NULL); ++ panel_addto_setup_drag (canvas, target, uri_list); ++ g_free (uri_list); ++} ++ ++static void ++panel_addto_setup_applet_drag (PanelAddtoCanvas *canvas, ++ const char *iid) ++{ ++ static GtkTargetEntry target[] = { ++ { "application/x-panel-applet-iid", 0, 0 } ++ }; ++ ++ panel_addto_setup_drag (canvas, target, iid); ++} ++ ++ ++ ++static void ++panel_addto_setup_internal_applet_drag (PanelAddtoCanvas *canvas, ++ const char *applet_type) ++{ ++ static GtkTargetEntry target[] = { ++ { "application/x-panel-applet-internal", 0, 0 } ++ }; ++ ++ panel_addto_setup_drag (canvas, target, applet_type); ++} ++ ++static void ++panel_addto_selection_changed (PanelAddtoCanvas *canvas, ++ const gchar *status_display, ++ PanelAddtoDialog *dialog) ++{ ++ PanelAddtoItemInfo *data; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ data = priv->selected ? priv->selected->item_info : NULL; ++ ++ ++ if ((!priv->selected) || (!data)) { ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE); ++ return; ++ } ++ ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), TRUE); ++ ++ if (dialog->statuslabel) ++ gtk_label_set_text (GTK_LABEL (dialog->statuslabel), priv->selected->comment); ++ ++ if (data->type == PANEL_ADDTO_LAUNCHER_MENU) { ++ gtk_button_set_label (GTK_BUTTON (dialog->add_button), ++ GTK_STOCK_GO_FORWARD); ++ } else { ++ gtk_button_set_label (GTK_BUTTON (dialog->add_button), ++ GTK_STOCK_ADD); ++ } ++ gtk_button_set_use_stock (GTK_BUTTON (dialog->add_button), ++ TRUE); ++ ++} ++ ++static void ++select_entry (PanelAddtoCanvas *canvas, PanelAddtoEntry *entry) ++{ ++ PanelAddtoDialog *dialog; ++ PanelAddtoCanvasPrivate *priv; ++ EntryInfo *ei = NULL; ++ GtkAdjustment *pos; ++ double affine[6]; ++ PanelAddtoEntry *selected; ++ ++ dialog = entry->dialog; ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ selected = priv->selected; ++ ++ if (selected == entry) ++ return; ++ ++ if (selected && selected->user_data) ++ ((EntryInfo *) selected->user_data)->selected = FALSE; ++ setup_entry (canvas, selected); ++ ++ priv->selected = selected = entry; ++ ++ if (selected && selected->user_data) ++ ((EntryInfo *) selected->user_data)->selected = TRUE; ++ setup_entry (canvas, selected); ++ ++ g_signal_emit (canvas, panel_addto_canvas_signals [SELECTION_CHANGED], 0, ++ (entry) ? entry->comment : NULL); ++ ++ if (!entry) ++ return; ++ ++ ei = entry->user_data; ++ gnome_canvas_item_i2c_affine (GNOME_CANVAS_ITEM (ei->group), affine); ++ pos = gtk_layout_get_vadjustment (GTK_LAYOUT (ei->cover->canvas)); ++ ++ if (affine[5] < pos->value) ++ gtk_adjustment_set_value (pos, MAX (affine[5] - PAD, 0)); ++ else if ((affine[5] + priv->max_item_height) > (pos->value+pos->page_size)) ++ gtk_adjustment_set_value (pos, MAX (MIN (affine[5] + priv->max_item_height + PAD, pos->upper) - pos->page_size, 0)); ++} ++ ++static gboolean ++cover_event (GnomeCanvasItem *item, GdkEvent *event, PanelAddtoEntry *entry) ++{ ++ EntryInfo *ei = entry->user_data; ++ PanelAddtoCanvas *canvas = ei->canvas; ++ PanelAddtoItemInfo *data; ++ PanelAddtoDialog *dialog = entry->dialog; ++ char *iid; ++ ++ data = entry->item_info; ++ ++ switch (event->type) { ++ case GDK_ENTER_NOTIFY: ++ ei->highlighted = TRUE; ++ setup_entry (canvas, entry); /* highlight even if it is already selected */ ++ ++ /* only allow dragging applets if we can add applets */ ++ if (panel_profile_id_lists_are_writable ()) { ++ switch (data->type) { ++ case PANEL_ADDTO_LAUNCHER: ++ panel_addto_setup_launcher_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ data->launcher_path); ++ break; ++ case PANEL_ADDTO_APPLET: ++ panel_addto_setup_applet_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ data->iid); ++ break; ++ case PANEL_ADDTO_LAUNCHER_MENU: ++ break; ++ case PANEL_ADDTO_MENU: ++ /* build the iid for menus other than the main menu */ ++ if (data->iid == NULL) { ++ iid = g_strdup_printf ("MENU:%s/%s", ++ data->menu_filename, ++ data->menu_path); ++ } else { ++ iid = g_strdup (data->iid); ++ } ++ panel_addto_setup_internal_applet_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ iid); ++ g_free (iid); ++ break; ++ default: ++ panel_addto_setup_internal_applet_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ data->iid); ++ break; ++ } ++ } ++ ++ return TRUE; ++ case GDK_LEAVE_NOTIFY: ++ ei->highlighted = FALSE; ++ setup_entry (canvas, entry); ++ return TRUE; ++ case GDK_BUTTON_PRESS: ++ select_entry (canvas, entry); ++ gtk_widget_grab_focus (GTK_WIDGET (canvas)); ++ return TRUE; ++ case GDK_2BUTTON_PRESS: ++ if (event->button.button == 1) ++ activate_entry (entry); ++ return TRUE; ++ default: ++ return FALSE; ++ } ++} ++ ++static void ++panel_addto_select_first_entry (PanelAddtoCanvas *canvas) ++{ ++ PanelAddtoCategory *category; ++ PanelAddtoEntry *entry; ++ PanelAddtoCanvasPrivate *priv; ++ EntryInfo *ei; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ category = g_slist_nth_data (priv->info->categories, 0); ++ entry = g_slist_nth_data (category->entries, 0); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ select_entry (canvas, entry); ++} ++ ++static gint ++panel_addto_count_visible_entries (PanelAddtoCategory *category) ++{ ++ GSList *l; ++ PanelAddtoEntry *entry; ++ EntryInfo *ei; ++ gint n_visible_entries = 0; ++ ++ for (l = category->entries; l; l = l->next) { ++ entry = l->data; ++ ei = entry->user_data; ++ if (ei->visible) ++ n_visible_entries++; ++ } ++ return n_visible_entries; ++} ++ ++static gint ++panel_addto_get_rank_of_nth_visible_entry (PanelAddtoCategory *category, gint n) ++{ ++ GSList *l; ++ PanelAddtoEntry *entry; ++ EntryInfo *ei; ++ gint seen_visible_entries = 0; ++ gint seen_entries = 0; ++ gint farthest_visible_entry = 0; ++ ++ l = category->entries; ++ ++ while (seen_visible_entries < n) { ++ if (!l) break; ++ seen_entries++; ++ entry = l->data; ++ ei = entry->user_data; ++ if (ei->visible) { ++ seen_visible_entries++; ++ farthest_visible_entry = seen_entries; ++ } ++ l = l->next; ++ } ++ ++ return (farthest_visible_entry - 1); ++} ++ ++static gint ++panel_addto_how_many_visible_entries_before_me (PanelAddtoCategory *category, gint rank) ++{ ++ GSList *l; ++ PanelAddtoEntry *entry; ++ EntryInfo *ei; ++ gint seen_entries = 0; ++ gint seen_visible_entries = 0; ++ ++ l = category->entries; ++ while (seen_entries < rank) { ++ entry = l->data; ++ ei = entry->user_data; ++ if (ei->visible) ++ seen_visible_entries++; ++ l = l->next; ++ seen_entries++; ++ } ++ return seen_visible_entries; ++} ++ ++static void ++panel_addto_select_east_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category, n_entry; ++ gint n_categories; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_entry = 0; ++ n_category = 0; ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ if (ei->n_entry == category->n_entries - 1) { ++ if (n_category == priv->info->n_categories - 1) ++ return; ++ category = g_slist_nth_data (priv->info->categories, ei->n_category + 1); ++ entry = g_slist_nth_data (category->entries, 0); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry + 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static void ++panel_addto_select_west_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category, n_entry; ++ gint n_categories; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_entry = 0; ++ n_category = 0; ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ if (ei->n_entry == 0) { ++ if (n_category == 0) ++ return; ++ category = g_slist_nth_data (priv->info->categories, ei->n_category - 1); ++ entry = g_slist_nth_data (category->entries, category->n_entries - 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_west_entry (ei, canvas); ++ return; ++ } ++ } else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry - 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_west_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static void ++panel_addto_select_north_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category = 0; ++ gint n_categories; ++ gint n_visible_entries = 0; ++ gint n_visible_entries_before_me = 0; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ CategoryInfo *catinfo; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ n_visible_entries_before_me = ++ panel_addto_how_many_visible_entries_before_me (category, ei->n_entry); ++ if (n_visible_entries_before_me + 1 - priv->items_per_row <= 0) { ++ if (n_category == 0) { ++ panel_addto_select_first_entry (canvas); ++ return; ++ } ++ n_category--; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ catinfo = category->user_data; ++ if (!catinfo->visible) { ++ while (!catinfo->visible) { ++ category = g_slist_nth_data (priv->info->categories, --n_category); ++ if (!category) ++ return; ++ catinfo = category->user_data; ++ if (!catinfo) ++ return; ++ } ++ } ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ entry = g_slist_nth_data (category->entries, ++ panel_addto_get_rank_of_nth_visible_entry ++ (category, ++ ((n_visible_entries - 1) / priv->items_per_row) * priv->items_per_row ++ + ((n_visible_entries_before_me + 1) % priv->items_per_row))); ++ if (!entry) ++ entry = g_slist_nth_data (category->entries, n_visible_entries - 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry - priv->items_per_row); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static void ++panel_addto_select_south_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category = 0; ++ gint n_categories; ++ gint n_visible_entries = 0; ++ gint n_visible_entries_before_me = 0; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ CategoryInfo *catinfo; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ n_visible_entries_before_me = ++ panel_addto_how_many_visible_entries_before_me (category, ei->n_entry); ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ if (n_visible_entries_before_me + 1 + priv->items_per_row > n_visible_entries - 1) { ++ if (n_visible_entries_before_me + 1 ++ <= ((n_visible_entries - 1) / priv->items_per_row) * priv->items_per_row) { ++ entry = g_slist_nth_data (category->entries, n_visible_entries - 1); ++ } else { ++ if (n_category == priv->info->n_categories - 1) ++ return; ++ n_category++; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ catinfo = category->user_data; ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ entry = g_slist_nth_data (category->entries, ei->n_entry % priv->items_per_row); ++ if (!catinfo->visible) { ++ while (!catinfo->visible) { ++ category = g_slist_nth_data (priv->info->categories, ++n_category); ++ if (!category) ++ return; ++ catinfo = category->user_data; ++ if (!catinfo) ++ return; ++ } ++ } ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ entry = g_slist_nth_data (category->entries, ++ panel_addto_get_rank_of_nth_visible_entry ++ (category, ++ (n_visible_entries_before_me + 1) % priv->items_per_row)); ++ ++ if (!entry) ++ entry = g_slist_nth_data (category->entries, n_visible_entries - 1); ++ } ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry + priv->items_per_row); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static gboolean ++cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, PanelAddtoDialog *dialog) ++{ ++ PanelAddtoCanvas *canvas = (PanelAddtoCanvas *) dialog->canvas; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ EntryInfo *ei = NULL; ++ gint n_category, n_entry; ++ gint n_categories, n_entries; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (event->type == GDK_BUTTON_PRESS) { ++ gtk_drag_source_unset (GTK_WIDGET (canvas)); ++ select_entry (canvas, NULL); ++ gtk_widget_grab_focus (GTK_WIDGET (dialog->canvas)); ++ return TRUE; ++ } ++ ++ if (event->type != GDK_KEY_PRESS) ++ return FALSE; ++ ++ n_entry = 0; ++ n_category = 0; ++ n_categories = priv->info->n_categories; ++ ++ if (priv->selected) { ++ ei = priv->selected->user_data; ++ current_category = g_slist_nth_data (priv->info->categories, ei->n_category); ++ n_entries = current_category->n_entries; ++ } ++ ++ switch (event->key.keyval) { ++ case GDK_KP_Right: ++ case GDK_Right: ++ if (priv->rtl) ++ panel_addto_select_west_entry (ei, canvas); ++ else ++ panel_addto_select_east_entry (ei, canvas); ++ return TRUE; ++ case GDK_KP_Left: ++ case GDK_Left: ++ if (priv->rtl) ++ panel_addto_select_east_entry (ei, canvas); ++ else ++ panel_addto_select_west_entry (ei, canvas); ++ return TRUE; ++ case GDK_KP_Down: ++ case GDK_Down: ++ panel_addto_select_south_entry (ei, canvas); ++ return TRUE; ++ case GDK_KP_Up: ++ case GDK_Up: ++ panel_addto_select_north_entry (ei, canvas); ++ return TRUE; ++ case GDK_Tab: ++ case GDK_KP_Tab: ++ case GDK_ISO_Left_Tab: ++ gtk_widget_grab_focus (dialog->search_entry); ++ break; ++ case GDK_Return: ++ case GDK_KP_Enter: ++ if (priv->selected) ++ activate_entry (priv->selected); ++ ++ return TRUE; ++ break; ++ case GDK_Escape: ++ panel_addto_dialog_response (dialog->addto_dialog, ++ GTK_RESPONSE_CANCEL, ++ dialog); ++ return TRUE; ++ default: ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++ ++static void ++calculate_item_width (PanelAddtoCanvas *canvas, EntryInfo *ei) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PangoLayout *layout; ++ PangoRectangle rectangle; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ layout = GNOME_CANVAS_TEXT (ei->text)->layout; ++ ++ pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR); ++ pango_layout_set_width (layout, -1); ++ pango_layout_get_pixel_extents (layout, NULL, &rectangle); ++ ++ /* If its too big wrap at the max and regen to find the layout */ ++ if (rectangle.width > MAX_ITEM_WIDTH) { ++ pango_layout_set_width (layout, MAX_ITEM_WIDTH * PANGO_SCALE); ++ pango_layout_get_pixel_extents (layout, NULL, &rectangle); ++ rectangle.width = MAX_ITEM_WIDTH; ++ } ++ ++ ei->text_height = rectangle.height; ++ ++ priv->max_item_width = MAX (priv->max_item_width, rectangle.width); ++} ++ ++static void ++calculate_item_height (PanelAddtoCanvas *canvas, EntryInfo *ei) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ gint item_height; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (ei->pixbuf) ++ priv->max_icon_height = MAX (priv->max_icon_height, ei->icon_height); ++ ++ item_height = ei->icon_height + ei->text_height; ++ priv->max_item_height = MAX (priv->max_item_height, item_height); ++} ++ ++static void ++calculate_sizes (PanelAddtoCanvas *canvas) ++{ ++ GSList *l, *m; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ PanelAddtoEntry *current_entry; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ priv->max_item_height = 0; ++ priv->max_icon_height = 0; ++ priv->max_item_width = 0; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ for (m = current_category->entries; m; m = m->next) { ++ current_entry = m->data; ++ EntryInfo *ei = current_entry->user_data; ++ calculate_item_width (canvas, ei); ++ calculate_item_height (canvas, ei); ++ } ++ } ++} ++ ++static void ++gnome_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy) ++{ ++ double translate[6]; ++ ++ g_return_if_fail (item != NULL); ++ g_return_if_fail (GNOME_IS_CANVAS_ITEM (item)); ++ ++ art_affine_translate (translate, dx, dy); ++ ++ gnome_canvas_item_affine_absolute (item, translate); ++} ++ ++static guchar ++lighten_component (guchar cur_value) ++{ ++ int new_value = cur_value; ++ new_value += 24 + (new_value >> 3); ++ if (new_value > 255) { ++ new_value = 255; ++ } ++ return (guchar) new_value; ++} ++ ++static GdkPixbuf * ++create_spotlight_pixbuf (GdkPixbuf* src) ++{ ++ GdkPixbuf *dest; ++ int i, j; ++ int width, height, has_alpha, src_row_stride, dst_row_stride; ++ guchar *target_pixels, *original_pixels; ++ guchar *pixsrc, *pixdest; ++ ++ g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL); ++ g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src) ++ && gdk_pixbuf_get_n_channels (src) == 3) ++ || (gdk_pixbuf_get_has_alpha (src) ++ && gdk_pixbuf_get_n_channels (src) == 4), NULL); ++ g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL); ++ ++ dest = gdk_pixbuf_copy (src); ++ ++ has_alpha = gdk_pixbuf_get_has_alpha (src); ++ width = gdk_pixbuf_get_width (src); ++ height = gdk_pixbuf_get_height (src); ++ dst_row_stride = gdk_pixbuf_get_rowstride (dest); ++ src_row_stride = gdk_pixbuf_get_rowstride (src); ++ target_pixels = gdk_pixbuf_get_pixels (dest); ++ original_pixels = gdk_pixbuf_get_pixels (src); ++ ++ for (i = 0; i < height; i++) { ++ pixdest = target_pixels + i * dst_row_stride; ++ pixsrc = original_pixels + i * src_row_stride; ++ for (j = 0; j < width; j++) { ++ *pixdest++ = lighten_component (*pixsrc++); ++ *pixdest++ = lighten_component (*pixsrc++); ++ *pixdest++ = lighten_component (*pixsrc++); ++ if (has_alpha) { ++ *pixdest++ = *pixsrc++; ++ } ++ } ++ } ++ ++ return dest; ++} ++ ++static void ++build_canvas (PanelAddtoCanvas *canvas) ++{ ++ GSList *l, *m; ++ EntryInfo *ei; ++ PanelAddtoDialog *dialog; ++ PanelAddtoCategory *current_category = NULL; ++ PanelAddtoInformation *current_info = NULL; ++ PanelAddtoEntry *current_entry = NULL; ++ PanelAddtoCanvasPrivate *priv; ++ GnomeCanvas *gcanvas; ++ GnomeCanvasGroup *hidden_group; ++ int i, j, index; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ gcanvas = GNOME_CANVAS (canvas); ++ current_category = priv->info->categories->data; ++ current_entry = current_category->entries->data; ++ dialog = current_entry->dialog; ++ index = 0; ++ ++ priv->under_cover = gnome_canvas_item_new (gnome_canvas_root (gcanvas), ++ panel_addto_event_box_get_type(), ++ NULL); ++ ++ current_info = priv->info; ++ gnome_canvas_item_grab_focus (GNOME_CANVAS_ITEM (gnome_canvas_root (gcanvas))); ++ g_signal_connect (gnome_canvas_root (gcanvas), "event", ++ G_CALLBACK (cb_canvas_event), dialog); ++ ++ hidden_group = GNOME_CANVAS_GROUP (gnome_canvas_item_new (gnome_canvas_root (gcanvas), ++ gnome_canvas_group_get_type (), ++ NULL)); ++ for (l = priv->info->categories, i = 0; l; l = l->next, i++) { ++ ++ CategoryInfo *catinfo; ++ current_category = l->data; ++ ++ if (current_category->user_data == NULL) ++ current_category->user_data = g_new (CategoryInfo, 1); ++ ++ catinfo = current_category->user_data; ++ catinfo->group = NULL; ++ catinfo->title = NULL; ++ catinfo->line = NULL; ++ ++ catinfo->group = ++ GNOME_CANVAS_GROUP (gnome_canvas_item_new (gnome_canvas_root (gcanvas), ++ gnome_canvas_group_get_type (), ++ NULL)); ++ gnome_canvas_item_move_absolute (GNOME_CANVAS_ITEM (catinfo->group), 0, BORDERS); ++ ++ catinfo->line = gnome_canvas_item_new (catinfo->group, ++ gnome_canvas_rect_get_type (), ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) LINE_HEIGHT, ++ NULL); ++ ++ catinfo->title = NULL; ++ ++ if (current_category && (priv->info->n_categories != 1)) { ++ char *label = g_strdup_printf ("%s", current_category->title); ++ catinfo->title = gnome_canvas_item_new (catinfo->group, ++ gnome_canvas_text_get_type (), ++ "text", current_category->title, ++ "markup", label, ++ "anchor", GTK_ANCHOR_NW, ++ NULL); ++ g_free (label); ++ } ++ ++ for (m = current_category->entries, j = 0; m; m = m->next, j++) { ++ current_entry = m->data; ++ ++ if (current_entry->user_data == NULL) ++ current_entry->user_data = g_new0 (EntryInfo, 1); ++ ++ ei = current_entry->user_data; ++ ++ ei->canvas = canvas; ++ ei->group = GNOME_CANVAS_GROUP ( ++ gnome_canvas_item_new (catinfo->group, ++ gnome_canvas_group_get_type (), ++ NULL)); ++ ei->selection = gnome_canvas_item_new ( ++ ei->group, ++ PANEL_ADDTO_TYPE_ROUNDED_RECT, ++ NULL); ++ ++ if (current_entry->title) { ++ ei->text = gnome_canvas_item_new (ei->group, ++ gnome_canvas_text_get_type (), ++ "anchor", GTK_ANCHOR_NW, ++ "justification", GTK_JUSTIFY_CENTER, ++ "clip", TRUE, ++ NULL); ++ pango_layout_set_alignment (GNOME_CANVAS_TEXT (ei->text)->layout, ++ PANGO_ALIGN_CENTER); ++ pango_layout_set_justify (GNOME_CANVAS_TEXT (ei->text)->layout, ++ FALSE); ++ g_object_set (ei->text, ++ "text", current_entry->title, ++ NULL); ++ } else ++ ei->text = NULL; ++ ++ if (current_entry->icon_pixbuf) { ++ GdkPixbuf *pixbuf = current_entry->icon_pixbuf; ++ GdkPixbuf *highlight_pixbuf = ++ create_spotlight_pixbuf (pixbuf); ++ ++ ei->icon_height = gdk_pixbuf_get_height (pixbuf); ++ ei->icon_width = gdk_pixbuf_get_width (pixbuf); ++ ei->pixbuf = gnome_canvas_item_new (ei->group, ++ gnome_canvas_pixbuf_get_type (), ++ "pixbuf", pixbuf, ++ NULL); ++ g_object_unref (pixbuf); ++ ei->highlight_pixbuf = gnome_canvas_item_new (ei->group, ++ gnome_canvas_pixbuf_get_type (), ++ "pixbuf", highlight_pixbuf, ++ NULL); ++ g_object_unref (highlight_pixbuf); ++ } else { ++ ei->pixbuf = NULL; ++ ei->highlight_pixbuf = NULL; ++ } ++ ++ ei->cover = gnome_canvas_item_new (ei->group, ++ panel_addto_event_box_get_type(), ++ NULL); ++ calculate_item_width (canvas, ei); ++ calculate_item_height (canvas, ei); ++ ++ ei->n_category = i; ++ ei->n_entry = j; ++ ei->index = index; ++ ++ setup_entry (canvas, current_entry); ++ ++ g_signal_connect (ei->cover, "event", ++ G_CALLBACK (cover_event), ++ current_entry); ++ index++; ++ } ++ } ++ ++ dialog = current_entry->dialog; ++ ++ g_signal_connect (G_OBJECT (canvas), "selection-changed", ++ G_CALLBACK (panel_addto_selection_changed), current_entry->dialog); ++} ++ ++ ++static const char * ++panel_addto_utf8_casestrstr (const char *haystack, const char *needle) ++{ ++ ++ if (!haystack) ++ return NULL; ++ ++ haystack = g_utf8_strdown (haystack, -1); ++ needle = g_utf8_strdown (needle, -1); ++ ++ const char *s; ++ gsize i; ++ gsize haystack_len = g_utf8_strlen (haystack, -1); ++ gsize needle_len = g_utf8_strlen (needle, -1); ++ int needle_size = strlen (needle); ++ ++ if (needle_len > haystack_len) ++ return NULL; ++ ++ s = haystack; ++ for (i = 0; i <= haystack_len - needle_len; i++) { ++ if (strncmp (s, needle, needle_size) == 0) ++ return s; ++ s = g_utf8_next_char (s); ++ } ++ ++ return NULL; ++} ++ ++void ++panel_addto_relayout_for_search (GtkWidget *search_entry, PanelAddtoDialog *dialog) ++{ ++ gchar *search_text; ++ PanelAddtoCanvasPrivate *priv; ++ ++ search_text = g_malloc (strlen ((gchar*) gtk_entry_get_text (GTK_ENTRY (search_entry))) + 1); ++ g_stpcpy (search_text, gtk_entry_get_text (GTK_ENTRY (search_entry))); ++ g_strchomp (search_text); ++ if (dialog->canvas) { ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ priv->search_text = search_text; ++ gtk_widget_queue_resize (GTK_WIDGET (dialog->canvas)); ++ } ++} ++ ++void ++panel_addto_activate_from_searchbar (GtkWidget *search_entry, PanelAddtoDialog *dialog) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ if (priv->selected) ++ activate_entry (priv->selected); ++} ++ ++/* If we can't find the search query in the applet's name, in the applet's ++ * description, nor in the applet's category, then the applet has to be hidden. ++ */ ++ ++static gboolean ++panel_addto_entry_must_be_hidden (PanelAddtoEntry *entry, const gchar **search_terms) ++{ ++ gint i; ++ gint nb_search_terms = 0, nb_found = 0; ++ gboolean search_is_null = TRUE; ++ ++ for (i = 0; search_terms[i] != NULL; i++) { ++ nb_search_terms ++; ++ search_is_null = FALSE; ++ if ( ++ (entry->title ++ && panel_addto_utf8_casestrstr (g_locale_to_utf8 (entry->title, -1, NULL, NULL, NULL), ++ g_locale_to_utf8 (search_terms[i], -1, NULL, NULL, NULL))) ++ || (entry->comment ++ && panel_addto_utf8_casestrstr (g_locale_to_utf8 (entry->comment, -1, NULL, NULL, NULL), ++ g_locale_to_utf8 (search_terms[i], -1, NULL, NULL, NULL))) ++ || (entry->category->title ++ && panel_addto_utf8_casestrstr (g_locale_to_utf8 (entry->category->title, -1, NULL, NULL, NULL), ++ g_locale_to_utf8 (search_terms[i], -1, NULL, NULL, NULL)))) ++ nb_found++; ++ } ++ ++ if (search_is_null || nb_found == nb_search_terms) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++/* A category canvas item contains all the elements ++ * for the category, as well as the title and a separator ++ */ ++static void ++relayout_category (PanelAddtoCanvas *canvas, CategoryInfo *catinfo, ++ gint vert_pos, gint *category_vert_pos) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ gnome_canvas_item_move_absolute (GNOME_CANVAS_ITEM (catinfo->group), ++ 0, vert_pos); ++ ++ if (catinfo->line) { ++ gnome_canvas_item_move_absolute (catinfo->line, BORDERS, ABOVE_LINE_SPACING); ++ ++ gnome_canvas_item_set (catinfo->line, ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) LINE_HEIGHT, ++ NULL); ++ } ++ ++ if (catinfo->title) { ++ double text_height, text_width; ++ ++ g_object_get (catinfo->title, ++ "text_height", &text_height, ++ "text_width", &text_width, ++ NULL); ++ ++ *category_vert_pos += text_height; /* move it down 1 line */ ++ gnome_canvas_item_move_absolute (catinfo->title, ++ (priv->rtl) ? priv->max_width - BORDERS - text_width : BORDERS, ++ *category_vert_pos); ++ *category_vert_pos += text_height + text_height/2 + UNDER_TITLE_SPACING; ++ } ++} ++ ++static void ++relayout_item (PanelAddtoCanvas *canvas, EntryInfo *ei, ++ gint category_horiz_pos, gint category_vert_pos) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ gnome_canvas_item_move_absolute (GNOME_CANVAS_ITEM (ei->group), ++ category_horiz_pos, ++ category_vert_pos); ++ ++ gnome_canvas_item_set (ei->selection, ++ "x2", (double) priv->max_item_width + 2 * PAD, ++ "y2", (double) ei->text_height + 1, /* expand it down slightly */ ++ NULL); ++ ++ gnome_canvas_item_move_absolute (ei->selection, -PAD, priv->max_icon_height); ++ ++ if (ei->text) { ++ /* canvas asks layout for its extent, layout gives real ++ * size, not fixed width and drawing gets confused. ++ */ ++ gnome_canvas_item_set (ei->text, ++ "clip_width", (double) priv->max_item_width, ++ "clip_height", (double) priv->max_item_height, ++ NULL); ++ ++ /* text is centered by pango */ ++ pango_layout_set_width (GNOME_CANVAS_TEXT (ei->text)->layout, ++ (gint) priv->max_item_width * PANGO_SCALE); ++ ++ gnome_canvas_item_move_absolute (ei->text, ++ 0, priv->max_icon_height); ++ } ++ ++ if (ei->pixbuf) { ++ /* manually center the icon */ ++ gnome_canvas_item_move_absolute (ei->pixbuf, ++ priv->max_item_width / 2 - ei->icon_width / 2, 0); ++ gnome_canvas_item_move_absolute (ei->highlight_pixbuf, ++ priv->max_item_width / 2 - ei->icon_width / 2, 0); ++ } ++ ++ /* cover the item */ ++ gnome_canvas_item_set (ei->cover, ++ "x2", (double) priv->max_item_width, ++ "y2", (double) priv->max_item_height, ++ NULL); ++} ++ ++static void ++relayout_canvas (PanelAddtoCanvas *canvas) ++{ ++ gint entry; ++ gint vert_pos, category_vert_pos, category_horiz_pos; ++ gint real_width; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ PanelAddtoEntry *current_entry; ++ CategoryInfo *catinfo; ++ EntryInfo *ei; ++ GSList *l, *m; ++ gboolean at_least_one_found, first_shown_category, first_shown_entry; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ real_width = priv->max_width - 2 * BORDERS + ITEMS_SEPARATION; ++ priv->items_per_row = real_width / ((gint) priv->max_item_width + ITEMS_SEPARATION); ++ ++ vert_pos = BORDERS; ++ ++ const gchar *search_text = priv->search_text; ++ gchar **search_terms; ++ search_terms = search_text ? g_strsplit (search_text, " ", 0) : NULL; ++ ++ first_shown_category = TRUE; ++ first_shown_entry = TRUE; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ ++ at_least_one_found = FALSE; ++ category_vert_pos = 0; ++ ++ category_horiz_pos = (priv->rtl) ? priv->max_width - (gint) priv->max_item_width - BORDERS : BORDERS; ++ ++ current_category = l->data; ++ catinfo = current_category->user_data; ++ ++ relayout_category (canvas, catinfo, vert_pos, &category_vert_pos); ++ category_vert_pos += UNDER_LINE_SPACING; ++ ++ for (m = current_category->entries, entry = 0; m; m = m->next, entry++) { ++ ++ current_entry = m->data; ++ ei = current_entry->user_data; ++ ++ /* we don't want the first item to wrap, it would ++ be too separated from the section title */ ++ ++ if (!search_text || !panel_addto_entry_must_be_hidden (current_entry, (const gchar **)search_terms)) { ++ at_least_one_found = TRUE; ++ gnome_canvas_item_show (GNOME_CANVAS_ITEM (ei->group)); ++ ei->visible = TRUE; ++ if ((entry > 0) && ++ ((priv->items_per_row == 0) || ++ (priv->items_per_row > 0 && (entry % priv->items_per_row == 0)))) { ++ ++ category_horiz_pos = (priv->rtl) ? ++ priv->max_width - (gint) priv->max_item_width - BORDERS : BORDERS; ++ category_vert_pos += (gint) priv->max_item_height + ITEMS_SEPARATION; ++ } ++ ++ relayout_item (canvas, ei, category_horiz_pos, category_vert_pos); ++ ++ if (priv->rtl) ++ category_horiz_pos -= (gint) priv->max_item_width + ITEMS_SEPARATION; ++ else ++ category_horiz_pos += (gint) priv->max_item_width + ITEMS_SEPARATION; ++ ++ /* If the user is actually using the search bar, select ++ * the first shown entry. ++ */ ++ if (search_text && first_shown_entry) { ++ select_entry (canvas, current_entry); ++ first_shown_entry = FALSE; ++ } ++ } else { ++ gnome_canvas_item_hide (GNOME_CANVAS_ITEM (ei->group)); ++ ei->visible = FALSE; ++ entry --; ++ } ++ ++ } ++ if (at_least_one_found) { ++ gnome_canvas_item_show (GNOME_CANVAS_ITEM (catinfo->group)); ++ catinfo->visible = TRUE; ++ category_vert_pos += (gint) priv->max_item_height; ++ vert_pos += category_vert_pos + ITEMS_SEPARATION; ++ ++ if (first_shown_category) { ++ g_object_set (catinfo->line, ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) 0, ++ NULL); ++ first_shown_category = FALSE; ++ } else { ++ g_object_set (catinfo->line, ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) LINE_HEIGHT, ++ NULL); ++ } ++ ++ } else { ++ gnome_canvas_item_hide (GNOME_CANVAS_ITEM (catinfo->group)); ++ catinfo->visible = FALSE; ++ } ++ } ++ ++ /* substract the last ITEMS_SEPARATION to ++ adjust the canvas size a bit more */ ++ vert_pos -= ITEMS_SEPARATION; ++ ++ priv->height = MAX (vert_pos, priv->min_height); ++ priv->width = priv->max_width; ++} ++ ++ ++static void ++set_style (PanelAddtoCanvas *canvas, gboolean font_changed) ++{ ++ GSList *l, *m; ++ PanelAddtoCategory *current_category; ++ PanelAddtoEntry *current_entry; ++ PanelAddtoCanvasPrivate *priv; ++ GtkWidget *widget = GTK_WIDGET (canvas); ++ ++ ++ if (!GTK_WIDGET_REALIZED (widget)) ++ return; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ CategoryInfo *catinfo = current_category->user_data; ++ ++ if (catinfo->line) { ++ g_object_set (catinfo->line, ++ "fill_color_gdk", &widget->style->text_aa[GTK_STATE_NORMAL], ++ NULL); ++ } ++ if (catinfo->title) { ++ g_object_set (catinfo->title, ++ "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL], ++ NULL); ++ ++ if (font_changed) ++ g_object_set (catinfo->title, ++ "font", NULL, ++ NULL); ++ } ++ ++ for (m = current_category->entries; m; m = m->next) { ++ current_entry = m->data; ++ EntryInfo *entryinfo = current_entry->user_data; ++ if (font_changed && entryinfo->text) ++ g_object_set (entryinfo->text, ++ "font", NULL, ++ NULL); ++ setup_entry (canvas, current_entry); ++ } ++ } ++ ++ if (font_changed) { ++ calculate_sizes (canvas); ++ relayout_canvas (canvas); ++ } ++} ++ ++ ++GtkWidget* ++panel_addto_canvas_new (PanelAddtoInformation *info) ++{ ++ ++ return g_object_new (PANEL_ADDTO_TYPE_CANVAS, ++ "info", info, ++ NULL); ++} ++ ++/* Accessibility support */ ++ ++static gpointer accessible_parent_class; ++static gpointer accessible_item_parent_class; ++ ++enum { ++ ACTION_ACTIVATE, ++ LAST_ACTION ++}; ++ ++typedef struct { ++ AtkObject parent; ++ ++ PanelAddtoEntry *entry; ++ AtkStateSet *state_set; ++ ++ guint action_idle_handler; ++} PanelAddtoCanvasItemAccessible; ++ ++typedef struct { ++ AtkObjectClass parent_class; ++} PanelAddtoCanvasItemAccessibleClass; ++ ++static const gchar *const action_names[] = ++{ ++ "activate", ++ NULL ++}; ++ ++static const gchar *const action_descriptions[] = ++{ ++ "Activate item", ++ NULL ++}; ++ ++static void ++panel_addto_canvas_item_accessible_get_extents (AtkComponent *component, ++ gint *x, ++ gint *y, ++ gint *width, ++ gint *height, ++ AtkCoordType coord_type) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoCanvas *canvas; ++ GnomeCanvasItem *cover; ++ AtkObject *parent_object; ++ gint p_x, p_y; ++ ++ item = (PanelAddtoCanvasItemAccessible *) component; ++ ++ canvas = ((EntryInfo *) item->entry->user_data)->canvas; ++ parent_object = gtk_widget_get_accessible (GTK_WIDGET (canvas)); ++ atk_component_get_position (ATK_COMPONENT (parent_object), &p_x, &p_y, coord_type); ++ ++ ++ /* the cover pretty much represents the item size */ ++ ++ ++ cover = GNOME_CANVAS_ITEM (((EntryInfo *)item->entry->user_data)->cover); ++ ++ *x = p_x + cover->x1; ++ *y = p_y + cover->y1; ++ *width = cover->x2 - cover->x1; ++ *height = cover->y2 - cover->y1; ++} ++ ++static void ++atk_component_item_interface_init (AtkComponentIface *iface) ++{ ++ iface->get_extents = panel_addto_canvas_item_accessible_get_extents; ++} ++ ++static gboolean ++idle_do_action (gpointer data) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ item = (PanelAddtoCanvasItemAccessible *) data; ++ ++ item->action_idle_handler = 0; ++ activate_entry (item->entry); ++ ++ return FALSE; ++} ++ ++ ++static gboolean ++panel_addto_canvas_item_accessible_action_do_action (AtkAction *action, ++ gint index) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ if (index < 0 || index >= LAST_ACTION) ++ return FALSE; ++ ++ item = (PanelAddtoCanvasItemAccessible *) action; ++ ++ switch (index) { ++ case ACTION_ACTIVATE: ++ if (!item->action_idle_handler) ++ item->action_idle_handler = g_idle_add (idle_do_action, item); ++ break; ++ default: ++ g_assert_not_reached (); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++static gint ++panel_addto_canvas_item_accessible_action_get_n_actions (AtkAction *action) ++{ ++ return LAST_ACTION; ++} ++ ++static const gchar * ++panel_addto_canvas_item_accessible_action_get_description (AtkAction *action, ++ gint index) ++{ ++ if (index < 0 || index >= LAST_ACTION) ++ return NULL; ++ ++ return action_descriptions[index]; ++} ++ ++static const gchar * ++panel_addto_canvas_item_accessible_action_get_name (AtkAction *action, ++ gint index) ++{ ++ if (index < 0 || index >= LAST_ACTION) ++ return NULL; ++ ++ return action_names[index]; ++} ++ ++static void ++atk_action_item_interface_init (AtkActionIface *iface) ++{ ++ iface->do_action = panel_addto_canvas_item_accessible_action_do_action; ++ iface->get_n_actions = panel_addto_canvas_item_accessible_action_get_n_actions; ++ iface->get_description = panel_addto_canvas_item_accessible_action_get_description; ++ iface->get_name = panel_addto_canvas_item_accessible_action_get_name; ++} ++ ++static gint ++panel_addto_canvas_item_accessible_get_index_in_parent (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ ++ return ((EntryInfo *) item->entry->user_data)->index; ++} ++ ++static G_CONST_RETURN gchar* ++panel_addto_canvas_item_accessible_get_name (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ if (object->name) ++ return object->name; ++ else { ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ ++ if (item->entry && item->entry->title) ++ return item->entry->title; ++ else ++ return "Item with no description"; ++ } ++} ++ ++static AtkObject* ++panel_addto_canvas_item_accessible_get_parent (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoCanvas *canvas; ++ ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ canvas = ((EntryInfo *) item->entry->user_data)->canvas; ++ ++ return gtk_widget_get_accessible (GTK_WIDGET (canvas)); ++} ++ ++static AtkStateSet* ++panel_addto_canvas_item_accessible_ref_state_set (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ canvas = ((EntryInfo *) item->entry->user_data)->canvas; ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (item->entry == priv->selected) ++ atk_state_set_add_state (item->state_set, ATK_STATE_FOCUSED); ++ else ++ atk_state_set_remove_state (item->state_set, ATK_STATE_FOCUSED); ++ ++ return g_object_ref (item->state_set); ++} ++ ++static void ++panel_addto_canvas_item_accessible_class_init (AtkObjectClass *class) ++{ ++ GObjectClass *object_class; ++ ++ accessible_item_parent_class = g_type_class_peek_parent (class); ++ ++ object_class = (GObjectClass *)class; ++ ++ class->get_index_in_parent = panel_addto_canvas_item_accessible_get_index_in_parent; ++ class->get_name = panel_addto_canvas_item_accessible_get_name; ++ class->get_parent = panel_addto_canvas_item_accessible_get_parent; ++ class->ref_state_set = panel_addto_canvas_item_accessible_ref_state_set; ++} ++ ++static void ++panel_addto_canvas_item_accessible_object_init (PanelAddtoCanvasItemAccessible *item) ++{ ++ item->state_set = atk_state_set_new (); ++ ++ atk_state_set_add_state (item->state_set, ATK_STATE_ENABLED); ++ atk_state_set_add_state (item->state_set, ATK_STATE_FOCUSABLE); ++ atk_state_set_add_state (item->state_set, ATK_STATE_SENSITIVE); ++ atk_state_set_add_state (item->state_set, ATK_STATE_SELECTABLE); ++ atk_state_set_add_state (item->state_set, ATK_STATE_VISIBLE); ++ ++ item->action_idle_handler = 0; ++} ++ ++static GType ++panel_addto_canvas_item_accessible_get_type (void) ++{ ++ static GType type = 0; ++ ++ if (type == 0) { ++ static const GTypeInfo info = { ++ sizeof (PanelAddtoCanvasItemAccessibleClass), ++ (GBaseInitFunc) NULL, /* base init */ ++ (GBaseFinalizeFunc) NULL, /* base finalize */ ++ (GClassInitFunc) panel_addto_canvas_item_accessible_class_init, /* class init */ ++ (GClassFinalizeFunc) NULL, /* class finalize */ ++ NULL, /* class data */ ++ sizeof (PanelAddtoCanvasItemAccessible), /* instance size */ ++ 0, /* nb preallocs */ ++ (GInstanceInitFunc) panel_addto_canvas_item_accessible_object_init, /* instance init */ ++ NULL /* value table */ ++ }; ++ ++ static const GInterfaceInfo atk_component_info = { ++ (GInterfaceInitFunc) atk_component_item_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ static const GInterfaceInfo atk_action_info = { ++ (GInterfaceInitFunc) atk_action_item_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ type = g_type_register_static (ATK_TYPE_OBJECT, ++ "PanelAddtoCanvasItemAccessible", &info, 0); ++ ++ g_type_add_interface_static (type, ATK_TYPE_COMPONENT, ++ &atk_component_info); ++ g_type_add_interface_static (type, ATK_TYPE_ACTION, ++ &atk_action_info); ++ } ++ ++ return type; ++} ++ ++static gint ++panel_addto_canvas_accessible_get_n_children (AtkObject *accessible) ++{ ++ GSList *l; ++ PanelAddtoCategory *current_category; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ gint count; ++ ++ widget = GTK_ACCESSIBLE (accessible)->widget; ++ ++ if (!widget) ++ return 0; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ count = 0; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ count += current_category->n_entries; ++ } ++ ++ return count; ++} ++ ++static PanelAddtoEntry* ++panel_addto_canvas_accessible_get_entry (PanelAddtoCanvas *canvas, gint index) ++{ ++ GSList *l; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ gint count; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ count = 0; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ if (index >= count && ++ index < count + current_category->n_entries) { ++ return g_slist_nth_data (current_category->entries, index - count); ++ } else ++ count += current_category->n_entries; ++ } ++ ++ return NULL; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_ref_child (AtkObject *accessible, gint index) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoEntry *entry; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ AtkObject *object; ++ ++ widget = GTK_ACCESSIBLE (accessible)->widget; ++ ++ if (!widget) ++ return NULL; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ entry = panel_addto_canvas_accessible_get_entry (canvas, index); ++ ++ if (!entry) ++ return NULL; ++ ++ object = g_hash_table_lookup (priv->accessible_children, &index); ++ ++ if (!object) { ++ object = g_object_new (panel_addto_canvas_item_accessible_get_type (), NULL); ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ ++ object->role = ATK_ROLE_ICON; ++ item->entry = entry; ++ ++ g_hash_table_insert (priv->accessible_children, ++ &((EntryInfo *) entry->user_data)->index, object); ++ } ++ ++ return g_object_ref (object); ++} ++ ++static void ++panel_addto_canvas_accessible_initialize (AtkObject *accessible, gpointer data) ++{ ++ if (ATK_OBJECT_CLASS (accessible_parent_class)->initialize) ++ ATK_OBJECT_CLASS (accessible_parent_class)->initialize (accessible, data); ++ ++ accessible->role = ATK_ROLE_LAYERED_PANE; ++} ++ ++static void ++panel_addto_canvas_accessible_class_init (AtkObjectClass *class) ++{ ++ GObjectClass *object_class; ++ GtkAccessibleClass *accessible_class; ++ ++ accessible_parent_class = g_type_class_peek_parent (class); ++ ++ object_class = (GObjectClass *)class; ++ accessible_class = (GtkAccessibleClass *)class; ++ ++ class->get_n_children = panel_addto_canvas_accessible_get_n_children; ++ class->ref_child = panel_addto_canvas_accessible_ref_child; ++ class->initialize = panel_addto_canvas_accessible_initialize; ++} ++ ++static gboolean ++panel_addto_canvas_accessible_add_selection (AtkSelection *selection, gint i) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ PanelAddtoEntry *entry; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return FALSE; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ entry = panel_addto_canvas_accessible_get_entry (canvas, i); ++ select_entry (canvas, entry); ++ ++ return TRUE; ++} ++ ++static gboolean ++panel_addto_canvas_accessible_clear_selection (AtkSelection *selection) ++{ ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return FALSE; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ select_entry (canvas, NULL); ++ ++ return TRUE; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_ref_selection (AtkSelection *selection, gint i) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return NULL; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (priv->selected) ++ return atk_object_ref_accessible_child (gtk_widget_get_accessible (widget), ++ ((EntryInfo *)priv->selected->user_data)->index); ++ return NULL; ++} ++ ++static gint ++panel_addto_canvas_accessible_get_selection_count (AtkSelection *selection) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return 0; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ return (priv->selected) ? 1 : 0; ++} ++ ++static gboolean ++panel_addto_canvas_accessible_is_child_selected (AtkSelection *selection, gint i) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return FALSE; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ return (priv->selected == panel_addto_canvas_accessible_get_entry (canvas, i)); ++} ++ ++static gboolean ++panel_addto_canvas_accessible_remove_selection (AtkSelection *selection, gint i) ++{ ++ /* There can be only one item selected */ ++ return panel_addto_canvas_accessible_clear_selection (selection); ++} ++ ++static gboolean ++panel_addto_canvas_accessible_select_all_selection (AtkSelection *selection) ++{ ++ /* This can't happen */ ++ return FALSE; ++} ++ ++static void ++panel_addto_canvas_accessible_selection_interface_init (AtkSelectionIface *iface) ++{ ++ iface->add_selection = panel_addto_canvas_accessible_add_selection; ++ iface->clear_selection = panel_addto_canvas_accessible_clear_selection; ++ iface->ref_selection = panel_addto_canvas_accessible_ref_selection; ++ iface->get_selection_count = panel_addto_canvas_accessible_get_selection_count; ++ iface->is_child_selected = panel_addto_canvas_accessible_is_child_selected; ++ iface->remove_selection = panel_addto_canvas_accessible_remove_selection; ++ iface->select_all_selection = panel_addto_canvas_accessible_select_all_selection; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_ref_accessible_at_point (AtkComponent *component, ++ gint x, ++ gint y, ++ AtkCoordType coord_type) ++{ ++ GSList *l, *m; ++ GtkWidget *widget; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ PanelAddtoCategory *current_category; ++ EntryInfo *entry; ++ gint x_pos, y_pos, x_w, y_w; ++ ++ widget = GTK_ACCESSIBLE (component)->widget; ++ ++ if (widget == NULL) ++ return NULL; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ atk_component_get_extents (component, &x_pos, &y_pos, NULL, NULL, coord_type); ++ x_w = x - x_pos; ++ y_w = y - y_pos; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ for (m = current_category->entries; m; m = m->next) { ++ entry = (EntryInfo *) m->data; ++ ++ if (x_w > entry->cover->x1 && ++ x_w < entry->cover->x2 && ++ y_w > entry->cover->y1 && ++ y_w < entry->cover->y2) ++ return panel_addto_canvas_accessible_ref_child (ATK_OBJECT (component), entry->index); ++ } ++ } ++ ++ return NULL; ++} ++ ++static void ++atk_component_interface_init (AtkComponentIface *iface) ++{ ++ iface->ref_accessible_at_point = panel_addto_canvas_accessible_ref_accessible_at_point; ++} ++ ++static GType ++panel_addto_canvas_accessible_get_type (void) ++{ ++ static GType type = 0; ++ AtkObjectFactory *factory; ++ GType derived_type; ++ GTypeQuery query; ++ GType derived_atk_type; ++ ++ if (type == 0) { ++ static GTypeInfo info = { ++ 0, /* class size */ ++ (GBaseInitFunc) NULL, /* base init */ ++ (GBaseFinalizeFunc) NULL, /* base finalize */ ++ (GClassInitFunc) panel_addto_canvas_accessible_class_init, ++ (GClassFinalizeFunc) NULL, /* class finalize */ ++ NULL, /* class data */ ++ 0, /* instance size */ ++ 0, /* nb preallocs */ ++ (GInstanceInitFunc) NULL, /* instance init */ ++ NULL /* value table */ ++ }; ++ ++ static const GInterfaceInfo atk_component_info = { ++ (GInterfaceInitFunc) atk_component_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ static const GInterfaceInfo atk_selection_info = { ++ (GInterfaceInitFunc) panel_addto_canvas_accessible_selection_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ derived_type = g_type_parent (PANEL_ADDTO_TYPE_CANVAS); ++ factory = atk_registry_get_factory (atk_get_default_registry (), ++ derived_type); ++ ++ derived_atk_type = atk_object_factory_get_accessible_type (factory); ++ g_type_query (derived_atk_type, &query); ++ ++ info.class_size = query.class_size; ++ info.instance_size = query.instance_size; ++ ++ type = g_type_register_static (derived_atk_type, ++ "PanelAddtoCanvasAccessible", ++ &info, 0); ++ ++ g_type_add_interface_static (type, ++ ATK_TYPE_COMPONENT, ++ &atk_component_info); ++ g_type_add_interface_static (type, ++ ATK_TYPE_SELECTION, ++ &atk_selection_info); ++ } ++ ++ return type; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_new (GObject *object) ++{ ++ AtkObject *accessible; ++ ++ accessible = g_object_new (panel_addto_canvas_accessible_get_type (), NULL); ++ atk_object_initialize (accessible, object); ++ ++ return accessible; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_factory_create_accessible (GObject *object) ++{ ++ return panel_addto_canvas_accessible_new (object); ++} ++ ++static void ++panel_addto_canvas_accessible_factory_class_init (AtkObjectFactoryClass *class) ++{ ++ class->create_accessible = panel_addto_canvas_accessible_factory_create_accessible; ++ class->get_accessible_type = panel_addto_canvas_accessible_get_type; ++} ++ ++static GType ++panel_addto_canvas_accessible_factory_get_type (void) ++{ ++ static GType type = 0; ++ ++ if (type == 0) { ++ static const GTypeInfo info = { ++ sizeof (AtkObjectFactoryClass), ++ NULL, /* base_init */ ++ NULL, /* base_finalize */ ++ (GClassInitFunc) panel_addto_canvas_accessible_factory_class_init, ++ NULL, /* class_finalize */ ++ NULL, /* class_data */ ++ sizeof (AtkObjectFactory), ++ 0, /* n_preallocs */ ++ NULL, NULL ++ }; ++ ++ type = g_type_register_static (ATK_TYPE_OBJECT_FACTORY, ++ "PanelAddtoCanvasAccessibleFactory", ++ &info, 0); ++ } ++ ++ return type; ++} ++ ++static AtkObject* ++panel_addto_canvas_get_accessible (GtkWidget *widget) ++{ ++ static gboolean already_here = FALSE; ++ ++ if (!already_here) { ++ AtkObjectFactory *factory; ++ AtkRegistry *registry; ++ GType derived_type; ++ GType derived_atk_type; ++ ++ already_here = TRUE; ++ ++ derived_type = g_type_parent (PANEL_ADDTO_TYPE_CANVAS); ++ ++ registry = atk_get_default_registry (); ++ factory = atk_registry_get_factory (registry, derived_type); ++ ++ derived_atk_type = atk_object_factory_get_accessible_type (factory); ++ ++ if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) { ++ atk_registry_set_factory_type (registry, ++ PANEL_ADDTO_TYPE_CANVAS, ++ panel_addto_canvas_accessible_factory_get_type ()); ++ } ++ } ++ ++ return (* GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->get_accessible) (widget); ++} +diff -Nur gnome-panel-2.17.92/panel-addto-canvas.h gnome-panel-2.17.92.new/panel-addto-canvas.h +--- gnome-panel-2.17.92/panel-addto-canvas.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/panel-addto-canvas.h 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,88 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* Copyright (C) 2005 Carlos Garnacho ++ * ++ * 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 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. ++ * ++ * Authors: Jody Goldberg ++ * Carlos Garnacho Parro ++ * Manu Cornet ++ */ ++ ++#ifndef PANEL_ADDTO_CANVAS_H ++#define PANEL_ADDTO_CANVAS_H ++ ++#include ++#include ++#include "panel-addto.h" ++ ++G_BEGIN_DECLS ++ ++#define PANEL_ADDTO_TYPE_CANVAS (panel_addto_canvas_get_type ()) ++#define PANEL_ADDTO_CANVAS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvas)) ++#define PANEL_ADDTO_CANVAS_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasClass)) ++#define PANEL_ADDTO_IS_CANVAS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_ADDTO_TYPE_CANVAS)) ++#define PANEL_ADDTO_IS_CANVAS_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), PANEL_ADDTO_TYPE_CANVAS)) ++#define PANEL_ADDTO_CANVAS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasClass)) ++ ++typedef struct _PanelAddtoCanvas PanelAddtoCanvas; ++typedef struct _PanelAddtoCanvasClass PanelAddtoCanvasClass; ++ ++struct _PanelAddtoCanvas { ++ GnomeCanvas parent; ++}; ++ ++struct _PanelAddtoCanvasClass { ++ GnomeCanvasClass parent_class; ++ ++ void (*changed) (PanelAddtoCanvas *canvas, gchar *str); ++}; ++ ++typedef struct _PanelAddtoCanvasPrivate PanelAddtoCanvasPrivate; ++ ++struct _PanelAddtoCanvasPrivate { ++ GnomeCanvasItem *under_cover; ++ double height; ++ double width; ++ ++ double min_height; ++ double max_width; ++ PanelAddtoInformation *info; ++ PanelAddtoEntry *selected; ++ ++ gboolean rtl; ++ gint items_per_row; ++ gint selected_row; ++ ++ gchar *search_text; ++ ++ /* calculated sizes ++ for the elements */ ++ gdouble max_item_width; ++ gdouble max_item_height; ++ gdouble max_icon_height; ++ ++ /* accessibility stuff */ ++ GHashTable *accessible_children; ++}; ++ ++GType panel_addto_canvas_get_type (void); ++void activate_entry (PanelAddtoEntry *entry); ++void panel_addto_relayout_for_search (GtkWidget *search_entry, PanelAddtoDialog *dialog); ++void panel_addto_activate_from_searchbar (GtkWidget *search_entry, PanelAddtoDialog *dialog); ++GtkWidget* panel_addto_canvas_new (PanelAddtoInformation *info); ++ ++G_END_DECLS ++ ++#endif /* PANEL_ADDTO_CANVAS_H */ +diff -Nur gnome-panel-2.17.92/panel-addto-event-box.c gnome-panel-2.17.92.new/panel-addto-event-box.c +--- gnome-panel-2.17.92/panel-addto-event-box.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/panel-addto-event-box.c 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,99 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation ++ * All rights reserved. ++ * ++ * This file is part of the Gnome Library. ++ * ++ * The Gnome Library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * The Gnome Library 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 Library General Public ++ * License along with the Gnome Library; see the file COPYING.LIB. If not, ++ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++/* ++ @NOTATION@ ++ */ ++/* Event box item type for GnomeCanvas widget ++ * ++ * GnomeCanvas is basically a port of the Tk toolkit's most excellent canvas widget. Tk is ++ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties. ++ * ++ * ++ * Author: Chris Lahey ++ */ ++ ++#include ++ ++#include "panel-addto-event-box.h" ++ ++#define noVERBOSE ++ ++static GnomeCanvasItemClass *parent_class; ++ ++static double ++panel_addto_event_box_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, ++ GnomeCanvasItem **actual_item) ++{ ++ double x1, x2, y1, y2; ++ g_object_get (item, ++ "x1", &x1, ++ "x2", &x2, ++ "y1", &y1, ++ "y2", &y2, ++ NULL); ++ if (x <= x2 && x >= x1 && ++ y <= y2 && y >= y1) { ++ *actual_item = item; ++ ++ return 0.0; ++ } ++ return 1e12; ++} ++ ++static void ++panel_addto_event_box_class_init (PanelAddtoEventBoxClass *class) ++{ ++ GnomeCanvasItemClass *item_class; ++ ++ item_class = (GnomeCanvasItemClass *) class; ++ ++ parent_class = g_type_class_peek_parent (class); ++ ++ item_class->point = panel_addto_event_box_point; ++} ++ ++GType ++panel_addto_event_box_get_type (void) ++{ ++ static GType type; ++ ++ if (!type) { ++ static const GTypeInfo object_info = { ++ sizeof (PanelAddtoEventBoxClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) panel_addto_event_box_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (PanelAddtoEventBox), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ type = g_type_register_static (GNOME_TYPE_CANVAS_RECT, "PanelAddtoEventBox", ++ &object_info, 0); ++ } ++ ++ return type; ++} +diff -Nur gnome-panel-2.17.92/panel-addto-event-box.h gnome-panel-2.17.92.new/panel-addto-event-box.h +--- gnome-panel-2.17.92/panel-addto-event-box.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/panel-addto-event-box.h 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,75 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation ++ * All rights reserved. ++ * ++ * This file is part of the Gnome Library. ++ * ++ * The Gnome Library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * The Gnome Library 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 Library General Public ++ * License along with the Gnome Library; see the file COPYING.LIB. If not, ++ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++/* ++ @NOTATION@ ++ */ ++/* Event Box item type for GnomeCanvas widget ++ * ++ * GnomeCanvas is basically a port of the Tk toolkit's most excellent canvas widget. Tk is ++ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties. ++ * ++ * ++ * Author: Chris Lahey ++ */ ++ ++#ifndef PANEL_ADDTO_EVENT_BOX_H ++#define PANEL_ADDTO_EVENT_BOX_H ++ ++ ++#include ++ ++#include ++ ++G_BEGIN_DECLS ++ ++/* Event Box item. No configurable or queryable arguments are available (use those in ++ * GnomeCanvasRE). ++ */ ++ ++ ++#define PANEL_ADDTO_TYPE_EVENT_BOX (panel_addto_event_box_get_type ()) ++#define PANEL_ADDTO_EVENT_BOX(obj) (GTK_CHECK_CAST ((obj), PANEL_ADDTO_TYPE_EVENT_BOX, PanelAddtoEventBox)) ++#define PANEL_ADDTO_EVENT_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), PANEL_ADDTO_TYPE_EVENT_BOX, PanelAddtoEventBoxClass)) ++#define PANEL_ADDTO_IS_EVENT_BOX(obj) (GTK_CHECK_TYPE ((obj), PANEL_ADDTO_TYPE_EVENT_BOX)) ++#define PANEL_ADDTO_IS_EVENT_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), PANEL_ADDTO_TYPE_EVENT_BOX)) ++#define PANEL_ADDTO_EVENT_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), PANEL_ADDTO_TYPE_EVENT_BOX, PanelAddtoEventBoxClass)) ++ ++ ++typedef struct _PanelAddtoEventBox PanelAddtoEventBox; ++typedef struct _PanelAddtoEventBoxClass PanelAddtoEventBoxClass; ++ ++struct _PanelAddtoEventBox { ++ GnomeCanvasRect item; ++}; ++ ++struct _PanelAddtoEventBoxClass { ++ GnomeCanvasRectClass parent_class; ++}; ++ ++ ++/* Standard Gtk function */ ++GType panel_addto_event_box_get_type (void) G_GNUC_CONST; ++ ++G_END_DECLS ++ ++#endif +diff -Nur gnome-panel-2.17.92/panel-addto-rounded-rect.c gnome-panel-2.17.92.new/panel-addto-rounded-rect.c +--- gnome-panel-2.17.92/panel-addto-rounded-rect.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/panel-addto-rounded-rect.c 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,103 @@ ++/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * panel-addto-rounded-rect.c: A rectangle with rounded corners ++ * ++ * Copyright (C) 2004 Novell Inc ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of version 2 of the GNU General Public ++ * License as published by the Free Software Foundation. ++ * ++ * 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 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 ++ */ ++ ++#include ++#include "panel-addto-rounded-rect.h" ++#include "panel-addto-rounded-rect-pixbuf.h" ++#include ++#include ++ ++struct _PanelAddtoRoundedRect { ++ GnomeCanvasRect base; ++}; ++typedef GnomeCanvasRectClass PanelAddtoRoundedRectClass; ++ ++#define GNOMECC_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNOMECC_TYPE_ROUNDED_RECT, PanelAddtoRoundedRectClass)) ++#define GNOMECC_IS_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOMECC_TYPE_ROUNDED_RECT)) ++ ++G_DEFINE_TYPE (PanelAddtoRoundedRect, panel_addto_rounded_rect, GNOME_TYPE_CANVAS_RECT); ++ ++/************************************************************************* ++ * Adapted from nautilus/libnautilus-private/nautilus-icon-canvas-item.c ++ */ ++/* clear the corners of the selection pixbuf by copying the corners of the passed-in pixbuf */ ++static void ++panel_addto_rounded_rect_draw (GnomeCanvasItem *item, GdkDrawable *drawable, ++ int x, int y, int width, int height) ++{ ++ static GdkPixbuf *corner_pixbuf = NULL; ++ GnomeCanvasRE const *re = GNOME_CANVAS_RE (item); ++ int dest_width, dest_height, src_width, src_height; ++ int dx, dy; ++ int corner_size = 5; ++ double affine[6]; ++ ++ GNOME_CANVAS_ITEM_CLASS (panel_addto_rounded_rect_parent_class)->draw (item, drawable, x, y, width, height); ++ ++ if (corner_pixbuf == NULL) ++ corner_pixbuf = gdk_pixbuf_new_from_inline (-1, ++ panel_addto_rounded_rect_frame, FALSE, NULL); ++ src_width = gdk_pixbuf_get_width (corner_pixbuf); ++ src_height = gdk_pixbuf_get_height (corner_pixbuf); ++ ++ gnome_canvas_item_i2c_affine (item, affine); ++ ++ dest_width = fabs (re->x2 - re->x1); ++ dest_height = fabs (re->y2 - re->y1); ++ dx = affine[4] - x; ++ dy = affine[5] - y; ++ ++ /* draw top left corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ 0, 0, ++ dx, dy, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++ /* draw top right corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ src_width - corner_size, 0, ++ dx + dest_width - corner_size, dy, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++ /* draw bottom left corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ 0, src_height - corner_size, ++ dx, dy + dest_height - corner_size, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++ /* draw bottom right corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ src_width - corner_size, src_height - corner_size, ++ dx + dest_width - corner_size, dy + dest_height - corner_size, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++} ++ ++static void ++panel_addto_rounded_rect_class_init (PanelAddtoRoundedRectClass *klass) ++{ ++ GnomeCanvasItemClass *item_klass = (GnomeCanvasItemClass *) klass; ++ item_klass->draw = panel_addto_rounded_rect_draw; ++} ++static void ++panel_addto_rounded_rect_init (PanelAddtoRoundedRect *rr) ++{ ++} +diff -Nur gnome-panel-2.17.92/panel-addto-rounded-rect.h gnome-panel-2.17.92.new/panel-addto-rounded-rect.h +--- gnome-panel-2.17.92/panel-addto-rounded-rect.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/panel-addto-rounded-rect.h 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,39 @@ ++/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * gnomecc-rounded-rect.c: A rectangle with rounded corners ++ * ++ * Copyright (C) 2004 Novell Inc ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of version 2 of the GNU General Public ++ * License as published by the Free Software Foundation. ++ * ++ * 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 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 PANEL_ADDTO_ROUNDED_RECT_H ++#define PANEL_ADDTO_ROUNDED_RECT_H ++ ++#include ++#include ++#include ++ ++G_BEGIN_DECLS ++ ++#define PANEL_ADDTO_TYPE_ROUNDED_RECT (panel_addto_rounded_rect_get_type ()) ++#define PANEL_ADDTO_ROUNDED_RECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_ADDTO_TYPE_ROUNDED_RECT, PanelAddtoRoundedRect)) ++#define PANEL_ADDTO_IS_ROUNDED_RECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_ADDTO_TYPE_ROUNDED_RECT)) ++ ++typedef struct _PanelAddtoRoundedRect PanelAddtoRoundedRect; ++GType panel_addto_rounded_rect_get_type (void); ++ ++G_END_DECLS ++ ++#endif /* PANEL_ADDTO_ROUNDED_RECT_H */ +diff -Nur gnome-panel-2.17.92/panel-addto-rounded-rect-pixbuf.h gnome-panel-2.17.92.new/panel-addto-rounded-rect-pixbuf.h +--- gnome-panel-2.17.92/panel-addto-rounded-rect-pixbuf.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.17.92.new/panel-addto-rounded-rect-pixbuf.h 2007-02-27 01:49:24.000000000 +0100 +@@ -0,0 +1,319 @@ ++/* GdkPixbuf RGBA C-Source image dump */ ++ ++#ifdef __SUNPRO_C ++#pragma align 4 (panel_addto_rounded_rect_frame) ++#endif ++#ifdef __GNUC__ ++static const guint8 panel_addto_rounded_rect_frame[] __attribute__ ((__aligned__ (4))) = ++#else ++static const guint8 panel_addto_rounded_rect_frame[] = ++#endif ++{ "" ++ /* Pixbuf magic (0x47646b50) */ ++ "GdkP" ++ /* length: header (24) + pixel_data (5848) */ ++ "\0\0\26\360" ++ /* pixdata_type (0x1010002) */ ++ "\1\1\0\2" ++ /* rowstride (344) */ ++ "\0\0\1X" ++ /* width (86) */ ++ "\0\0\0V" ++ /* height (17) */ ++ "\0\0\0\21" ++ /* pixel_data: */ ++ "\377\377\377\377\377\377\377\377\377\377\377\303\377\377\377q\377\377" ++ "\377/\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377/\377\377\377q\377\377\377\303\377\377" ++ "\377\377\377\377\377\377\377\377\377\377\377\377\377\242\377\377\377" ++ "(\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377(\377\377\377\242\377\377\377\377\377\377\377\303\377\377" ++ "\377(\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377(\377\377\377\303\377\377" ++ "\377q\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377q\377\377\377/\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377/\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377/\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377/\377\377" ++ "\377q\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377q\377\377\377\303\377\377\377(\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377(\377\377\377\303\377\377\377\377\377\377\377\242\377\377\377(\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377(\377\377\377\242\377\377\377\377\377\377\377\377\377\377\377" ++ "\377\377\377\377\303\377\377\377q\377\377\377/\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377/\377\377\377q\377\377\377\303\377\377\377\377\377\377\377\377"}; ++ ++ --- gnome-panel-2.18.0.orig/debian/patches/05_missing_includes.patch +++ gnome-panel-2.18.0/debian/patches/05_missing_includes.patch @@ -0,0 +1,21 @@ +diff -urN gnome-panel-2.10.1.orig/applets/clock/clock.c gnome-panel-2.10.1/applets/clock/clock.c +--- gnome-panel-2.10.1.orig/applets/clock/clock.c 2005-03-07 07:15:15.000000000 -0700 ++++ gnome-panel-2.10.1/applets/clock/clock.c 2005-06-17 13:44:44.149885607 -0600 +@@ -41,6 +41,7 @@ + + #include "config.h" + ++#include + #include + #include + #include +diff -urN gnome-panel-2.10.1.orig/gnome-panel/panel.c gnome-panel-2.10.1/gnome-panel/panel.c +--- gnome-panel-2.10.1.orig/gnome-panel/panel.c 2005-03-31 13:05:04.000000000 -0700 ++++ gnome-panel-2.10.1/gnome-panel/panel.c 2005-06-17 13:43:21.107894436 -0600 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include "panel.h" --- gnome-panel-2.18.0.orig/debian/patches/01_layout.patch +++ gnome-panel-2.18.0/debian/patches/01_layout.patch @@ -0,0 +1,52 @@ +diff -Nur gnome-panel-2.18.0/gnome-panel/panel-menu-items.c gnome-panel-2.18.0.new/gnome-panel/panel-menu-items.c +--- gnome-panel-2.18.0/gnome-panel/panel-menu-items.c 2007-03-12 19:48:43.000000000 +0100 ++++ gnome-panel-2.18.0.new/gnome-panel/panel-menu-items.c 2007-03-26 18:35:58.000000000 +0200 +@@ -569,6 +569,7 @@ + GtkWidget *places_menu; + GtkWidget *item; + char *gconf_name; ++ char *path; + + places_menu = panel_create_menu (); + +@@ -581,6 +582,16 @@ + if (gconf_name) + g_free (gconf_name); + ++ path = g_build_filename (g_get_home_dir (), "Documents", NULL); ++ if (g_file_test (path, G_FILE_TEST_IS_DIR)) ++ panel_menu_items_append_place_item ("gnome-fs-directory", ++ _("Documents"), ++ _("Documents directory"), ++ places_menu, ++ G_CALLBACK (activate_uri), ++ "Documents"); ++ g_free (path); ++ + if (!gconf_client_get_bool (panel_gconf_get_client (), + DESKTOP_IS_HOME_DIR_KEY, + NULL)) { +@@ -715,9 +726,22 @@ + if (add_separator) + add_menu_separator (menu); + +- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL); ++ panel_menu_items_append_from_desktop (menu, "yelp.desktop", _("Help and Support")); ++ ++ panel_menu_items_append_from_desktop (menu, "apport-gtk.desktop", NULL); ++ ++ add_menu_separator (menu); ++ + panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL); + ++ if (g_file_test (DATADIR"/omf/about-ubuntu/about-ubuntu-C.omf", ++ G_FILE_TEST_IS_REGULAR)) ++ panel_menu_items_append_from_desktop (menu, "ubuntu-about.desktop", NULL); ++ ++ if (g_file_test (DATADIR"/omf/about-edubuntu/about-edubuntu-C.omf", ++ G_FILE_TEST_IS_REGULAR)) ++ panel_menu_items_append_from_desktop (menu, "edubuntu-about.desktop", NULL); ++ + if (parent->priv->append_lock_logout) + panel_menu_items_append_lock_logout (menu); + } --- gnome-panel-2.18.0.orig/debian/patches/04_default_panel_config.patch +++ gnome-panel-2.18.0/debian/patches/04_default_panel_config.patch @@ -0,0 +1,292 @@ +diff -Nur gnome-panel-2.16.0/gnome-panel/panel-default-setup.entries gnome-panel-2.16.0.new/gnome-panel/panel-default-setup.entries +--- gnome-panel-2.16.0/gnome-panel/panel-default-setup.entries 2006-01-22 12:34:03.000000000 +0100 ++++ gnome-panel-2.16.0.new/gnome-panel/panel-default-setup.entries 2006-09-21 18:15:10.000000000 +0200 +@@ -35,6 +35,12 @@ + + email_launcher + ++ ++ yelp_launcher ++ ++ ++ session_dialog ++ + + + +@@ -47,9 +53,6 @@ + + + +- window_menu +- +- + mixer + + +@@ -67,6 +70,9 @@ + + workspace_switcher + ++ ++ trashapplet ++ + + + +@@ -252,7 +258,7 @@ + objects/browser_launcher/launcher_location + /schemas/apps/panel/objects/launcher_location + +- epiphany.desktop ++ firefox.desktop + + + +@@ -306,7 +312,7 @@ + objects/email_launcher/launcher_location + /schemas/apps/panel/objects/launcher_location + +- evolution.desktop ++ evolution-mail.desktop + + + +@@ -319,61 +325,61 @@ + objects/email_launcher/menu_path/schemas/apps/panel/objects/menu_path + objects/email_launcher/action_type/schemas/apps/panel/objects/action_type + +- ++ + + +- applets/window_menu/object_type ++ objects/yelp_launcher/object_type + /schemas/apps/panel/objects/object_type + +- bonobo-applet ++ launcher-object + + + +- applets/window_menu/toplevel_id ++ objects/yelp_launcher/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + +- applets/window_menu/position ++ objects/yelp_launcher/position + /schemas/apps/panel/objects/position + +- 0 ++ 4 + + + +- applets/window_menu/panel_right_stick ++ objects/yelp_launcher/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + +- true ++ false + + + +- applets/window_menu/locked ++ objects/yelp_launcher/locked + /schemas/apps/panel/objects/locked + + true + + + +- applets/window_menu/bonobo_iid +- /schemas/apps/panel/objects/bonobo_iid ++ objects/yelp_launcher/launcher_location ++ /schemas/apps/panel/objects/launcher_location + +- OAFIID:GNOME_WindowMenuApplet ++ file:///usr/share/applications/yelp.desktop + + + +- applets/window_menu/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id +- applets/window_menu/tooltip/schemas/apps/panel/objects/tooltip +- applets/window_menu/use_custom_icon/schemas/apps/panel/objects/use_custom_icon +- applets/window_menu/custom_icon/schemas/apps/panel/objects/custom_icon +- applets/window_menu/use_menu_path/schemas/apps/panel/objects/use_menu_path +- applets/window_menu/menu_path/schemas/apps/panel/objects/menu_path +- applets/window_menu/launcher_location/schemas/apps/panel/objects/launcher_location +- applets/window_menu/action_type/schemas/apps/panel/objects/action_type ++ objects/yelp_launcher/bonobo_iid/schemas/apps/panel/objects/bonobo_iid ++ objects/yelp_launcher/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id ++ objects/yelp_launcher/tooltip/schemas/apps/panel/objects/tooltip ++ objects/yelp_launcher/use_custom_icon/schemas/apps/panel/objects/use_custom_icon ++ objects/yelp_launcher/custom_icon/schemas/apps/panel/objects/custom_icon ++ objects/yelp_launcher/use_menu_path/schemas/apps/panel/objects/use_menu_path ++ objects/yelp_launcher/menu_path/schemas/apps/panel/objects/menu_path ++ objects/yelp_launcher/action_type/schemas/apps/panel/objects/action_type + +- ++ + + + applets/mixer/object_type +@@ -393,7 +399,7 @@ + applets/mixer/position + /schemas/apps/panel/objects/position + +- 1 ++ 2 + + + +@@ -447,7 +453,7 @@ + applets/clock/position + /schemas/apps/panel/objects/position + +- 2 ++ 1 + + + +@@ -589,6 +595,67 @@ + applets/show_desktop_button/launcher_location/schemas/apps/panel/objects/launcher_location + applets/show_desktop_button/action_type/schemas/apps/panel/objects/action_type + ++ ++ ++ ++ objects/session_dialog/object_type ++ /schemas/apps/panel/objects/object_type ++ ++ action-applet ++ ++ ++ ++ objects/session_dialog/toplevel_id ++ /schemas/apps/panel/objects/toplevel_id ++ ++ top_panel ++ ++ ++ ++ objects/session_dialog/position ++ /schemas/apps/panel/objects/position ++ ++ 0 ++ ++ ++ ++ objects/session_dialog/panel_right_stick ++ /schemas/apps/panel/objects/panel_right_stick ++ ++ true ++ ++ ++ ++ objects/session_dialog/locked ++ /schemas/apps/panel/objects/locked ++ ++ true ++ ++ ++ ++ objects/session_dialog/action_type ++ /schemas/apps/panel/objects/action_type ++ ++ logout ++ ++ ++ ++ objects/session_dialog/launcher_location ++ /schemas/apps/panel/objects/launcher_location ++ ++ ++ ++ ++ ++ objects/session_dialog/bonobo_iid/schemas/apps/panel/objects/bonobo_iid ++ objects/session_dialog/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id ++ objects/session_dialog/tooltip/schemas/apps/panel/objects/tooltip ++ objects/session_dialog/use_custom_icon/schemas/apps/panel/objects/use_custom_icon ++ objects/session_dialog/custom_icon/schemas/apps/panel/objects/custom_icon ++ objects/session_dialog/use_menu_path/schemas/apps/panel/objects/use_menu_path ++ objects/session_dialog/menu_path/schemas/apps/panel/objects/menu_path ++ objects/session_dialog/action_type/schemas/apps/panel/objects/action_type ++ + + + +@@ -663,7 +730,7 @@ + applets/workspace_switcher/position + /schemas/apps/panel/objects/position + +- 0 ++ 1 + + + +@@ -697,6 +764,59 @@ + applets/workspace_switcher/launcher_location/schemas/apps/panel/objects/launcher_location + applets/workspace_switcher/action_type/schemas/apps/panel/objects/action_type + ++ ++ ++ ++ applets/trashapplet/object_type ++ /schemas/apps/panel/objects/object_type ++ ++ bonobo-applet ++ ++ ++ ++ applets/trashapplet/toplevel_id ++ /schemas/apps/panel/objects/toplevel_id ++ ++ bottom_panel ++ ++ ++ ++ applets/trashapplet/position ++ /schemas/apps/panel/objects/position ++ ++ 0 ++ ++ ++ ++ applets/trashapplet/panel_right_stick ++ /schemas/apps/panel/objects/panel_right_stick ++ ++ true ++ ++ ++ ++ applets/trashapplet/locked ++ /schemas/apps/panel/objects/locked ++ ++ true ++ ++ ++ ++ applets/trashapplet/bonobo_iid ++ /schemas/apps/panel/objects/bonobo_iid ++ ++ OAFIID:GNOME_Panel_TrashApplet ++ ++ ++ ++ applets/trashapplet/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id ++ applets/trashapplet/tooltip/schemas/apps/panel/objects/tooltip ++ applets/trashapplet/use_custom_icon/schemas/apps/panel/objects/use_custom_icon ++ applets/trashapplet/custom_icon/schemas/apps/panel/objects/custom_icon ++ applets/trashapplet/use_menu_path/schemas/apps/panel/objects/use_menu_path ++ applets/trashapplet/menu_path/schemas/apps/panel/objects/menu_path ++ applets/trashapplet/launcher_location/schemas/apps/panel/objects/launcher_location ++ + + + --- gnome-panel-2.18.0.orig/debian/patches/09_lpi_src.patch +++ gnome-panel-2.18.0/debian/patches/09_lpi_src.patch @@ -0,0 +1,174 @@ +diff -Nur gnome-panel-2.17.92/applets/notification_area/GNOME_NotificationAreaApplet.xml gnome-panel-2.17.92.new/applets/notification_area/GNOME_NotificationAreaApplet.xml +--- gnome-panel-2.17.92/applets/notification_area/GNOME_NotificationAreaApplet.xml 2007-02-26 21:40:25.000000000 +0100 ++++ gnome-panel-2.17.92.new/applets/notification_area/GNOME_NotificationAreaApplet.xml 2007-02-27 01:33:59.000000000 +0100 +@@ -3,6 +3,9 @@ + + ++ ++ ++ + + +diff -Nur gnome-panel-2.17.92/applets/notification_area/main.c gnome-panel-2.17.92.new/applets/notification_area/main.c +--- gnome-panel-2.17.92/applets/notification_area/main.c 2007-02-26 21:40:25.000000000 +0100 ++++ gnome-panel-2.17.92.new/applets/notification_area/main.c 2007-02-27 01:33:59.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include "na-tray-manager.h" + #include "na-tray.h" +@@ -202,6 +203,7 @@ + NaTray *tray; + AppletData *data; + AtkObject *atko; ++ BonoboUIComponent* popup_component; + + if (!(strcmp (iid, "OAFIID:GNOME_NotificationAreaApplet") == 0 || + strcmp (iid, "OAFIID:GNOME_SystemTrayApplet") == 0)) +@@ -248,7 +250,11 @@ + NULL, + menu_verbs, + data); +- ++ ++ popup_component = panel_applet_get_popup_component (applet); ++ ++ launchpad_integration_add_bonobo_ui(popup_component, "/popups/button3/LaunchpadItems"); ++ + return TRUE; + } + +diff -Nur gnome-panel-2.17.92/applets/wncklet/GNOME_ShowDesktopApplet.xml gnome-panel-2.17.92.new/applets/wncklet/GNOME_ShowDesktopApplet.xml +--- gnome-panel-2.17.92/applets/wncklet/GNOME_ShowDesktopApplet.xml 2007-02-26 21:40:24.000000000 +0100 ++++ gnome-panel-2.17.92.new/applets/wncklet/GNOME_ShowDesktopApplet.xml 2007-02-27 01:33:59.000000000 +0100 +@@ -3,6 +3,9 @@ + + ++ ++ ++ + + +diff -Nur gnome-panel-2.17.92/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml gnome-panel-2.17.92.new/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml +--- gnome-panel-2.17.92/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml 2007-02-26 21:40:24.000000000 +0100 ++++ gnome-panel-2.17.92.new/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml 2007-02-27 01:33:59.000000000 +0100 +@@ -5,6 +5,9 @@ + pixtype="stock" pixname="gtk-properties"/> + ++ ++ ++ + + +diff -Nur gnome-panel-2.17.92/applets/wncklet/showdesktop.c gnome-panel-2.17.92.new/applets/wncklet/showdesktop.c +--- gnome-panel-2.17.92/applets/wncklet/showdesktop.c 2007-02-26 21:40:24.000000000 +0100 ++++ gnome-panel-2.17.92.new/applets/wncklet/showdesktop.c 2007-02-27 01:33:59.000000000 +0100 +@@ -43,6 +43,7 @@ + #include + + #define TIMEOUT_ACTIVATE 1000 ++#include + + + typedef struct { +@@ -410,6 +411,7 @@ + { + ShowDesktopData *sdd; + AtkObject *atk_obj; ++ BonoboUIComponent* popup_component; + + panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR); + +@@ -499,6 +501,10 @@ + G_CALLBACK (button_drag_leave), + sdd); + ++ popup_component = panel_applet_get_popup_component (sdd->applet); ++ ++ launchpad_integration_add_bonobo_ui(popup_component, "/popups/button3/LaunchpadItems"); ++ + gtk_widget_show_all (sdd->applet); + + return TRUE; +diff -Nur gnome-panel-2.17.92/applets/wncklet/workspace-switcher.c gnome-panel-2.17.92.new/applets/wncklet/workspace-switcher.c +--- gnome-panel-2.17.92/applets/wncklet/workspace-switcher.c 2007-02-26 21:40:24.000000000 +0100 ++++ gnome-panel-2.17.92.new/applets/wncklet/workspace-switcher.c 2007-02-27 01:33:59.000000000 +0100 +@@ -38,6 +38,7 @@ + #define NEVER_SENSITIVE "never_sensitive" + #define NUM_WORKSPACES "/apps/metacity/general/num_workspaces" + #define WORKSPACE_NAME "/apps/metacity/workspace_names/name_1" ++#include + + typedef struct { + GtkWidget *applet; +@@ -425,6 +426,7 @@ + PagerData *pager; + GError *error; + gboolean display_names; ++ BonoboUIComponent* popup_component; + + panel_applet_add_preferences (applet, "/schemas/apps/workspace_switcher_applet/prefs", NULL); + +@@ -540,6 +542,11 @@ + NULL); + } + ++ popup_component = panel_applet_get_popup_component (PANEL_APPLET (pager->applet)); ++ ++ launchpad_integration_add_bonobo_ui(popup_component, "/popups/button3/LaunchpadItems"); ++ ++ + return TRUE; + } + +diff -Nur gnome-panel-2.17.92/configure.in gnome-panel-2.17.92.new/configure.in +--- gnome-panel-2.17.92/configure.in 2007-02-26 21:54:12.000000000 +0100 ++++ gnome-panel-2.17.92.new/configure.in 2007-02-27 01:34:33.000000000 +0100 +@@ -67,7 +67,7 @@ + + dnl pkg-config dependency checks + +-PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) ++PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) + AC_SUBST(PANEL_CFLAGS) + AC_SUBST(PANEL_LIBS) + +@@ -75,7 +75,7 @@ + AC_SUBST(LIBPANEL_APPLET_CFLAGS) + AC_SUBST(LIBPANEL_APPLET_LIBS) + +-PKG_CHECK_MODULES(WNCKLET, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) ++PKG_CHECK_MODULES(WNCKLET, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) + AC_SUBST(WNCKLET_CFLAGS) + AC_SUBST(WNCKLET_LIBS) + +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-context-menu.c gnome-panel-2.17.92.new/gnome-panel/panel-context-menu.c +--- gnome-panel-2.17.92/gnome-panel/panel-context-menu.c 2007-02-26 21:40:23.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-context-menu.c 2007-02-27 01:33:59.000000000 +0100 +@@ -44,6 +44,7 @@ + #include "panel-properties-dialog.h" + #include "panel-lockdown.h" + #include "panel-addto.h" ++#include + + static void + panel_context_menu_show_help (GtkWidget *w, +@@ -246,6 +247,9 @@ + panel_profile_id_lists_are_writable ()); + + add_menu_separator (menu); ++ ++ launchpad_integration_add_items (menu,-1,TRUE,FALSE); ++ + } + + GtkWidget * --- gnome-panel-2.18.0.orig/debian/patches/11_applet_use_session_dialog.patch +++ gnome-panel-2.18.0/debian/patches/11_applet_use_session_dialog.patch @@ -0,0 +1,151 @@ +diff -Nur gnome-panel-2.17.90/gnome-panel/panel-action-button.c gnome-panel-2.17.90.new/gnome-panel/panel-action-button.c +--- gnome-panel-2.17.90/gnome-panel/panel-action-button.c 2007-01-21 23:43:12.000000000 +0100 ++++ gnome-panel-2.17.90.new/gnome-panel/panel-action-button.c 2007-01-23 18:21:52.000000000 +0100 +@@ -165,11 +165,15 @@ + + if (not_prompt) + panel_session_request_logout (); +- else +- panel_logout_new (PANEL_LOGOUT_DIALOG_LOGOUT, +- gtk_widget_get_screen (widget), +- gtk_get_current_event_time ()); +-} ++ else { ++ if (!gconf_client_get_bool (panel_gconf_get_client (), "/apps/panel/global/upstream_session", NULL)) ++ panel_session_request_logout (); ++ else { ++ panel_logout_new (PANEL_LOGOUT_DIALOG_LOGOUT, ++ gtk_widget_get_screen (widget), ++ gtk_get_current_event_time ()); ++ } ++ } + + static void + panel_action_shutdown (GtkWidget *widget) +@@ -182,7 +186,8 @@ + static gboolean + panel_action_shutdown_is_disabled (void) + { +- return (panel_lockdown_get_disable_log_out() || ++ return (!gconf_client_get_bool (panel_gconf_get_client (), "/apps/panel/global/upstream_session", NULL) || ++ panel_lockdown_get_disable_log_out() || + !gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN)); + } + +@@ -294,8 +299,8 @@ + /* when changing one of those two strings, don't forget to + * update the ones in panel-menu-items.c (look for + * panel:showusername|1) */ +- N_("Log Out..."), +- N_("Log out of this session to log in as a different user"), ++ N_("Quit..."), ++ N_("Log off, switch user, lock screen or power down the computer"), + "gospanel-20", + "ACTION:logout:NEW", + panel_action_logout, NULL, NULL, +diff -Nur gnome-panel-2.17.90/gnome-panel/panel-global.schemas.in gnome-panel-2.17.90.new/gnome-panel/panel-global.schemas.in +--- gnome-panel-2.17.90/gnome-panel/panel-global.schemas.in 2007-01-21 23:43:12.000000000 +0100 ++++ gnome-panel-2.17.90.new/gnome-panel/panel-global.schemas.in 2007-01-23 18:18:48.000000000 +0100 +@@ -195,6 +195,19 @@ + + + ++ /schemas/apps/panel/global/upstream_session ++ /apps/panel/global/upstream_session ++ panel ++ bool ++ false ++ ++ Use the upstream session dialogs instead of the Ubuntu one ++ If true, the panel will use the upstream dialogs instead of the Ubuntu one. The panel must be restarted for this to take effect. ++ ++ ++ ++ ++ + /schemas/apps/panel/global/locked_down + /apps/panel/global/locked_down + panel +diff -Nur gnome-panel-2.17.90/gnome-panel/panel-menu-items.c gnome-panel-2.17.90.new/gnome-panel/panel-menu-items.c +--- gnome-panel-2.17.90/gnome-panel/panel-menu-items.c 2007-01-23 18:18:33.000000000 +0100 ++++ gnome-panel-2.17.90.new/gnome-panel/panel-menu-items.c 2007-01-23 18:18:48.000000000 +0100 +@@ -1102,7 +1102,7 @@ + } + g_list_free (children); + +- if (panel_lock_screen_action_available ("lock")) { ++ if (gconf_client_get_bool (panel_gconf_get_client (), "/apps/panel/global/upstream_session", NULL) && panel_lock_screen_action_available ("lock")) { + item = panel_menu_items_create_action_item (PANEL_ACTION_LOCK); + if (item != NULL) { + if (!separator_inserted) { +@@ -1118,30 +1118,38 @@ + * but "1" if "Log Out %s" doesn't make any sense in your + * language (where %s is a username). + */ ++ + translate = Q_("panel:showusername|1"); +- if (strcmp (translate, "1") == 0) { +- const char *user_name; + +- user_name = g_get_real_name (); +- if (!user_name || !user_name [0]) +- user_name = g_get_user_name (); +- +- /* keep those strings in sync with the ones in +- * panel-action-button.c */ +- /* Translators: this string is used ONLY if you translated +- * "panel:showusername|1" to "1" */ +- label = g_strdup_printf (_("Log Out %s..."), +- g_get_user_name ()); +- /* Translators: this string is used ONLY if you translated +- * "panel:showusername|1" to "1" */ +- tooltip = g_strdup_printf (_("Log out %s of this session to " +- "log in as a different user"), +- user_name); +- } else { +- label = NULL; ++ if (gconf_client_get_bool (panel_gconf_get_client (), "/apps/panel/global/upstream_session", NULL)) { ++ if (strcmp (translate, "1") == 0) { ++ const char *user_name; ++ ++ user_name = g_get_real_name (); ++ if (!user_name || !user_name [0]) ++ user_name = g_get_user_name (); ++ ++ /* keep those strings in sync with the ones in ++ * panel-action-button.c */ ++ /* Translators: this string is used ONLY if you translated ++ * "panel:showusername|1" to "1" */ ++ label = g_strdup_printf (_("Log Out %s..."), ++ g_get_user_name ()); ++ /* Translators: this string is used ONLY if you translated ++ * "panel:showusername|1" to "1" */ ++ tooltip = g_strdup_printf (_("Log out %s of this session to " ++ "log in as a different user"), ++ user_name); ++ } else { ++ label = g_strdup_printf (_("Log Out...")); ++ tooltip = g_strdup_printf (_("Log out of this session to log in as a different user")); ++ } ++ } ++ else { ++ label = NULL; + tooltip = NULL; + } +- ++ + item = panel_menu_items_create_action_item_full (PANEL_ACTION_LOGOUT, + label, tooltip); + g_free (label); +diff -Nur gnome-panel-2.17.90/gnome-panel/panel-session.c gnome-panel-2.17.90.new/gnome-panel/panel-session.c +--- gnome-panel-2.17.90/gnome-panel/panel-session.c 2007-01-21 23:43:12.000000000 +0100 ++++ gnome-panel-2.17.90.new/gnome-panel/panel-session.c 2007-01-23 18:18:48.000000000 +0100 +@@ -54,7 +54,7 @@ + GNOME_SAVE_GLOBAL, + TRUE, + GNOME_INTERACT_ANY, +- TRUE, /* do not use the gnome-session gui */ ++ gconf_client_get_bool (panel_gconf_get_client (), "/apps/panel/global/upstream_session", NULL), /* use the gnome-session gui */ + TRUE); + + recursion_guard--; --- gnome-panel-2.18.0.orig/debian/patches/06_applets_category.patch +++ gnome-panel-2.18.0/debian/patches/06_applets_category.patch @@ -0,0 +1,68 @@ +diff -Nur gnome-panel-2.15.91/applets/clock/GNOME_ClockApplet_Factory.server.in.in gnome-panel-2.15.91.new/applets/clock/GNOME_ClockApplet_Factory.server.in.in +--- gnome-panel-2.15.91/applets/clock/GNOME_ClockApplet_Factory.server.in.in 2006-08-08 01:55:52.000000000 +0200 ++++ gnome-panel-2.15.91.new/applets/clock/GNOME_ClockApplet_Factory.server.in.in 2006-08-08 09:55:36.000000000 +0200 +@@ -24,6 +24,7 @@ + + + ++ + + + +diff -Nur gnome-panel-2.15.91/applets/fish/GNOME_FishApplet_Factory.server.in.in gnome-panel-2.15.91.new/applets/fish/GNOME_FishApplet_Factory.server.in.in +--- gnome-panel-2.15.91/applets/fish/GNOME_FishApplet_Factory.server.in.in 2006-08-08 01:55:52.000000000 +0200 ++++ gnome-panel-2.15.91.new/applets/fish/GNOME_FishApplet_Factory.server.in.in 2006-08-08 09:56:07.000000000 +0200 +@@ -24,6 +24,7 @@ + + + ++ + + + +diff -Nur gnome-panel-2.15.91/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in gnome-panel-2.15.91.new/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in +--- gnome-panel-2.15.91/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in 2006-08-08 01:55:53.000000000 +0200 ++++ gnome-panel-2.15.91.new/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in 2006-08-08 09:56:36.000000000 +0200 +@@ -24,6 +24,7 @@ + + + ++ + + + +diff -Nur gnome-panel-2.15.91/applets/wncklet/GNOME_Wncklet_Factory.server.in.in gnome-panel-2.15.91.new/applets/wncklet/GNOME_Wncklet_Factory.server.in.in +--- gnome-panel-2.15.91/applets/wncklet/GNOME_Wncklet_Factory.server.in.in 2006-08-08 01:55:53.000000000 +0200 ++++ gnome-panel-2.15.91.new/applets/wncklet/GNOME_Wncklet_Factory.server.in.in 2006-08-08 09:58:27.000000000 +0200 +@@ -25,6 +25,7 @@ + + + ++ + + + +@@ -64,6 +65,7 @@ + + + ++ + + + +@@ -102,6 +104,7 @@ + + + ++ + + + +@@ -122,6 +125,7 @@ + + + ++ + + + --- gnome-panel-2.18.0.orig/debian/patches/09_default_icons.patch +++ gnome-panel-2.18.0/debian/patches/09_default_icons.patch @@ -0,0 +1,24 @@ +diff -Nur gnome-panel-2.11.1.orig/gnome-panel/menu.c gnome-panel-2.11.1/gnome-panel/menu.c +--- gnome-panel-2.11.1.orig/gnome-panel/menu.c 2005-04-27 11:56:04.000000000 +0200 ++++ gnome-panel-2.11.1/gnome-panel/menu.c 2005-05-19 19:59:02.220319600 +0200 +@@ -1360,7 +1360,7 @@ + NULL, + alias_directory ? gmenu_tree_directory_get_icon (alias_directory) : + gmenu_tree_entry_get_icon (entry), +- NULL); ++ PANEL_STOCK_DEFAULT_ICON); + + setup_menuitem (menuitem, + panel_menu_icon_get_size (), +diff -Nur gnome-panel-2.11.1.orig/gnome-panel/panel-stock-icons.h gnome-panel-2.11.1/gnome-panel/panel-stock-icons.h +--- gnome-panel-2.11.1.orig/gnome-panel/panel-stock-icons.h 2005-02-02 08:49:08.000000000 +0100 ++++ gnome-panel-2.11.1/gnome-panel/panel-stock-icons.h 2005-05-19 19:56:16.416525608 +0200 +@@ -43,6 +43,8 @@ + #define PANEL_STOCK_EXECUTE "panel-execute" + #define PANEL_STOCK_CLEAR "panel-clear" + #define PANEL_STOCK_DONT_DELETE "panel-dont-delete" ++/* FIXME: put a more representative icon here */ ++#define PANEL_STOCK_DEFAULT_ICON "application-default-icon" + + void panel_init_stock_icons_and_items (void); + GtkIconSize panel_menu_icon_get_size (void); --- gnome-panel-2.18.0.orig/debian/patches/14_remove_separators.patch +++ gnome-panel-2.18.0/debian/patches/14_remove_separators.patch @@ -0,0 +1,55 @@ +--- gnome-panel-2.14.1.orig/gnome-panel/menu.c ++++ gnome-panel-2.14.1/gnome-panel/menu.c +@@ -1681,6 +1681,7 @@ + GSList *l; + GSList *items; + gboolean add_separator; ++ gboolean pending_separator = FALSE; + + add_separator = (GTK_MENU_SHELL (menu)->children != NULL); + +@@ -1691,16 +1692,24 @@ + + if (add_separator || + gmenu_tree_item_get_type (item) == GMENU_TREE_ITEM_SEPARATOR) { +- add_menu_separator (menu); ++ pending_separator = TRUE; + add_separator = FALSE; + } + + switch (gmenu_tree_item_get_type (item)) { + case GMENU_TREE_ITEM_DIRECTORY: ++ if (pending_separator) { ++ add_menu_separator (menu); ++ pending_separator = FALSE; ++ } + create_submenu (menu, GMENU_TREE_DIRECTORY (item), NULL); + break; + + case GMENU_TREE_ITEM_ENTRY: ++ if (pending_separator) { ++ add_menu_separator (menu); ++ pending_separator = FALSE; ++ } + create_menuitem (menu, GMENU_TREE_ENTRY (item), NULL); + break; + +@@ -1709,10 +1718,18 @@ + break; + + case GMENU_TREE_ITEM_ALIAS: ++ if (pending_separator) { ++ add_menu_separator (menu); ++ pending_separator = FALSE; ++ } + create_menuitem_from_alias (menu, GMENU_TREE_ALIAS (item)); + break; + + case GMENU_TREE_ITEM_HEADER: ++ if (pending_separator) { ++ add_menu_separator (menu); ++ pending_separator = FALSE; ++ } + create_header (menu, GMENU_TREE_HEADER (item)); + break; + --- gnome-panel-2.18.0.orig/debian/patches/99_about-ubuntu-translation.patch +++ gnome-panel-2.18.0/debian/patches/99_about-ubuntu-translation.patch @@ -0,0 +1,8 @@ +diff -Nur gnome-panel-2.14.0/po/POTFILES.in gnome-panel-2.14.0.new/po/POTFILES.in +--- gnome-panel-2.14.0/po/POTFILES.in 2006-01-16 18:42:56.000000000 +0100 ++++ gnome-panel-2.14.0.new/po/POTFILES.in 2006-03-14 12:44:27.000000000 +0100 +@@ -73,3 +73,4 @@ + libpanel-applet/panel-applet.c + libpanel-applet/panel-test-applets.c + libpanel-applet/panel-test-applets.glade ++debian/ubuntu-about.desktop.in --- gnome-panel-2.18.0.orig/debian/patches/16_gksu_time_admin.patch +++ gnome-panel-2.18.0/debian/patches/16_gksu_time_admin.patch @@ -0,0 +1,12 @@ +diff -Nur gnome-panel-2.16.1/applets/clock/clock.c gnome-panel-2.16.1.new/applets/clock/clock.c +--- gnome-panel-2.16.1/applets/clock/clock.c 2006-12-05 16:43:37.000000000 +0100 ++++ gnome-panel-2.16.1.new/applets/clock/clock.c 2006-12-05 16:44:06.000000000 +0100 +@@ -83,7 +83,7 @@ + "system-config-date", + "redhat-config-date", + "/sbin/yast2 timezone", +- "time-admin", ++ "gksu time-admin", + }; + + /* Needs to match the indices in the combo */ --- gnome-panel-2.18.0.orig/debian/patches/01_distrologo.patch +++ gnome-panel-2.18.0/debian/patches/01_distrologo.patch @@ -0,0 +1,124 @@ +Index: panel-addto.c +=================================================================== +RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-addto.c,v +retrieving revision 1.38 +diff -u -p -r1.38 panel-addto.c +--- panel-addto.c 22 Jul 2005 07:36:55 -0000 1.38 ++++ gnome-panel/panel-addto.c 28 Sep 2005 20:49:56 -0000 +@@ -203,6 +203,15 @@ panel_addto_prepend_internal_applets (GS + internal_addto_items [i].description = _(internal_addto_items [i].description); + } + ++ if (internal_addto_items [i].type == PANEL_ADDTO_MENU || ++ internal_addto_items [i].type == PANEL_ADDTO_MENUBAR) { ++ const char *logo; ++ ++ logo = panel_get_distributor_logo (); ++ if (logo != NULL) ++ internal_addto_items [i].icon = logo; ++ } ++ + list = g_slist_prepend (list, &internal_addto_items [i]); + } + +Index: panel-menu-bar.c +=================================================================== +RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-menu-bar.c,v +retrieving revision 1.65 +diff -u -p -r1.65 panel-menu-bar.c +--- panel-menu-bar.c 4 Aug 2005 07:08:24 -0000 1.65 ++++ gnome-panel/panel-menu-bar.c 28 Sep 2005 20:49:56 -0000 +@@ -69,6 +69,7 @@ panel_menu_bar_instance_init (PanelMenuB + PanelMenuBarClass *klass) + { + GtkWidget *image; ++ const char *logo; + + menubar->priv = PANEL_MENU_BAR_GET_PRIVATE (menubar); + +@@ -77,8 +78,15 @@ panel_menu_bar_instance_init (PanelMenuB + menubar->priv->applications_menu = create_applications_menu ("applications.menu", NULL); + + menubar->priv->applications_item = gtk_image_menu_item_new_with_label (_("Applications")); +- image = gtk_image_new_from_icon_name (PANEL_GNOME_LOGO_ICON, +- panel_menu_bar_icon_get_size ()); ++ ++ logo = panel_get_distributor_logo (); ++ if (logo != NULL) ++ image = gtk_image_new_from_icon_name (logo, ++ panel_menu_bar_icon_get_size ()); ++ else ++ image = gtk_image_new_from_icon_name (PANEL_GNOME_LOGO_ICON, ++ panel_menu_bar_icon_get_size ()); ++ + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menubar->priv->applications_item), + image); + +Index: panel-menu-button.c +=================================================================== +RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-menu-button.c,v +retrieving revision 1.45 +diff -u -p -r1.45 panel-menu-button.c +--- panel-menu-button.c 18 Sep 2005 07:29:05 -0000 1.45 ++++ gnome-panel/panel-menu-button.c 28 Sep 2005 20:49:57 -0000 +@@ -736,8 +736,15 @@ panel_menu_button_get_icon (PanelMenuBut + retval = g_strdup (gmenu_tree_directory_get_icon (directory)); + } + +- if (!retval) +- retval = g_strdup (PANEL_MAIN_MENU_ICON); ++ if (!retval) { ++ const char *logo; ++ ++ logo = panel_get_distributor_logo (); ++ if (logo != NULL) ++ retval = g_strdup (logo); ++ else ++ retval = g_strdup (PANEL_MAIN_MENU_ICON); ++ } + + return retval; + } +Index: panel-util.c +=================================================================== +RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-util.c,v +retrieving revision 1.159 +diff -u -p -r1.159 panel-util.c +--- panel-util.c 2 Aug 2005 10:10:49 -0000 1.159 ++++ gnome-panel/panel-util.c 28 Sep 2005 20:49:57 -0000 +@@ -872,3 +872,19 @@ panel_lookup_in_data_dirs (const char *b + + return NULL; + } ++ ++#define PANEL_DISTRIBUTOR_LOGO_ICON "distributor-logo" ++const char * ++panel_get_distributor_logo (void) ++{ ++ int desired_width, desired_height; ++ ++ if (gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, ++ &desired_width, &desired_height) && ++ panel_find_icon (gtk_icon_theme_get_default (), ++ PANEL_DISTRIBUTOR_LOGO_ICON, ++ desired_height)) ++ return PANEL_DISTRIBUTOR_LOGO_ICON; ++ else ++ return NULL; ++} +Index: panel-util.h +=================================================================== +RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-util.h,v +retrieving revision 1.89 +diff -u -p -r1.89 panel-util.h +--- panel-util.h 2 Aug 2005 10:10:49 -0000 1.89 ++++ gnome-panel/panel-util.h 28 Sep 2005 20:49:57 -0000 +@@ -84,6 +84,8 @@ char *panel_make_unique_uri (const char + const char *suffix); + char *panel_lookup_in_data_dirs (const char *basename); + ++const char *panel_get_distributor_logo (void); ++ + G_END_DECLS + + #endif /* PANEL_UTIL_H */ --- gnome-panel-2.18.0.orig/debian/patches/08_default_clock_setting.patch +++ gnome-panel-2.18.0/debian/patches/08_default_clock_setting.patch @@ -0,0 +1,12 @@ +diff -Nur gnome-panel-2.13.91/applets/clock/clock.schemas.in gnome-panel-2.13.91.new/applets/clock/clock.schemas.in +--- gnome-panel-2.13.91/applets/clock/clock.schemas.in 2005-12-30 12:13:11.000000000 +0100 ++++ gnome-panel-2.13.91.new/applets/clock/clock.schemas.in 2006-03-02 18:58:37.000000000 +0100 +@@ -69,7 +69,7 @@ + /schemas/apps/clock_applet/prefs/show_date + clock-applet + bool +- false ++ true + + Show date in clock + If true, display date in the clock, in addition to time. --- gnome-panel-2.18.0.orig/debian/patches/17_change_socket_directory.patch +++ gnome-panel-2.18.0/debian/patches/17_change_socket_directory.patch @@ -0,0 +1,29 @@ +diff -Nur gnome-panel-2.17.92/gnome-panel/panel-gdm.c gnome-panel-2.17.92.new/gnome-panel/panel-gdm.c +--- gnome-panel-2.17.92/gnome-panel/panel-gdm.c 2007-02-26 21:40:23.000000000 +0100 ++++ gnome-panel-2.17.92.new/gnome-panel/panel-gdm.c 2007-03-05 19:15:52.000000000 +0100 +@@ -43,7 +43,7 @@ + + #define GDM_PROTOCOL_UPDATE_INTERVAL 1 /* seconds */ + +-#define GDM_PROTOCOL_SOCKET_PATH "/tmp/.gdm_socket" ++#define GDM_PROTOCOL_SOCKET_PATH "/var/run/gdm_socket" + + #define GDM_PROTOCOL_MSG_CLOSE "CLOSE" + #define GDM_PROTOCOL_MSG_VERSION "VERSION" +@@ -241,9 +241,13 @@ + gdm_shutdown_protocol_connection (data); + return FALSE; + } +- +- strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH); +- addr.sun_family = AF_UNIX; ++ ++ if (g_file_test(GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS)) ++ strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH); ++ else ++ strcpy (addr.sun_path, "/tmp/.gdm_socket"); ++ ++ addr.sun_family = AF_UNIX; + + if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) { + g_warning ("Failed to establish a connection with GDM: %s", --- gnome-panel-2.18.0.orig/debian/gnome-panel-data.postrm +++ gnome-panel-2.18.0/debian/gnome-panel-data.postrm @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +self="$(basename "$0")" + +action="$1" + +case "$action" in + remove) + rm -f /usr/share/gconf/defaults/05_panel-default-setup.entries + update-gconf-defaults + ;; + purge) + # FIXME I am probably a very old cleanup snippet, check whether you can + # remove me! + rm -rf /var/lib/gnome + ;; + upgrade|failed-upgrade|abort-install|abort-install|abort-upgrade|disappear) + ;; + *) + echo "$self: W: unknown action \`$action'" >&2 + ;; +esac + +#DEBHELPER# --- gnome-panel-2.18.0.orig/debian/libpanel-applet2-dev.install +++ gnome-panel-2.18.0/debian/libpanel-applet2-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/ usr/ +debian/tmp/usr/lib/pkgconfig usr/lib/ +debian/tmp/usr/lib/libpanel-applet-2.{a,la,so} usr/lib/ +debian/tmp/usr/share/idl/ usr/share/ --- gnome-panel-2.18.0.orig/debian/panel-test-applets.sgml +++ gnome-panel-2.18.0/debian/panel-test-applets.sgml @@ -0,0 +1,99 @@ +Christian"> + Marillat"> + december 7, 2003"> + 1"> + marillat@debian.org"> + + panel-test-applets"> + + Debian GNU/Linux"> + GNU"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2001 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + display installed applets + + + + &dhpackage; + + + + + + + DESCRIPTION + + &dhpackage; display installed applets in a + dialog box and does nothing else. + + + + + OPTIONS + + + + + + Display help + + + + + + + SEE ALSO + + gnome-options(7) + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). + + + + +