--- gnome-panel-2.14.1.orig/debian/patches/10_some_applets_in_proc.patch +++ gnome-panel-2.14.1/debian/patches/10_some_applets_in_proc.patch @@ -0,0 +1,211 @@ +diff -Nur gnome-panel-2.14.1/applets/fish/fish.c gnome-panel-2.14.1.new/applets/fish/fish.c +--- gnome-panel-2.14.1/applets/fish/fish.c 2006-02-12 13:40:13.000000000 +0100 ++++ gnome-panel-2.14.1.new/applets/fish/fish.c 2006-05-07 23:25:56.000000000 +0200 +@@ -1875,7 +1875,6 @@ + NULL); + } + +- gtk_window_set_default_icon_name ("gnome-fish"); + setup_fish_widget (fish); + + return TRUE; +@@ -2061,9 +2060,8 @@ + return type; + } + +-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FishApplet_Factory", ++PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_FishApplet_Factory", + fish_applet_get_type (), + "That-stupid-fish", +- "0", + fishy_factory, + NULL) +diff -Nur gnome-panel-2.14.1/applets/fish/GNOME_FishApplet_Factory.server.in.in gnome-panel-2.14.1.new/applets/fish/GNOME_FishApplet_Factory.server.in.in +--- gnome-panel-2.14.1/applets/fish/GNOME_FishApplet_Factory.server.in.in 2006-05-07 23:25:53.000000000 +0200 ++++ gnome-panel-2.14.1.new/applets/fish/GNOME_FishApplet_Factory.server.in.in 2006-05-07 23:25:56.000000000 +0200 +@@ -1,8 +1,8 @@ + + + ++ type="shlib" ++ location="@LIBDIR@/libfish-applet-2.so"> + + + +diff -Nur gnome-panel-2.14.1/applets/fish/Makefile.am gnome-panel-2.14.1.new/applets/fish/Makefile.am +--- gnome-panel-2.14.1/applets/fish/Makefile.am 2004-10-30 23:04:57.000000000 +0200 ++++ gnome-panel-2.14.1.new/applets/fish/Makefile.am 2006-05-07 23:25:56.000000000 +0200 +@@ -9,11 +9,11 @@ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(FISH_CFLAGS) + +-libexec_PROGRAMS = fish-applet-2 ++lib_LTLIBRARIES = libfish-applet-2.la + +-fish_applet_2_SOURCES = fish.c ++libfish_applet_2_la_SOURCES = fish.c + +-fish_applet_2_LDADD = \ ++libfish_applet_2_la_LIBADD = \ + ../../libpanel-applet/libpanel-applet-2.la \ + $(FISH_LIBS) + +@@ -48,7 +48,7 @@ + server_DATA = $(server_in_files:.server.in=.server) + + $(server_in_files): $(server_in_files).in +- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ ++ sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@ + + CLEANFILES = $(server_DATA) $(server_DATA).in $(schemas_DATA) + +diff -Nur gnome-panel-2.14.1/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in gnome-panel-2.14.1.new/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in +--- gnome-panel-2.14.1/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in 2006-05-07 23:25:53.000000000 +0200 ++++ gnome-panel-2.14.1.new/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in 2006-05-07 23:25:56.000000000 +0200 +@@ -1,8 +1,8 @@ + + + ++ type="shlib" ++ location="@LIBDIR@/libnotification-area-applet.so"> + + + +diff -Nur gnome-panel-2.14.1/applets/notification_area/main.c gnome-panel-2.14.1.new/applets/notification_area/main.c +--- gnome-panel-2.14.1/applets/notification_area/main.c 2006-05-07 23:25:53.000000000 +0200 ++++ gnome-panel-2.14.1.new/applets/notification_area/main.c 2006-05-07 23:25:56.000000000 +0200 +@@ -347,7 +347,6 @@ + + gtk_container_add (GTK_CONTAINER (tray->applet), tray->frame); + +- gtk_window_set_default_icon_name ("panel-notification-area"); + gtk_widget_show_all (GTK_WIDGET (tray->applet)); + + panel_applet_setup_menu_from_file (PANEL_APPLET (applet), +@@ -364,18 +363,8 @@ + return TRUE; + } + +-#if 1 +-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_NotificationAreaApplet_Factory", +- PANEL_TYPE_APPLET, +- "NotificationArea", +- "0", +- applet_factory, +- NULL) +- +-#else + + PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_NotificationAreaApplet_Factory", + PANEL_TYPE_APPLET, + "NotificationArea", + applet_factory, NULL); +-#endif +diff -Nur gnome-panel-2.14.1/applets/notification_area/Makefile.am gnome-panel-2.14.1.new/applets/notification_area/Makefile.am +--- gnome-panel-2.14.1/applets/notification_area/Makefile.am 2004-10-30 23:04:57.000000000 +0200 ++++ gnome-panel-2.14.1.new/applets/notification_area/Makefile.am 2006-05-07 23:25:56.000000000 +0200 +@@ -14,13 +14,13 @@ + -DDATADIR=\"$(datadir)\" \ + -DLIBDIR=\"$(libdir)\" + +-libexec_PROGRAMS = notification-area-applet ++lib_LTLIBRARIES = libnotification-area-applet.la + + EGGFILES= \ + eggtraymanager.h \ + eggtraymanager.c + +-notification_area_applet_SOURCES = \ ++libnotification_area_applet_la_SOURCES = \ + fixedtip.h \ + fixedtip.c \ + main.c \ +@@ -30,7 +30,7 @@ + eggmarshalers.h \ + eggmarshalers.c + +-notification_area_applet_LDADD = \ ++libnotification_area_applet_la_LIBADD = \ + ../../libpanel-applet/libpanel-applet-2.la \ + $(X_LIBS) \ + $(PANEL_LIBS) +@@ -40,7 +40,7 @@ + server_DATA = GNOME_NotificationAreaApplet.server + + GNOME_NotificationAreaApplet.server.in: $(srcdir)/GNOME_NotificationAreaApplet.server.in.in +- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ ++ sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@ + + @INTLTOOL_SERVER_RULE@ + +diff -Nur gnome-panel-2.14.1/applets/wncklet/GNOME_Wncklet_Factory.server.in.in gnome-panel-2.14.1.new/applets/wncklet/GNOME_Wncklet_Factory.server.in.in +--- gnome-panel-2.14.1/applets/wncklet/GNOME_Wncklet_Factory.server.in.in 2006-05-07 23:25:53.000000000 +0200 ++++ gnome-panel-2.14.1.new/applets/wncklet/GNOME_Wncklet_Factory.server.in.in 2006-05-07 23:25:56.000000000 +0200 +@@ -1,8 +1,8 @@ + + + ++ type="shlib" ++ location="@LIBDIR@/libwnck-applet.so"> + + + +diff -Nur gnome-panel-2.14.1/applets/wncklet/Makefile.am gnome-panel-2.14.1.new/applets/wncklet/Makefile.am +--- gnome-panel-2.14.1/applets/wncklet/Makefile.am 2005-01-29 01:08:01.000000000 +0100 ++++ gnome-panel-2.14.1.new/applets/wncklet/Makefile.am 2006-05-07 23:25:56.000000000 +0200 +@@ -1,4 +1,4 @@ +-libexec_PROGRAMS = wnck-applet ++lib_LTLIBRARIES = libwnck-applet.la + + INCLUDES = \ + -I$(top_builddir) \ +@@ -16,7 +16,7 @@ + -DDATADIR=\"$(datadir)\" \ + -DLIBDIR=\"$(libdir)\" + +-wnck_applet_SOURCES = \ ++libwnck_applet_la_SOURCES = \ + wncklet.c \ + wncklet.h \ + window-menu.c \ +@@ -28,9 +28,9 @@ + showdesktop.c \ + showdesktop.h + +-$(wnck_applet_OBJECTS): $(BUILT_SOURCES) ++$(libwnck_applet_la_OBJECTS): $(BUILT_SOURCES) + +-wnck_applet_LDADD = \ ++libwnck_applet_la_LIBADD = \ + ../../libpanel-applet/libpanel-applet-2.la \ + $(WNCKLET_LIBS) + +@@ -45,7 +45,7 @@ + server_DATA = $(server_in_files:.server.in=.server) + + $(server_in_files): $(server_in_files).in +- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ ++ sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@ + + @INTLTOOL_SERVER_RULE@ + +diff -Nur gnome-panel-2.14.1/applets/wncklet/wncklet.c gnome-panel-2.14.1.new/applets/wncklet/wncklet.c +--- gnome-panel-2.14.1/applets/wncklet/wncklet.c 2006-01-12 16:18:01.000000000 +0100 ++++ gnome-panel-2.14.1.new/applets/wncklet/wncklet.c 2006-05-07 23:25:56.000000000 +0200 +@@ -198,9 +198,8 @@ + } + + +-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_Wncklet_Factory", ++PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_Wncklet_Factory", + PANEL_TYPE_APPLET, + "WindowNavigationApplets", +- "0", + wncklet_factory, + NULL); --- gnome-panel-2.14.1.orig/debian/patches/09_help_submenu.patch +++ gnome-panel-2.14.1/debian/patches/09_help_submenu.patch @@ -0,0 +1,60 @@ +diff -Nur gnome-panel-2.14.1/gnome-panel/panel-menu-items.c gnome-panel-2.14.1.new/gnome-panel/panel-menu-items.c +--- gnome-panel-2.14.1/gnome-panel/panel-menu-items.c 2006-05-16 16:17:28.000000000 +0200 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-menu-items.c 2006-05-16 16:39:11.000000000 +0200 +@@ -721,6 +721,7 @@ + { + gboolean add_separator; + GList *children; ++ GtkWidget *add_menu, *item; + + if (!g_object_get_data (G_OBJECT (menu), "panel-menu-needs-appending")) + return; +@@ -745,7 +746,47 @@ + if (add_separator) + add_menu_separator (menu); + +- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL); ++ item = gtk_image_menu_item_new (); ++ setup_menu_item_with_icon (item, panel_menu_icon_get_size (), ++ "stock_help-agent", NULL, ++ _("Help"), TRUE); ++ ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ gtk_widget_show (item); ++ ++ add_menu = create_empty_menu (); ++ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), add_menu); ++ ++ panel_menu_items_append_from_desktop (add_menu, "yelp.desktop", _("System Documentation")); ++ ++ panel_menu_items_append_place_item ("gnome-globe", ++ _("Online Documentation"), ++ _("Find more documentation online"), ++ add_menu, ++ G_CALLBACK (activate_uri), ++ "http://help.ubuntu.com"); ++ ++ panel_menu_items_append_place_item ("stock_new-meeting", ++ _("Community Support"), ++ _("Get help from other Ubuntu users"), ++ add_menu, ++ G_CALLBACK (activate_uri), ++ "http://www.ubuntu.com/support/supportoptions/freesupport"); ++ ++ panel_menu_items_append_place_item ("stock_send-fax", ++ _("Commercial Support"), ++ _("Find a commercial support provider"), ++ add_menu, ++ G_CALLBACK (activate_uri), ++ "http://www.ubuntu.com/support/marketplace"); ++ ++ panel_menu_items_append_place_item ("stock_book_open", ++ _("Ubuntu Book Excerpt"), ++ _("Read selected book chapters"), ++ add_menu, ++ G_CALLBACK (activate_uri), ++ "file:///usr/share/ubuntu-artwork/home/locales-ubuntu/index-C.html"); ++ + panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL); + + if (g_file_test (DATADIR"/omf/about-ubuntu/about-ubuntu-C.omf", --- gnome-panel-2.14.1.orig/debian/patches/13_notification_area_transparency.patch +++ gnome-panel-2.14.1/debian/patches/13_notification_area_transparency.patch @@ -0,0 +1,137 @@ +? .eggtraymanager.c.swp +? patch +? transparency.patch +? transparency1.patch +? transparency2.patch +Index: eggtraymanager.c +=================================================================== +RCS file: /cvs/gnome/gnome-panel/applets/notification_area/eggtraymanager.c,v +retrieving revision 1.7 +diff -u -p -r1.7 eggtraymanager.c +--- eggtraymanager.c 31 Dec 2005 13:39:09 -0000 1.7 ++++ applets/notification_area/eggtraymanager.c 6 Mar 2006 18:33:13 -0000 +@@ -291,6 +291,37 @@ egg_tray_manager_plug_removed (GtkSocket + return FALSE; + } + ++static gboolean ++transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) ++{ ++ gdk_window_clear_area (widget->window, event->area.x, event->area.y, ++ event->area.width, event->area.height); ++ return FALSE; ++} ++ ++static void ++make_transparent_again (GtkWidget *widget, GtkStyle *previous_style, ++ gpointer user_data) ++{ ++ g_print("make transparent again\n"); ++ gdk_window_set_back_pixmap (widget->window, NULL, TRUE); ++} ++ ++static void ++make_transparent (GtkWidget *widget, gpointer user_data) ++{ ++ if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) ++ return; ++ ++ gtk_widget_set_app_paintable (widget, TRUE); ++ gtk_widget_set_double_buffered (widget, FALSE); ++ gdk_window_set_back_pixmap (widget->window, NULL, TRUE); ++ g_signal_connect (widget, "expose_event", ++ G_CALLBACK (transparent_expose_event), NULL); ++ g_signal_connect_after (widget, "style_set", ++ G_CALLBACK (make_transparent_again), NULL); ++} ++ + static void + egg_tray_manager_handle_dock_request (EggTrayManager *manager, + XClientMessageEvent *xevent) +@@ -306,6 +337,8 @@ egg_tray_manager_handle_dock_request (Eg + } + + socket = gtk_socket_new (); ++ g_signal_connect (socket, "realize", ++ G_CALLBACK (make_transparent), NULL); + + /* We need to set the child window here + * so that the client can call _get functions +Index: main.c +=================================================================== +RCS file: /cvs/gnome/gnome-panel/applets/notification_area/main.c,v +retrieving revision 1.30 +diff -u -p -r1.30 main.c +--- main.c 28 Dec 2005 21:15:27 -0000 1.30 ++++ applets/notification_area/main.c 6 Mar 2006 18:33:13 -0000 +@@ -159,14 +159,24 @@ tray_added (EggTrayManager *manager, Gtk + tray = all_trays->data; + + gtk_box_pack_end (GTK_BOX (tray->box), icon, FALSE, FALSE, 0); +- ++ ++ gtk_widget_hide (tray->box); + gtk_widget_show (icon); ++ gtk_widget_show (tray->box); + } + + static void + tray_removed (EggTrayManager *manager, GtkWidget *icon, void *data) + { ++ SystemTray *tray; ++ ++ if (all_trays == NULL) ++ return; ++ ++ tray = all_trays->data; + ++ gtk_widget_hide (tray->box); ++ gtk_widget_show (tray->box); + } + + static void +@@ -207,9 +217,32 @@ update_size_and_orientation (SystemTray + gtk_widget_set_size_request (tray->box, -1, MIN_BOX_SIZE); + break; + } ++ ++ /* Force the icons to redraw their backgrounds. ++ * gtk_widget_queue_draw() doesn't work across process boundaries, ++ * so we do this instead. ++ */ ++ gtk_widget_hide (tray->box); ++ gtk_widget_show (tray->box); + } + + static void ++applet_change_background (PanelApplet *applet, ++ PanelAppletBackgroundType type, ++ GdkColor *color, ++ GdkPixmap *pixmap, ++ SystemTray *tray) ++{ ++ /* Force the icons to redraw their backgrounds. ++ * gtk_widget_queue_draw() doesn't work across process boundaries, ++ * so we do this instead. ++ */ ++ gtk_widget_hide (tray->box); ++ gtk_widget_show (tray->box); ++} ++ ++ ++static void + applet_change_orientation (PanelApplet *applet, + PanelAppletOrient orient, + SystemTray *tray) +@@ -332,6 +365,11 @@ applet_factory (PanelApplet *applet, + g_signal_connect (G_OBJECT (tray->applet), + "change_orient", + G_CALLBACK (applet_change_orientation), ++ tray); ++ ++ g_signal_connect (G_OBJECT (tray->applet), ++ "change_background", ++ G_CALLBACK (applet_change_background), + tray); + + g_signal_connect (tray->applet, --- gnome-panel-2.14.1.orig/debian/patches/99_about-ubuntu-translation.patch +++ gnome-panel-2.14.1/debian/patches/99_about-ubuntu-translation.patch @@ -0,0 +1,2653 @@ +diff -Nur gnome-panel-2.14.0/po/gnome-panel-2.0.pot gnome-panel-2.14.0.new/po/gnome-panel-2.0.pot +--- gnome-panel-2.14.0/po/gnome-panel-2.0.pot 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.0.new/po/gnome-panel-2.0.pot 2006-03-14 12:44:58.000000000 +0100 +@@ -0,0 +1,2641 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-03-14 12:44+0100\n" ++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ++"Last-Translator: FULL NAME \n" ++"Language-Team: LANGUAGE \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" ++ ++#: ../applets/clock/GNOME_ClockApplet.xml.h:1 ++msgid "Ad_just Date & Time" ++msgstr "" ++ ++#: ../applets/clock/GNOME_ClockApplet.xml.h:2 ++msgid "Copy _Date" ++msgstr "" ++ ++#: ../applets/clock/GNOME_ClockApplet.xml.h:3 ++msgid "Copy _Time" ++msgstr "" ++ ++#: ../applets/clock/GNOME_ClockApplet.xml.h:4 ++#: ../applets/fish/GNOME_FishApplet.xml.h:1 ++#: ../applets/notification_area/GNOME_NotificationAreaApplet.xml.h:1 ++#: ../applets/wncklet/GNOME_ShowDesktopApplet.xml.h:1 ++#: ../applets/wncklet/GNOME_WindowListApplet.xml.h:1 ++#: ../applets/wncklet/GNOME_WindowMenuApplet.xml.h:1 ++#: ../applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml.h:1 ++msgid "_About" ++msgstr "" ++ ++#: ../applets/clock/GNOME_ClockApplet.xml.h:5 ++#: ../applets/fish/GNOME_FishApplet.xml.h:2 ++#: ../applets/notification_area/GNOME_NotificationAreaApplet.xml.h:2 ++#: ../applets/wncklet/GNOME_ShowDesktopApplet.xml.h:2 ++#: ../applets/wncklet/GNOME_WindowListApplet.xml.h:2 ++#: ../applets/wncklet/GNOME_WindowMenuApplet.xml.h:2 ++#: ../applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml.h:2 ++#: ../gnome-panel/drawer.c:600 ../gnome-panel/panel-action-button.c:775 ++#: ../gnome-panel/panel-context-menu.c:326 ../gnome-panel/panel-menu-bar.c:412 ++#: ../gnome-panel/panel-menu-button.c:685 ++msgid "_Help" ++msgstr "" ++ ++#: ../applets/clock/GNOME_ClockApplet.xml.h:6 ++#: ../applets/fish/GNOME_FishApplet.xml.h:3 ++#: ../applets/wncklet/GNOME_WindowListApplet.xml.h:3 ++#: ../applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml.h:3 ++msgid "_Preferences" ++msgstr "" ++ ++#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:1 ++#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:1 ++msgid "Accessories" ++msgstr "" ++ ++#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:2 ++#: ../applets/clock/clock.c:2738 ++msgid "Clock" ++msgstr "" ++ ++#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:3 ++msgid "Clock Applet Factory" ++msgstr "" ++ ++#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:4 ++msgid "Factory for creating clock applets." ++msgstr "" ++ ++#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:5 ++msgid "Get the current time and date" ++msgstr "" ++ ++#: ../applets/clock/clock.c:312 ++msgid "%l:%M:%S %p" ++msgstr "" ++ ++#: ../applets/clock/clock.c:312 ../applets/clock/clock.c:633 ++msgid "%l:%M %p" ++msgstr "" ++ ++#: ../applets/clock/clock.c:314 ../applets/clock/clock.c:1779 ++msgid "%H:%M:%S" ++msgstr "" ++ ++#: ../applets/clock/clock.c:314 ../applets/clock/clock.c:635 ++#: ../applets/clock/clock.c:1781 ++msgid "%H:%M" ++msgstr "" ++ ++#. translators: replace %e with %d if, when the day of the ++#. * month as a decimal number is a single digit, it ++#. * should begin with a 0 in your locale (e.g. "May ++#. * 01" instead of "May 1"). ++#. ++#: ../applets/clock/clock.c:325 ++msgid "%a %b %e" ++msgstr "" ++ ++#. translators: reverse the order of these arguments ++#. * if the time should come before the ++#. * date on a clock in your locale. ++#. ++#: ../applets/clock/clock.c:332 ++#, c-format ++msgid "" ++"%1$s\n" ++"%2$s" ++msgstr "" ++ ++#. translators: reverse the order of these arguments ++#. * if the time should come before the ++#. * date on a clock in your locale. ++#. ++#: ../applets/clock/clock.c:339 ++#, c-format ++msgid "%1$s, %2$s" ++msgstr "" ++ ++#. Show date in tooltip ++#: ../applets/clock/clock.c:420 ++msgid "%A %B %d" ++msgstr "" ++ ++#: ../applets/clock/clock.c:432 ++msgid "Click to view your appointments and tasks" ++msgstr "" ++ ++#: ../applets/clock/clock.c:434 ++msgid "Click to view month calendar" ++msgstr "" ++ ++#. Translators: If the event did not start on the current day ++#. we will display the start date in the most abbreviated way possible. ++#: ../applets/clock/clock.c:640 ++msgid "%b %d" ++msgstr "" ++ ++#: ../applets/clock/clock.c:987 ++msgid "Tasks" ++msgstr "" ++ ++#: ../applets/clock/clock.c:1137 ++msgid "All Day" ++msgstr "" ++ ++#: ../applets/clock/clock.c:1176 ++msgid "Appointments" ++msgstr "" ++ ++#: ../applets/clock/clock.c:1408 ++msgid "Calendar" ++msgstr "" ++ ++#: ../applets/clock/clock.c:1697 ++msgid "Computer Clock" ++msgstr "" ++ ++#: ../applets/clock/clock.c:1774 ++msgid "%I:%M:%S %p" ++msgstr "" ++ ++#: ../applets/clock/clock.c:1776 ++msgid "%I:%M %p" ++msgstr "" ++ ++#: ../applets/clock/clock.c:1818 ++msgid "%A, %B %d %Y" ++msgstr "" ++ ++#: ../applets/clock/clock.c:1875 ++#, c-format ++msgid "Failed to launch time configuration tool: %s" ++msgstr "" ++ ++#: ../applets/clock/clock.c:1911 ++msgid "" ++"Failed to locate a program for configuring the date and time. Perhaps none " ++"is installed?" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2389 ++msgid "Custom format" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2513 ../applets/clock/clock.c:2697 ++#: ../applets/fish/fish.c:158 ../applets/notification_area/main.c:83 ++#: ../applets/wncklet/window-list.c:114 ../applets/wncklet/wncklet.c:124 ++#: ../applets/wncklet/workspace-switcher.c:239 ++#, c-format ++msgid "There was an error displaying help: %s" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2548 ++msgid "Clock Preferences" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2572 ++msgid "Clock _type:" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2583 ++msgid "12 hour" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2584 ++msgid "24 hour" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2585 ++msgid "UNIX time" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2586 ++msgid "Internet time" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2594 ++msgid "Custom _format:" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2613 ++msgid "Show _seconds" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2622 ++msgid "Show _date" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2631 ++msgid "Use _UTC" ++msgstr "" ++ ++#: ../applets/clock/clock.c:2741 ++msgid "The Clock displays the current time and date" ++msgstr "" ++ ++#. Translator credits ++#: ../applets/clock/clock.c:2744 ../applets/fish/fish.c:583 ++#: ../applets/notification_area/main.c:134 ++#: ../applets/wncklet/showdesktop.c:503 ../applets/wncklet/window-list.c:784 ++#: ../applets/wncklet/window-menu.c:75 ++#: ../applets/wncklet/workspace-switcher.c:562 ++#: ../gnome-panel/panel-context-menu.c:131 ++msgid "translator-credits" ++msgstr "" ++ ++#. Translators: ++#. This controls whether the GNOME panel clock should display time in 24 hour mode ++#. or 12 hour mode by default. The only valid values for this are "24-hour" and ++#. "12-hour". If your locale uses 24 hour time notation, translate this to "24-hour". ++#. If your locale uses 12 hour time notation with am/pm, translate this to "12-hour". ++#. ++#. Do NOT translate this into anything else than "24-hour" or "12-hour". For example, ++#. if you translate this to "24 sata" or anything else that isn't "24-hour" or ++#. "12-hour", things will not work. ++#. ++#: ../applets/clock/clock.schemas.in.h:11 ++msgid "24-hour" ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:12 ++msgid "Custom format of the clock" ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:13 ++msgid "Hour format" ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:14 ++msgid "If true, display date in the clock, in addition to time." ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:15 ++msgid "If true, display seconds in time." ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:16 ++msgid "If true, display time in Universal Coordinated Time zone." ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:17 ++msgid "If true, show date in a tooltip when the pointer is over the clock." ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:18 ++msgid "If true, show week numbers in the calendar." ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:19 ++msgid "Show date in clock" ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:20 ++msgid "Show date in tooltip" ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:21 ++msgid "Show time with seconds" ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:22 ++msgid "Show week numbers in calendar" ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:23 ++msgid "" ++"The use of this key was deprecated in GNOME 2.6 in favour of the 'format' " ++"key. The schema is retained for compatibility with older versions." ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:24 ++msgid "" ++"This key specifies the format used by the clock applet when the format key " ++"is set to \"custom\". You can use conversion specifiers understood by " ++"strftime() to obtain a specific format." ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:25 ++msgid "" ++"This key specifies the hour format used by the clock applet. Possible values " ++"are \"12-hour\", \"24-hour\", \"internet\", \"unix\" and \"custom\". If set " ++"to \"internet\", the clock will display Internet time. The Internet time " ++"system divides the day into 1000 \".beats\". There are no time zones in this " ++"system, so time is the same all over the world. If set to \"unix\", the " ++"clock will display time in seconds since Epoch, i.e. 1970-01-01. If set to " ++"\"custom\", the clock will display time according to the format specified in " ++"the custom_format key." ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:26 ++msgid "This key specifies the program to run in order to configure the time." ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:27 ++msgid "Time configuration tool" ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:28 ++msgid "Use Internet time" ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:29 ++msgid "Use UNIX time" ++msgstr "" ++ ++#: ../applets/clock/clock.schemas.in.h:30 ++msgid "Use UTC" ++msgstr "" ++ ++#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:2 ++msgid "Display a swimming fish or another animated creature" ++msgstr "" ++ ++#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:3 ++#: ../applets/fish/fish.c:577 ++msgid "Fish" ++msgstr "" ++ ++#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:4 ++msgid "From Whence That Stupid Fish Came" ++msgstr "" ++ ++#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:5 ++msgid "Wanda Factory" ++msgstr "" ++ ++#: ../applets/fish/fish.c:246 ++#, c-format ++msgid "" ++"Warning: The command appears to be something actually useful.\n" ++"Since this is a useless applet, you may not want to do this.\n" ++"We strongly advise you against using %s for anything\n" ++"which would make the applet \"practical\" or useful." ++msgstr "" ++ ++#: ../applets/fish/fish.c:431 ../gnome-panel/panel-properties-dialog.c:440 ++msgid "Images" ++msgstr "" ++ ++#: ../applets/fish/fish.c:545 ../applets/fish/fish.c:605 ++#: ../applets/fish/fish.c:720 ++#, no-c-format ++msgid "%s the Fish" ++msgstr "" ++ ++#: ../applets/fish/fish.c:546 ++#, c-format ++msgid "" ++"%s has no use what-so-ever. It only takes up disk space and compilation " ++"time, and if loaded it also takes up precious panel space and memory. " ++"Anybody found using it should be promptly sent for a psychiatric evaluation." ++msgstr "" ++ ++#: ../applets/fish/fish.c:570 ++msgid "(with minor help from George)" ++msgstr "" ++ ++#: ../applets/fish/fish.c:606 ++#, c-format ++msgid "%s the Fish, a contemporary oracle" ++msgstr "" ++ ++#: ../applets/fish/fish.c:676 ++msgid "Unable to locate the command to execute" ++msgstr "" ++ ++#: ../applets/fish/fish.c:725 ++#, no-c-format ++msgid "%s the Fish Says:" ++msgstr "" ++ ++#: ../applets/fish/fish.c:794 ++#, c-format ++msgid "" ++"Unable to read output from command\n" ++"\n" ++"Details: %s" ++msgstr "" ++ ++#: ../applets/fish/fish.c:859 ++msgid "_Speak again" ++msgstr "" ++ ++#: ../applets/fish/fish.c:940 ++#, c-format ++msgid "The configured command is not working and has been replaced by: %s" ++msgstr "" ++ ++#: ../applets/fish/fish.c:963 ++#, c-format ++msgid "" ++"Unable to execute '%s'\n" ++"\n" ++"Details: %s" ++msgstr "" ++ ++#: ../applets/fish/fish.c:979 ++#, c-format ++msgid "" ++"Unable to read from '%s'\n" ++"\n" ++"Details: %s" ++msgstr "" ++ ++#: ../applets/fish/fish.c:1597 ++msgid "" ++"The water needs changing!\n" ++"(Look at today's date)" ++msgstr "" ++ ++#: ../applets/fish/fish.c:1691 ++#, c-format ++msgid "%s the Fish, the fortune teller" ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:1 ../applets/wncklet/window-list.glade.h:1 ++#: ../applets/wncklet/workspace-switcher.glade.h:1 ++#: ../gnome-panel/panel-properties-dialog.glade.h:1 ++msgid " " ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:2 ++msgid "Animation" ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:3 ++msgid "General" ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:4 ++msgid "Co_mmand to run when clicked:" ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:5 ++msgid "Fish Preferences" ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:6 ++msgid "Select an animation" ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:7 ++msgid "_File:" ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:8 ++msgid "_Name of fish:" ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:9 ++msgid "_Pause per frame:" ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:10 ++msgid "_Rotate on vertical panels" ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:11 ++msgid "_Total frames in animation:" ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:12 ++msgid "frames" ++msgstr "" ++ ++#: ../applets/fish/fish.glade.h:13 ++msgid "seconds" ++msgstr "" ++ ++#: ../applets/fish/fish.schemas.in.h:1 ++msgid "" ++"A fish without a name is a pretty dull fish. Bring your fish to life by " ++"naming him." ++msgstr "" ++ ++#: ../applets/fish/fish.schemas.in.h:2 ++msgid "Command to execute on click" ++msgstr "" ++ ++#: ../applets/fish/fish.schemas.in.h:3 ++msgid "Frames in fish's animation" ++msgstr "" ++ ++#: ../applets/fish/fish.schemas.in.h:4 ++msgid "" ++"If true, the fish's animation will be displayed rotated on vertical panels." ++msgstr "" ++ ++#: ../applets/fish/fish.schemas.in.h:5 ++msgid "Pause per frame" ++msgstr "" ++ ++#: ../applets/fish/fish.schemas.in.h:6 ++msgid "Rotate on vertical panels" ++msgstr "" ++ ++#: ../applets/fish/fish.schemas.in.h:7 ++msgid "The fish's animation pixmap" ++msgstr "" ++ ++#: ../applets/fish/fish.schemas.in.h:8 ++msgid "The fish's name" ++msgstr "" ++ ++#: ../applets/fish/fish.schemas.in.h:9 ++msgid "" ++"This key specifies the command that will be tried to execute when the fish " ++"is clicked." ++msgstr "" ++ ++#: ../applets/fish/fish.schemas.in.h:10 ++msgid "" ++"This key specifies the filename of the pixmap which will be used for the " ++"animation displayed in the fish applet relative to the pixmap directory." ++msgstr "" ++ ++#: ../applets/fish/fish.schemas.in.h:11 ++msgid "" ++"This key specifies the number of frames that will be displayed in the fish's " ++"animation." ++msgstr "" ++ ++#: ../applets/fish/fish.schemas.in.h:12 ++msgid "This key specifies the number of seconds each frame will be displayed." ++msgstr "" ++ ++#: ../applets/notification_area/GNOME_NotificationAreaApplet.server.in.in.h:1 ++msgid "Area where notification icons appear" ++msgstr "" ++ ++#: ../applets/notification_area/GNOME_NotificationAreaApplet.server.in.in.h:2 ++#: ../applets/notification_area/main.c:129 ++msgid "Notification Area" ++msgstr "" ++ ++#: ../applets/notification_area/GNOME_NotificationAreaApplet.server.in.in.h:3 ++msgid "Notification Area Factory" ++msgstr "" ++ ++#: ../applets/notification_area/GNOME_NotificationAreaApplet.server.in.in.h:4 ++#: ../gnome-panel/panel-action-button.c:321 ++#: ../gnome-panel/panel-action-button.c:333 ++#: ../gnome-panel/panel-action-button.c:356 ++#: ../gnome-panel/panel-action-button.c:367 ../gnome-panel/panel-addto.c:70 ++#: ../gnome-panel/panel-addto.c:83 ../gnome-panel/panel-addto.c:96 ++msgid "Utilities" ++msgstr "" ++ ++#: ../applets/notification_area/eggtraymanager.c:146 ++msgid "Orientation" ++msgstr "" ++ ++#: ../applets/notification_area/eggtraymanager.c:147 ++msgid "The orientation of the tray." ++msgstr "" ++ ++#: ../applets/notification_area/main.c:308 ++msgid "Panel Notification Area" ++msgstr "" ++ ++#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:1 ++msgid "Desktop & Windows" ++msgstr "" ++ ++#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:2 ++msgid "Factory for the window navigation related applets" ++msgstr "" ++ ++#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:3 ++msgid "Hide application windows and show the desktop" ++msgstr "" ++ ++#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:4 ++msgid "Show Desktop" ++msgstr "" ++ ++#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:5 ++msgid "Switch between open windows using a menu" ++msgstr "" ++ ++#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:6 ++msgid "Switch between open windows using buttons" ++msgstr "" ++ ++#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:7 ++msgid "Switch between workspaces" ++msgstr "" ++ ++#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:8 ++#: ../applets/wncklet/window-list.c:787 ++msgid "Window List" ++msgstr "" ++ ++#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:9 ++msgid "Window Navigation Applet Factory" ++msgstr "" ++ ++#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:10 ++#: ../applets/wncklet/window-menu.c:78 ../applets/wncklet/window-menu.c:241 ++msgid "Window Selector" ++msgstr "" ++ ++#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:11 ++#: ../applets/wncklet/workspace-switcher.c:565 ++msgid "Workspace Switcher" ++msgstr "" ++ ++#: ../applets/wncklet/showdesktop.c:161 ++#, c-format ++msgid "Failed to load %s: %s\n" ++msgstr "" ++ ++#: ../applets/wncklet/showdesktop.c:162 ++msgid "Icon not found" ++msgstr "" ++ ++#: ../applets/wncklet/showdesktop.c:220 ++msgid "Click here to restore hidden windows." ++msgstr "" ++ ++#: ../applets/wncklet/showdesktop.c:223 ++msgid "Click here to hide all windows and show the desktop." ++msgstr "" ++ ++#: ../applets/wncklet/showdesktop.c:420 ../applets/wncklet/showdesktop.c:506 ++msgid "Show Desktop Button" ++msgstr "" ++ ++#: ../applets/wncklet/showdesktop.c:508 ++msgid "This button lets you hide all windows and show the desktop." ++msgstr "" ++ ++#: ../applets/wncklet/showdesktop.c:538 ++msgid "" ++"Your window manager does not support the show desktop button, or you are not " ++"running a window manager." ++msgstr "" ++ ++#: ../applets/wncklet/window-list.c:789 ++msgid "" ++"The Window List shows a list of all windows in a set of buttons and lets you " ++"browse them." ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:2 ++msgid "Restoring Minimized Windows" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:3 ++msgid "Window Grouping" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:4 ++msgid "Window List Content" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:5 ++msgid "Window List Size" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:6 ++msgid "Behavior" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:7 ++msgid "Group windows when _space is limited" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:8 ++msgid "M_inimum size:" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:9 ++msgid "Ma_ximum size:" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:10 ++msgid "Restore to current _workspace" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:11 ++msgid "Restore to na_tive workspace" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:12 ++msgid "Sh_ow windows from current workspace" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:13 ++msgid "Show windows from a_ll workspaces" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:14 ++msgid "Size" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:15 ++msgid "Window List Preferences" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:16 ++msgid "_Always group windows" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:17 ++msgid "_Never group windows" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.glade.h:18 ++#: ../gnome-panel/panel-properties-dialog.glade.h:28 ++msgid "pixels" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.schemas.in.h:1 ++msgid "" ++"Decides when to group windows from the same application on the window list. " ++"Possible values are \"never\", \"auto\" and \"always\"." ++msgstr "" ++ ++#: ../applets/wncklet/window-list.schemas.in.h:2 ++msgid "" ++"If true, the window list will show windows from all workspaces. Otherwise it " ++"will only display windows from the current workspace." ++msgstr "" ++ ++#: ../applets/wncklet/window-list.schemas.in.h:3 ++msgid "" ++"If true, then when unminimizing a window, move it to the current workspace. " ++"Otherwise, switch to the workspace of the window." ++msgstr "" ++ ++#: ../applets/wncklet/window-list.schemas.in.h:4 ++msgid "Maximum window list size" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.schemas.in.h:5 ++msgid "Minimum window list size" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.schemas.in.h:6 ++msgid "Move windows to current workspace when unminimized" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.schemas.in.h:7 ++msgid "Show windows from all workspaces" ++msgstr "" ++ ++#: ../applets/wncklet/window-list.schemas.in.h:8 ++msgid "" ++"This key specifies the maximum width that the window list requests. The " ++"maximum width setting is useful to limit the size of the window list in " ++"large panels, where the window list could fill the entire space available." ++msgstr "" ++ ++#: ../applets/wncklet/window-list.schemas.in.h:9 ++msgid "This key specifies the minimum width that the window list requests." ++msgstr "" ++ ++#: ../applets/wncklet/window-list.schemas.in.h:10 ++msgid "When to group windows" ++msgstr "" ++ ++#: ../applets/wncklet/window-menu.c:82 ++msgid "" ++"The Window Selector shows a list of all windows in a menu and lets you " ++"browse them." ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.c:131 ++#: ../applets/wncklet/workspace-switcher.c:866 ++#: ../applets/wncklet/workspace-switcher.glade.h:11 ++msgid "rows" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.c:131 ++#: ../applets/wncklet/workspace-switcher.c:866 ++msgid "columns" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.c:428 ++#, c-format ++msgid "Error loading num_rows value for Workspace Switcher: %s\n" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.c:439 ++#, c-format ++msgid "" ++"Error loading display_workspace_names value for Workspace Switcher: %s\n" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.c:454 ++#, c-format ++msgid "Error loading display_all_workspaces value for Workspace Switcher: %s\n" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.c:567 ++msgid "" ++"The Workspace Switcher shows you a small version of your workspaces that " ++"lets you manage your windows." ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.glade.h:2 ++msgid "Switcher" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.glade.h:3 ++msgid "Workspaces" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.glade.h:4 ++msgid "Number of _workspaces:" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.glade.h:5 ++msgid "Show _all workspaces in:" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.glade.h:6 ++msgid "Show _only the current workspace" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.glade.h:7 ++msgid "Show workspace _names in switcher" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.glade.h:8 ++msgid "Workspace Names" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.glade.h:9 ++msgid "Workspace Switcher Preferences" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.glade.h:10 ++msgid "Workspace na_mes:" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.schemas.in.h:1 ++msgid "Display all workspaces" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.schemas.in.h:2 ++msgid "Display workspace names" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.schemas.in.h:3 ++msgid "" ++"If true, the workspace switcher will show all workspaces. Otherwise it will " ++"only show the current workspace." ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.schemas.in.h:4 ++msgid "" ++"If true, the workspaces in the workspace switcher will display the names of " ++"the workspaces. Otherwise they will display the windows on the workspace." ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.schemas.in.h:5 ++msgid "Rows in workspace switcher" ++msgstr "" ++ ++#: ../applets/wncklet/workspace-switcher.schemas.in.h:6 ++msgid "" ++"This key specifies how many rows (for horizontal layout) or columns (for " ++"vertical layout) the workspace switcher shows the workspaces in. This key is " ++"only relevant if the display_all_workspaces key is true." ++msgstr "" ++ ++#: ../gnome-panel/GNOME_Panel.server.in.h:1 ++msgid "GNOME Panel Shell" ++msgstr "" ++ ++#: ../gnome-panel/GNOME_Panel_Popup.xml.h:1 ../gnome-panel/applet.c:540 ++msgid "Loc_k To Panel" ++msgstr "" ++ ++#: ../gnome-panel/GNOME_Panel_Popup.xml.h:2 ../gnome-panel/applet.c:523 ++msgid "_Move" ++msgstr "" ++ ++#: ../gnome-panel/GNOME_Panel_Popup.xml.h:3 ../gnome-panel/applet.c:516 ++msgid "_Remove From Panel" ++msgstr "" ++ ++#: ../gnome-panel/applet.c:433 ++msgid "???" ++msgstr "" ++ ++#: ../gnome-panel/applet.c:1226 ++msgid "Can't find an empty spot" ++msgstr "" ++ ++#: ../gnome-panel/button-widget.c:198 ++msgid "Could not load icon" ++msgstr "" ++ ++#: ../gnome-panel/drawer.c:349 ../gnome-panel/panel-addto.c:111 ++#: ../gnome-panel/panel-toplevel.c:1524 ++msgid "Drawer" ++msgstr "" ++ ++#: ../gnome-panel/drawer.c:588 ++msgid "_Add to Drawer..." ++msgstr "" ++ ++#: ../gnome-panel/drawer.c:594 ../gnome-panel/launcher.c:946 ++#: ../gnome-panel/panel-action-button.c:136 ++#: ../gnome-panel/panel-context-menu.c:248 ++msgid "_Properties" ++msgstr "" ++ ++#. Translators: %s is a URI ++#: ../gnome-panel/egg-recent-view-gtk.c:346 ++#: ../gnome-panel/panel-menu-items.c:396 ../gnome-panel/panel-recent.c:202 ++#, c-format ++msgid "Open '%s'" ++msgstr "" ++ ++#: ../gnome-panel/egg-recent-view-gtk.c:446 ++msgid "Empty" ++msgstr "" ++ ++#: ../gnome-panel/gnome-desktop-item-edit.c:27 ++msgid "Create new file in the given directory" ++msgstr "" ++ ++#. class ++#: ../gnome-panel/launcher.c:144 ../gnome-panel/menu-ditem.c:517 ++msgid "Could not save launcher to disk" ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:175 ++msgid "Could not show this URL" ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:176 ++msgid "No URL was specified." ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:188 ++#, c-format ++msgid "Could not show '%s'" ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:225 ++msgid "Could not launch application" ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:283 ++msgid "Could not use dropped item" ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:479 ++msgid "No URI provided for panel launcher desktop file\n" ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:510 ++#, c-format ++msgid "Unable to open desktop file %s for panel launcher%s%s\n" ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:828 ../gnome-panel/menu-ditem.c:181 ++#: ../gnome-panel/menu-ditem.c:264 ++msgid "Launcher Properties" ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:940 ++msgid "_Launch" ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:979 ++#, c-format ++msgid "Key %s is not set, can't load launcher\n" ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:1034 ../gnome-panel/launcher.c:1053 ++#: ../gnome-panel/menu-ditem.c:469 ../gnome-panel/menu-ditem.c:486 ++#: ../gnome-panel/menu-ditem.c:542 ++msgid "Could not create launcher" ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:1035 ../gnome-panel/menu-ditem.c:470 ++msgid "You have to specify a name." ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:1054 ../gnome-panel/menu-ditem.c:487 ++msgid "You have to specify a valid URL or command." ++msgstr "" ++ ++#: ../gnome-panel/launcher.c:1098 ../gnome-panel/menu-ditem.c:550 ++msgid "Create Launcher" ++msgstr "" ++ ++#: ../gnome-panel/menu-ditem.c:126 ++msgid "Could not save changes to launcher" ++msgstr "" ++ ++#: ../gnome-panel/menu-ditem.c:308 ++msgid "Menu" ++msgstr "" ++ ++#: ../gnome-panel/menu-ditem.c:543 ++msgid "You do not have permission to write to this location." ++msgstr "" ++ ++#: ../gnome-panel/menu.c:935 ++msgid "Add this launcher to _panel" ++msgstr "" ++ ++#: ../gnome-panel/menu.c:946 ++msgid "Add this launcher to _desktop" ++msgstr "" ++ ++#: ../gnome-panel/menu.c:962 ++msgid "_Entire menu" ++msgstr "" ++ ++#: ../gnome-panel/menu.c:972 ++msgid "Add this as _drawer to panel" ++msgstr "" ++ ++#: ../gnome-panel/menu.c:984 ++msgid "Add this as _menu to panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:124 ++msgid "_Activate Screensaver" ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:130 ++msgid "_Lock Screen" ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:208 ++#: ../gnome-panel/panel-action-button.c:221 ++#: ../gnome-panel/panel-menu-bar.c:488 ../gnome-panel/panel-menu-button.c:1023 ++#: ../gnome-panel/panel-util.c:747 ++#, c-format ++msgid "Could not execute '%s'" ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:257 ++msgid "Could not connect to server" ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:291 ++msgid "Lock Screen" ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:292 ++#: ../gnome-panel/panel-action-button.c:309 ++#: ../gnome-panel/panel-action-button.c:344 ../gnome-panel/panel-addto.c:109 ++msgid "Desktop & Windows" ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:294 ++msgid "Protect your computer from unauthorized use" ++msgstr "" ++ ++#. when changing one of those two strings, don't forget to ++#. * update the ones in panel-menu-items.c (look for ++#. * panel:showusername|1) ++#: ../gnome-panel/panel-action-button.c:308 ++msgid "Log Out..." ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:311 ++msgid "Log out of this session to log in as a different user" ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:320 ++msgid "Run Application..." ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:323 ++msgid "Run an Application by entering a command" ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:332 ++msgid "Search for Files..." ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:335 ++msgid "Find files, folders, and documents on your computer" ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:343 ++msgid "Force Quit" ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:346 ++msgid "Force a misbehaving application to quit" ++msgstr "" ++ ++#. FIXME icon ++#: ../gnome-panel/panel-action-button.c:355 ++msgid "Connect to Server..." ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:358 ++msgid "Connect to a remote server" ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:366 ++msgid "Shut Down..." ++msgstr "" ++ ++#: ../gnome-panel/panel-action-button.c:369 ++msgid "Shut down the computer" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:72 ++msgid "Main Menu" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:73 ++msgid "The main GNOME menu" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:85 ++msgid "Menu Bar" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:86 ++msgid "A custom menu bar" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:98 ++msgid "Separator" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:99 ++msgid "A separator to organize the panel items" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:112 ++msgid "A pop out drawer to store other items in" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:212 ++msgid "(empty)" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:347 ++#: ../libpanel-applet/panel-test-applets.c:248 ++#, c-format ++msgid "query returned exception %s\n" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:402 ++msgid "Miscellaneous" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:1269 ++#, c-format ++msgid "Select an _item to add to \"%s\":" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:1273 ++msgid "Add to Drawer" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:1275 ++msgid "Select an _item to add to the drawer:" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:1277 ++msgid "Add to Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-addto.c:1279 ++msgid "" ++"Select an _item to add to the panel \n" ++"(you can also directly drag and drop items onto the panel):" ++msgstr "" ++ ++#: ../gnome-panel/panel-applet-frame.c:833 ++#, c-format ++msgid "Exception from popup_menu '%s'\n" ++msgstr "" ++ ++#: ../gnome-panel/panel-applet-frame.c:952 ++#, c-format ++msgid "\"%s\" has quit unexpectedly" ++msgstr "" ++ ++#: ../gnome-panel/panel-applet-frame.c:954 ++msgid "Panel object has quit unexpectedly" ++msgstr "" ++ ++#: ../gnome-panel/panel-applet-frame.c:961 ++msgid "" ++"If you reload a panel object, it will automatically be added back to the " ++"panel." ++msgstr "" ++ ++#: ../gnome-panel/panel-applet-frame.c:967 ++msgid "_Don't Reload" ++msgstr "" ++ ++#: ../gnome-panel/panel-applet-frame.c:968 ++msgid "_Reload" ++msgstr "" ++ ++#: ../gnome-panel/panel-applet-frame.c:1014 ++#, c-format ++msgid "The panel encountered a problem while loading \"%s\"." ++msgstr "" ++ ++#: ../gnome-panel/panel-applet-frame.c:1031 ++msgid "Do you want to delete the applet from your configuration?" ++msgstr "" ++ ++#: ../gnome-panel/panel-applet-frame.c:1130 ++msgid "Unable to obtain AppletShell interface from control\n" ++msgstr "" ++ ++#: ../gnome-panel/panel-bindings.c:168 ++#, c-format ++msgid "Error watching gconf key '%s': %s" ++msgstr "" ++ ++#: ../gnome-panel/panel-bindings.c:186 ++#, c-format ++msgid "Error loading gconf directory '%s': %s" ++msgstr "" ++ ++#: ../gnome-panel/panel-bindings.c:200 ++#, c-format ++msgid "Error getting value for '%s': %s" ++msgstr "" ++ ++#: ../gnome-panel/panel-context-menu.c:101 ++msgid "And many, many others..." ++msgstr "" ++ ++#: ../gnome-panel/panel-context-menu.c:124 ++msgid "The GNOME Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-context-menu.c:127 ++msgid "" ++"This program is responsible for launching other applications and embedding " ++"small applets within itself." ++msgstr "" ++ ++#: ../gnome-panel/panel-context-menu.c:167 ++msgid "Cannot delete this panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-context-menu.c:168 ++msgid "You must always have at least one panel." ++msgstr "" ++ ++#: ../gnome-panel/panel-context-menu.c:216 ++msgid "_Delete This Panel..." ++msgstr "" ++ ++#: ../gnome-panel/panel-context-menu.c:219 ++#: ../gnome-panel/panel-context-menu.c:261 ++msgid "_Delete This Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-context-menu.c:233 ++msgid "_Add to Panel..." ++msgstr "" ++ ++#: ../gnome-panel/panel-context-menu.c:278 ++msgid "_New Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-context-menu.c:337 ++msgid "A_bout Panels" ++msgstr "" ++ ++#: ../gnome-panel/panel-force-quit.c:75 ++msgid "" ++"Click on a window to force the application to quit. To cancel press ." ++msgstr "" ++ ++#: ../gnome-panel/panel-force-quit.c:203 ++msgid "" ++"Force this application to exit?\n" ++"(Any open documents will be lost.)" ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:1 ++msgid "" ++"A boolean flag to indicate whether the user's previous configuration in /" ++"apps/panel/profiles/default has been copied to the new location in /apps/" ++"panel." ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:2 ++msgid "" ++"A list of panel IDs. Each ID identifies an individual toplevel panel. The " ++"settings for each of these panels are stored in /apps/panel/toplevels/$(id)." ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:3 ++msgid "" ++"A list of panel applet IDs. Each ID identifies an individual panel applet. " ++"The settings for each of these applets are stored in /apps/panel/applets/" ++"$(id)." ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:4 ++msgid "" ++"A list of panel object IDs. Each ID identifies an individual panel object (e." ++"g. a launcher, action button or menu button/bar). The settings for each of " ++"these objects are stored in /apps/panel/objects/$(id)." ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:5 ++msgid "Enable autocompletion in \"Run Application\" dialog" ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:6 ++msgid "Enable program list in \"Run Application\" dialog" ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:7 ++msgid "Expand program list in \"Run Application\" dialog" ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:8 ++msgid "" ++"If true, autocompletion in the \"Run Application\" dialog is made available." ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:9 ++msgid "" ++"If true, the \"Known Applications\" listing in the \"Run Application\" " ++"dialog is expanded when the dialog is opened. This key is only relevant if " ++"the enable_program_list key is true." ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:10 ++msgid "" ++"If true, the \"Known Applications\" listing in the \"Run Application\" " ++"dialog is made available. Whether or not the listing is expanded when the " ++"dialog is shown is controlled by the show_program_list key." ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:11 ++msgid "Old profiles configuration migrated" ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:12 ++msgid "Panel ID list" ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:13 ++msgid "Panel applet ID list" ++msgstr "" ++ ++#: ../gnome-panel/panel-general.schemas.in.h:14 ++msgid "Panel object ID list" ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:1 ++msgid "" ++"A list of applet IIDs that the panel will ignore. This way you can disable " ++"certain applets from loading or showing up in the menu. For example to " ++"disable the mini-commander applet add 'OAFIID:GNOME_MiniCommanderApplet' to " ++"this list. The panel must be restarted for this to take effect." ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:2 ++msgid "Applet IIDs to disable from loading" ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:3 ++msgid "Autoclose drawer" ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:4 ++msgid "Complete panel lockdown" ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:5 ++msgid "Confirm panel removal" ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:6 ++msgid "Deprecated" ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:7 ++msgid "Disable Force Quit" ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:8 ++msgid "Disable Lock Screen" ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:9 ++msgid "Disable Logging Out" ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:10 ++#: ../gnome-panel/panel-toplevel.schemas.in.h:9 ++msgid "Enable animations" ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:11 ++msgid "Enable tooltips" ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:12 ++msgid "Highlight launchers on mouseover" ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:13 ++msgid "" ++"If true, a dialog is shown asking for confirmation if the user wants to " ++"remove a panel." ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:14 ++msgid "" ++"If true, a drawer will automatically be closed when the user clicks a " ++"launcher in it." ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:15 ++msgid "" ++"If true, a launcher is highlighted when the user moves the pointer over it." ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:16 ++msgid "" ++"If true, the panel will not allow a user to force an application to quit by " ++"removing access to the force quit button." ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:17 ++msgid "" ++"If true, the panel will not allow a user to lock their screen, by removing " ++"access to the lock screen menu entries." ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:18 ++msgid "" ++"If true, the panel will not allow a user to log out, by removing access to " ++"the log out menu entries." ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:19 ++msgid "" ++"If true, the panel will not allow any changes to the configuration of the " ++"panel. Individual applets may need to be locked down separately however. The " ++"panel must be restarted for this to take effect." ++msgstr "" ++ ++#: ../gnome-panel/panel-global.schemas.in.h:20 ++msgid "If true, tooltips are shown for objects in panels." ++msgstr "" ++ ++#: ../gnome-panel/panel-logout.c:223 ++#, c-format ++msgid "You will be automatically logged out in %d second." ++msgid_plural "You will be automatically logged out in %d seconds." ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../gnome-panel/panel-logout.c:230 ++#, c-format ++msgid "This system will be automatically shut down in %d second." ++msgid_plural "This system will be automatically shut down in %d seconds." ++msgstr[0] "" ++msgstr[1] "" ++ ++#: ../gnome-panel/panel-logout.c:302 ++msgid "Log out of this system now?" ++msgstr "" ++ ++#: ../gnome-panel/panel-logout.c:308 ++msgid "_Switch User" ++msgstr "" ++ ++#: ../gnome-panel/panel-logout.c:314 ++msgid "_Log Out" ++msgstr "" ++ ++#: ../gnome-panel/panel-logout.c:319 ++msgid "Shut down this system now?" ++msgstr "" ++ ++#: ../gnome-panel/panel-logout.c:329 ++msgid "_Suspend" ++msgstr "" ++ ++#: ../gnome-panel/panel-logout.c:334 ++msgid "_Restart" ++msgstr "" ++ ++#: ../gnome-panel/panel-logout.c:340 ++msgid "_Shut Down" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-bar.c:74 ++msgid "Browse and run installed applications" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-bar.c:86 ++msgid "Access documents, folders and network places" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-bar.c:98 ++msgid "Change desktop appearance and behavior, get help, or log out" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-bar.c:184 ++msgid "Applications" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-bar.c:419 ../gnome-panel/panel-menu-button.c:688 ++msgid "_Edit Menus" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:114 ../gnome-panel/panel-run-dialog.c:325 ++#, c-format ++msgid "Could not open location '%s'" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:375 ++msgid "Bookmarks" ++msgstr "" ++ ++#. Translators: the first string is a ++#. * path and the second string is a ++#. * hostname. nautilus contains the same ++#. * string to translate. ++#: ../gnome-panel/panel-menu-items.c:431 ++#, c-format ++msgid "%1$s on %2$s" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:527 ++msgid "Network Places" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:530 ++msgid "Removable Media" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:596 ++msgid "Documents" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:597 ++msgid "Documents directory" ++msgstr "" ++ ++#. Translators: Desktop is used here as in ++#. * "Desktop Folder" (this is not the Desktop ++#. * environment). Do not keep "Desktop Folder|" ++#. * in the translation ++#: ../gnome-panel/panel-menu-items.c:612 ++msgid "Desktop Folder|Desktop" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:613 ++msgid "Open the desktop as a folder" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:734 ++msgid "Help" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:742 ++msgid "System Documentation" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:745 ../gnome-panel/panel-menu-items.c:746 ++msgid "Online Support" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:1060 ++msgid "Places" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:1095 ++msgid "System" ++msgstr "" ++ ++#. Translators: translate "panel:showusername|1" to anything ++#. * but "1" if "Log Out %s" doesn't make any sense in your ++#. * language (where %s is a username). ++#. ++#: ../gnome-panel/panel-menu-items.c:1187 ++msgid "panel:showusername|1" ++msgstr "" ++ ++#. 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" ++#: ../gnome-panel/panel-menu-items.c:1199 ++#, c-format ++msgid "Log Out %s..." ++msgstr "" ++ ++#. Translators: this string is used ONLY if you translated ++#. * "panel:showusername|1" to "1" ++#: ../gnome-panel/panel-menu-items.c:1203 ++#, c-format ++msgid "Log out %s of this session to log in as a different user" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:1251 ++msgid "Could not launch menu item" ++msgstr "" ++ ++#: ../gnome-panel/panel-menu-items.c:1263 ++msgid "Could not load menu item" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:1 ++msgid "Action button type" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:2 ++msgid "Applet Bonobo IID" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:3 ++msgid "Icon used for object's button" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:4 ++msgid "" ++"If true, the custom_icon key is used as a custom icon for the button. If " ++"false, the custom_icon key is ignored. This key is only relevant if the " ++"object_type key is \"menu-object\" or \"drawer-object\"." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:5 ++msgid "" ++"If true, the menu_path key is used as the path from which the menu contents " ++"should be constructed. If false, the menu_path key is ignored. This key is " ++"only relevant if the object_type key is \"menu-object\"." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:6 ++msgid "" ++"If true, the position of the object is interpreted relative to the right (or " ++"bottom if vertical) edge of the panel." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:7 ++msgid "" ++"If true, the user may not move the applet without first unlocking the object " ++"using the \"Unlock\" menuitem." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:8 ++msgid "Interpret position relative to bottom/right edge" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:9 ++msgid "Launcher location" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:10 ++msgid "Lock the object to the panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:11 ++msgid "Menu content path" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:12 ++msgid "Object's position on the panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:13 ++msgid "Panel attached to drawer" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:14 ++msgid "Panel object type" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:15 ++msgid "" ++"The Bonobo implementation ID of the applet - e.g. \"OAFIID:GNOME_ClockApplet" ++"\". This key is only relevant if the object_type key is \"bonobo-applet\"." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:16 ++msgid "" ++"The action type this button represents. Possible values are \"lock\", " ++"\"logout\", \"run\", \"search\" and \"screenshot\". This key is only " ++"relevant if the object_type key is \"action-applet\"." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:17 ++msgid "" ++"The identifier of the panel attached to this drawer. This key is only " ++"relevant if the object_type key is \"drawer-object\"." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:18 ++msgid "The identifier of the toplevel panel which contains this object." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:19 ++msgid "" ++"The location of the .desktop file describing the launcher. This key is only " ++"relevant if the object_type key is \"launcher-object\"." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:20 ++msgid "" ++"The location of the image file used as the icon for the object's button. " ++"This key is only relevant if the object_type key is \"drawer-object\" or " ++"\"menu-object\" and the use_custom_icon key is true." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:21 ++msgid "" ++"The path from which the menu contents is contructed. This key is only " ++"relevant if the use_menu_path key is true and the object_type key is \"menu-" ++"object\"." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:22 ++msgid "" ++"The position of this panel object. The position is specified by the number " ++"of pixels from the left (or top if vertical) panel edge." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:23 ++msgid "" ++"The text to display in a tooltip for this drawer or this menu. This key is " ++"only relevant if the object_type key is \"drawer-object\" or \"menu-object\"." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:24 ++msgid "" ++"The type of this panel object. Possible values are \"drawer-object\", \"menu-" ++"object\", \"launcher-object\", \"bonobo-applet\", \"action-applet\" and " ++"\"menu-bar\"." ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:25 ++msgid "Tooltip displayed for drawer or menu" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:26 ++msgid "Toplevel panel containing object" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:27 ++msgid "Use custom icon for object's button" ++msgstr "" ++ ++#: ../gnome-panel/panel-object.schemas.in.h:28 ++msgid "Use custom path for menu contents" ++msgstr "" ++ ++#: ../gnome-panel/panel-profile.c:762 ../gnome-panel/panel-profile.c:789 ++#: ../gnome-panel/panel-profile.c:825 ../gnome-panel/panel-profile.c:1648 ++#, c-format ++msgid "Error reading GConf string value '%s': %s" ++msgstr "" ++ ++#: ../gnome-panel/panel-profile.c:804 ../gnome-panel/panel-profile.c:1544 ++#: ../gnome-panel/panel-profile.c:1617 ../gnome-panel/panel-profile.c:1680 ++#, c-format ++msgid "Error reading GConf integer value '%s': %s" ++msgstr "" ++ ++#: ../gnome-panel/panel-profile.c:1554 ++#, c-format ++msgid "" ++"Panel '%s' is set to be displayed on screen %d which is not currently " ++"available. Not loading this panel." ++msgstr "" ++ ++#: ../gnome-panel/panel-profile.c:1632 ++#, c-format ++msgid "Error reading GConf boolean value '%s': %s" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.c:120 ++#: ../libpanel-applet/panel-test-applets.c:53 ++msgid "Orientation|Top" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.c:121 ++#: ../libpanel-applet/panel-test-applets.c:54 ++msgid "Orientation|Bottom" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.c:122 ++#: ../libpanel-applet/panel-test-applets.c:55 ++msgid "Orientation|Left" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.c:123 ++#: ../libpanel-applet/panel-test-applets.c:56 ++msgid "Orientation|Right" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.c:1019 ++msgid "Could not display properties dialog" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.c:1020 ++#: ../gnome-panel/panel-run-dialog.c:1832 ++#, c-format ++msgid "Unable to load file '%s'." ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:2 ++msgid "*" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:3 ++msgid "Opaque" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:4 ++msgid "Transparent" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:5 ++msgid "Arro_ws on hide buttons" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:6 ++msgid "Background" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:7 ++msgid "Background _image:" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:8 ++msgid "Co_lor:" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:9 ++msgid "E_xpand" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:10 ++msgid "General" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:11 ++msgid "Image Background Details" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:12 ++msgid "Panel Properties" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:13 ++msgid "Pick a color" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:14 ++msgid "Rotate image when panel is _vertical" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:15 ++msgid "S_tyle:" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:16 ++msgid "Select background" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:17 ++msgid "Show hide _buttons" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:18 ++msgid "Solid c_olor" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:19 ++msgid "Some of these properties are locked down" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:20 ++msgid "St_retch" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:21 ++msgid "_Autohide" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:22 ++msgid "_Icon:" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:23 ++msgid "_None (use system theme)" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:24 ++#: ../libpanel-applet/panel-test-applets.glade.h:4 ++msgid "_Orientation:" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:25 ++msgid "_Scale" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:26 ++#: ../libpanel-applet/panel-test-applets.glade.h:6 ++msgid "_Size:" ++msgstr "" ++ ++#: ../gnome-panel/panel-properties-dialog.glade.h:27 ++msgid "_Tile" ++msgstr "" ++ ++#: ../gnome-panel/panel-recent.c:54 ++msgid "Could not find a suitable application." ++msgstr "" ++ ++#: ../gnome-panel/panel-recent.c:94 ../gnome-panel/panel-recent.c:102 ++#, c-format ++msgid "Could not open recently used document \"%s\"" ++msgstr "" ++ ++#: ../gnome-panel/panel-recent.c:103 ++#, c-format ++msgid "An unknown error occurred while trying to open \"%s\"" ++msgstr "" ++ ++#: ../gnome-panel/panel-recent.c:155 ++msgid "Clear the Recent Documents list?" ++msgstr "" ++ ++#: ../gnome-panel/panel-recent.c:157 ++msgid "" ++"If you clear the Recent Documents list, you clear the following:\n" ++"\n" ++"• All items from the Places → Recent Documents menu item.\n" ++"• All items from the recent documents list in all applications." ++msgstr "" ++ ++#: ../gnome-panel/panel-recent.c:225 ++msgid "Recent Documents" ++msgstr "" ++ ++#: ../gnome-panel/panel-recent.c:269 ++msgid "Clear Recent Documents" ++msgstr "" ++ ++#: ../gnome-panel/panel-recent.c:273 ++msgid "Clear all items from the recent documents list" ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.c:299 ++#, c-format ++msgid "Could not run command '%s'" ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.c:377 ++#, c-format ++msgid "Could not convert '%s' from UTF-8" ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.c:1171 ++msgid "Choose a file to append to the command..." ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.c:1538 ++#: ../gnome-panel/panel-run-dialog.glade.h:10 ++msgid "Select an application to view its description." ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.c:1576 ++#, c-format ++msgid "Will run command: '%s'" ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.c:1607 ++#, c-format ++msgid "URI list dropped on run dialog had wrong format (%d) or length (%d)\n" ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.c:1831 ++msgid "Could not display run dialog" ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:1 ++msgid "" ++"Click this button to browse for a file whose name to append to the command " ++"string." ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:2 ++msgid "" ++"Click this button to run the selected application or the command in the " ++"command entry field." ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:3 ++msgid "Command entry" ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:4 ++msgid "Command icon" ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:5 ++msgid "Enter a command string here to run it." ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:6 ++msgid "List of known applications" ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:7 ++msgid "Run Application" ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:8 ++msgid "Run in _terminal" ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:9 ++msgid "Run with _file..." ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:11 ++msgid "Select this box to run the command in a terminal window." ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:12 ++msgid "Show list of known _applications" ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:13 ++msgid "The icon of the command to be run." ++msgstr "" ++ ++#: ../gnome-panel/panel-run-dialog.glade.h:14 ++#: ../gnome-panel/panel-stock-icons.c:89 ++msgid "_Run" ++msgstr "" ++ ++#: ../gnome-panel/panel-shell.c:74 ++msgid "" ++"I've detected a panel already running,\n" ++"and will now exit." ++msgstr "" ++ ++#: ../gnome-panel/panel-shell.c:78 ++#, c-format ++msgid "" ++"There was a problem registering the panel with the bonobo-activation " ++"server.\n" ++"The error code is: %d\n" ++"The panel will now exit." ++msgstr "" ++ ++#: ../gnome-panel/panel-stock-icons.c:90 ++msgid "_Force quit" ++msgstr "" ++ ++#: ../gnome-panel/panel-stock-icons.c:91 ++msgid "C_lear" ++msgstr "" ++ ++#: ../gnome-panel/panel-stock-icons.c:92 ++msgid "D_on't Delete" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1114 ++msgid "Hide Panel" ++msgstr "" ++ ++#. translators: these string will be shown in MetaCity's switch window ++#. * popup when you pass the focus to a panel ++#: ../gnome-panel/panel-toplevel.c:1495 ++msgid "Top Expanded Edge Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1496 ++msgid "Top Centered Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1497 ++msgid "Top Floating Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1498 ++msgid "Top Edge Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1502 ++msgid "Bottom Expanded Edge Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1503 ++msgid "Bottom Centered Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1504 ++msgid "Bottom Floating Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1505 ++msgid "Bottom Edge Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1509 ++msgid "Left Expanded Edge Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1510 ++msgid "Left Centered Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1511 ++msgid "Left Floating Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1512 ++msgid "Left Edge Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1516 ++msgid "Right Expanded Edge Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1517 ++msgid "Right Centered Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1518 ++msgid "Right Floating Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.c:1519 ++msgid "Right Edge Panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:1 ++msgid "Animation speed" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:2 ++msgid "Automatically hide panel into corner" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:3 ++msgid "Background color" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:4 ++msgid "Background color opacity" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:5 ++msgid "Background image" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:6 ++msgid "Background type" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:7 ++msgid "Center panel on x-axis" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:8 ++msgid "Center panel on y-axis" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:10 ++msgid "Enable arrows on hide buttons" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:11 ++msgid "Enable hide buttons" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:12 ++msgid "Expand to occupy entire screen width" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:13 ++msgid "Fit image to panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:14 ++msgid "" ++"If true, arrows will be placed on the hide buttons. This key is only " ++"relevant if the enable_buttons key is true." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:15 ++msgid "" ++"If true, buttons will be placed on each side of the panel which may be used " ++"to move the panel to edge of the screen, leaving only a button showing." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:16 ++msgid "" ++"If true, hiding and un-hiding of this panel will be animated rather than " ++"happening instantly." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:17 ++msgid "" ++"If true, the background image will be rotated when the panel is oriented " ++"vertically." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:18 ++msgid "" ++"If true, the image will be scaled (retaining the aspect ratio of the image) " ++"to the panel height (if horizontal)." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:19 ++msgid "" ++"If true, the image will be scaled to the panel dimensions. The aspect ratio " ++"of the image will not be maintained." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:20 ++msgid "" ++"If true, the panel is automatically hidden into a corner of the screen when " ++"the pointer leaves the panel area. Moving the pointer to that corner again " ++"will cause the panel to re-appear." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:21 ++msgid "" ++"If true, the panel will occupy the entire screen width (height if this is a " ++"vertical panel). In this mode the panel can only be placed at a screen edge. " ++"If false, the panel will only be large enough to accommodate the applets, " ++"launchers and buttons on the panel." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:22 ++msgid "" ++"If true, the x key is ignored and the panel is placed at the center of the x-" ++"axis of the screen. If the panel is resized it will remain at that position " ++"- i.e. the panel will grow on both sides. If false, the x key specifies the " ++"location of the panel." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:23 ++msgid "" ++"If true, the y key is ignored and the panel is placed at the center of the y-" ++"axis of the screen. If the panel is resized it will remain at that position " ++"- i.e. the panel will grow on both sides. If false, the y key specifies the " ++"location of the panel." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:24 ++msgid "" ++"In a Xinerama setup, you may have panels on each individual monitor. This " ++"key identifies the current monitor the panel is displayed on." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:25 ++msgid "Name to identify panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:26 ++msgid "Panel autohide delay" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:27 ++msgid "Panel autounhide delay" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:28 ++msgid "Panel orientation" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:29 ++msgid "Panel size" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:30 ++msgid "Rotate image on vertical panels" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:31 ++msgid "Specifies the background color for the panel in #RGB format." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:32 ++msgid "" ++"Specifies the file to be used for the background image. If the image " ++"contains an alpha channel it will be composited onto the desktop background " ++"image." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:33 ++msgid "" ++"Specifies the number of milliseconds delay after the pointer enters the " ++"panel area before the panel is automatically re-shown. This key is only " ++"relevant if the auto_hide key is true." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:34 ++msgid "" ++"Specifies the number of milliseconds delay after the pointer leaves the " ++"panel area before the panel is automatically hidden. This key is only " ++"relevant if the auto_hide key is true." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:35 ++msgid "" ++"Specifies the number of pixels visible when the panel is automatically " ++"hidden into a corner. This key is only relevant if the auto_hide key is true." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:36 ++msgid "" ++"Specifies the opacity of the background color format. If the color is not " ++"completely opaque (a value of less than 65535), the color will be composited " ++"onto the desktop background image." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:37 ++msgid "Stretch image to panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:38 ++msgid "" ++"The height (width for a vertical panel) of the panel. The panel will " ++"determine at runtime a minimum size based on the font size and other " ++"indicators. The maximum size is fixed at one quarter of the screen height " ++"(or width)." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:39 ++msgid "" ++"The location of the panel along the x-axis. This key is only relevant in un-" ++"expanded mode. In expanded mode this key is ignored and the panel is placed " ++"at the screen edge specified by the orientation key." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:40 ++msgid "" ++"The location of the panel along the y-axis. This key is only relevant in un-" ++"expanded mode. In expanded mode this key is ignored and the panel is placed " ++"at the screen edge specified by the orientation key." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:41 ++msgid "" ++"The orientation of the panel. Possible values are \"top\", \"bottom\", \"left" ++"\", \"right\". In expanded mode the key specifies which screen edge the " ++"panel is on. In un-expanded mode the difference between \"top\" and \"bottom" ++"\" is less important - both indicate that this is a horizontal panel - but " ++"still give a useful hint as to how some panel objects should behave. For " ++"example, on a \"top\" panel a menu button will pop up its menu below the " ++"panel, whereas on a \"bottom\" panel the menu will be popped up above the " ++"panel." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:42 ++msgid "" ++"The speed in which panel animations should occur. Possible values are \"slow" ++"\", \"medium\" and \"fast\". This key is only relevant if the " ++"enable_animations key is true." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:43 ++msgid "" ++"This is a human readable name which you can use to identify a panel. Its " ++"main purpose is to serve as the panel's window title which is useful when " ++"navigating between panels." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:44 ++msgid "Visible pixels when hidden" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:45 ++msgid "" ++"Which type of background should be used for this panel. Possible values are " ++"\"gtk\" - the default GTK+ widget background will be used, \"color\" - the " ++"color key will be used as background color or \"image\" - the image " ++"specified by the image key will be used as background." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:46 ++msgid "" ++"With a multi-screen setup, you may have panels on each individual screen. " ++"This key identifies the current screen the panel is displayed on." ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:47 ++msgid "X co-ordinate of panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:48 ++msgid "X screen where the panel is displayed" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:49 ++msgid "Xinerama monitor where the panel is displayed" ++msgstr "" ++ ++#: ../gnome-panel/panel-toplevel.schemas.in.h:50 ++msgid "Y co-ordinate of panel" ++msgstr "" ++ ++#: ../gnome-panel/panel-util.c:89 ++msgid "Could not display help document" ++msgstr "" ++ ++#: ../gnome-panel/panel-util.c:311 ++#, c-format ++msgid "Details: %s" ++msgstr "" ++ ++#: ../gnome-panel/panel-util.c:624 ++#, c-format ++msgid "Icon '%s' not found" ++msgstr "" ++ ++#: ../gnome-panel/panel.c:480 ++#, c-format ++msgid "Open URL: %s" ++msgstr "" ++ ++#: ../gnome-panel/panel.c:1273 ++msgid "Delete this drawer?" ++msgstr "" ++ ++#: ../gnome-panel/panel.c:1274 ++msgid "" ++"When a drawer is deleted, the drawer and its\n" ++"settings are lost." ++msgstr "" ++ ++#: ../gnome-panel/panel.c:1276 ++msgid "Delete Drawer" ++msgstr "" ++ ++#: ../gnome-panel/panel.c:1278 ++msgid "Delete this panel?" ++msgstr "" ++ ++#: ../gnome-panel/panel.c:1279 ++msgid "" ++"When a panel is deleted, the panel and its\n" ++"settings are lost." ++msgstr "" ++ ++#: ../gnome-panel/panel.c:1281 ++msgid "Delete Panel" ++msgstr "" ++ ++#: ../libpanel-applet/GNOME_Panel_TestApplet.server.in.h:1 ++msgid "A simple applet for testing the GNOME-2.0 panel" ++msgstr "" ++ ++#: ../libpanel-applet/GNOME_Panel_TestApplet.server.in.h:2 ++msgid "Test Bonobo Applet" ++msgstr "" ++ ++#: ../libpanel-applet/GNOME_Panel_TestApplet.server.in.h:3 ++msgid "Test Bonobo Applet Factory" ++msgstr "" ++ ++#: ../libpanel-applet/panel-applet.c:1042 ++#, c-format ++msgid "Incomplete '%s' background type received" ++msgstr "" ++ ++#: ../libpanel-applet/panel-applet.c:1056 ++#, c-format ++msgid "Incomplete '%s' background type received: %s" ++msgstr "" ++ ++#: ../libpanel-applet/panel-applet.c:1065 ++#, c-format ++msgid "Failed to get pixmap %s" ++msgstr "" ++ ++#: ../libpanel-applet/panel-applet.c:1072 ++msgid "Unknown background type received" ++msgstr "" ++ ++#: ../libpanel-applet/panel-applet.c:1296 ++msgid "The Applet's containing Panel's orientation" ++msgstr "" ++ ++#: ../libpanel-applet/panel-applet.c:1304 ++msgid "The Applet's containing Panel's size in pixels" ++msgstr "" ++ ++#: ../libpanel-applet/panel-applet.c:1312 ++msgid "The Applet's containing Panel's background color or pixmap" ++msgstr "" ++ ++#: ../libpanel-applet/panel-applet.c:1320 ++msgid "The Applet's flags" ++msgstr "" ++ ++#: ../libpanel-applet/panel-applet.c:1328 ++msgid "Ranges that hint what sizes are acceptable for the applet" ++msgstr "" ++ ++#: ../libpanel-applet/panel-applet.c:1336 ++msgid "The Applet's containing Panel is locked down" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.c:34 ++msgid "Specify an applet IID to load" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.c:35 ++msgid "" ++"Specify a gconf location in which the applet preferences should be stored" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.c:36 ++msgid "Specify the initial size of the applet (xx-small, medium, large etc.)" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.c:37 ++msgid "" ++"Specify the initial orientation of the applet (top, bottom, left or right)" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.c:61 ++msgid "Size|XX Small" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.c:62 ++msgid "Size|X Small" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.c:63 ++msgid "Size|Small" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.c:64 ++msgid "Size|Medium" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.c:65 ++msgid "Size|Large" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.c:66 ++msgid "Size|X Large" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.c:67 ++msgid "Size|XX Large" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.c:129 ++#, c-format ++msgid "Failed to load applet %s" ++msgstr "" ++ ++#. This is an utility to easily test various applets ++#: ../libpanel-applet/panel-test-applets.glade.h:2 ++msgid "Test applet utility" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.glade.h:3 ++msgid "_Applet:" ++msgstr "" ++ ++#: ../libpanel-applet/panel-test-applets.glade.h:5 ++msgid "_Prefs Dir:" ++msgstr "" ++ ++#: ../debian/ubuntu-about.desktop.in.h:1 ++msgid "About Ubuntu" ++msgstr "" ++ ++#: ../debian/ubuntu-about.desktop.in.h:2 ++msgid "Learn more about Ubuntu" ++msgstr "" +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.14.1.orig/debian/patches/11_applet_use_session_dialog.patch +++ gnome-panel-2.14.1/debian/patches/11_applet_use_session_dialog.patch @@ -0,0 +1,79 @@ +diff -Nur gnome-panel-2.14.1/gnome-panel/panel-action-button.c gnome-panel-2.14.1.new/gnome-panel/panel-action-button.c +--- gnome-panel-2.14.1/gnome-panel/panel-action-button.c 2006-02-12 13:36:56.000000000 +0100 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-action-button.c 2006-05-15 11:47:54.000000000 +0200 +@@ -153,9 +153,15 @@ + static void + panel_action_logout (GtkWidget *widget) + { +- panel_logout_new (PANEL_LOGOUT_DIALOG_LOGOUT, +- gtk_widget_get_screen (widget), +- gtk_get_current_event_time ()); ++ const char *key; ++ ++ 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 +@@ -169,7 +175,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)); + } + +diff -Nur gnome-panel-2.14.1/gnome-panel/panel-global.schemas.in gnome-panel-2.14.1.new/gnome-panel/panel-global.schemas.in +--- gnome-panel-2.14.1/gnome-panel/panel-global.schemas.in 2005-06-06 22:18:18.000000000 +0200 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-global.schemas.in 2006-05-15 11:47:54.000000000 +0200 +@@ -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.14.1/gnome-panel/panel-menu-items.c gnome-panel-2.14.1.new/gnome-panel/panel-menu-items.c +--- gnome-panel-2.14.1/gnome-panel/panel-menu-items.c 2006-05-15 11:47:53.000000000 +0200 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-menu-items.c 2006-05-15 11:50:38.000000000 +0200 +@@ -1186,7 +1186,7 @@ + separator_inserted = GTK_IS_SEPARATOR (GTK_WIDGET (children->data)); + } + +- 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) { +diff -Nur gnome-panel-2.14.1/gnome-panel/panel-session.c gnome-panel-2.14.1.new/gnome-panel/panel-session.c +--- gnome-panel-2.14.1/gnome-panel/panel-session.c 2006-01-16 18:42:06.000000000 +0100 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-session.c 2006-05-15 11:47:54.000000000 +0200 +@@ -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.14.1.orig/debian/patches/08_default_clock_setting.patch +++ gnome-panel-2.14.1/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.14.1.orig/debian/patches/07_use_beagle.patch +++ gnome-panel-2.14.1/debian/patches/07_use_beagle.patch @@ -0,0 +1,21 @@ +--- gnome-panel-2.13.90/gnome-panel/panel-menu-items.c.use-beagle 2006-02-13 13:26:43.000000000 -0500 ++++ gnome-panel-2.13.90/gnome-panel/panel-menu-items.c 2006-02-13 13:28:08.000000000 -0500 +@@ -634,9 +634,15 @@ + + add_menu_separator (places_menu); + +- panel_menu_items_append_from_desktop (places_menu, +- "gnome-search-tool.desktop", +- NULL); ++ if (panel_is_program_in_path ("beagle-search")) { ++ panel_menu_items_append_from_desktop (places_menu, ++ "beagle-search.desktop", ++ NULL); ++ } else { ++ panel_menu_items_append_from_desktop (places_menu, ++ "gnome-search-tool.desktop", ++ NULL); ++ } + + *recent_view = panel_recent_append_documents_menu (places_menu, + *recent_view); --- gnome-panel-2.14.1.orig/debian/patches/12_autoconf.patch +++ gnome-panel-2.14.1/debian/patches/12_autoconf.patch @@ -0,0 +1,33449 @@ +diff -Nur gnome-panel-2.14.1/aclocal.m4 gnome-panel-2.14.1.new/aclocal.m4 +--- gnome-panel-2.14.1/aclocal.m4 2006-04-10 15:46:13.000000000 +0200 ++++ gnome-panel-2.14.1.new/aclocal.m4 2006-05-07 23:41:08.000000000 +0200 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.9.6 -*- Autoconf -*- ++# generated automatically by aclocal 1.8.5 -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005 Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 ++# 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. +@@ -11,4185 +11,4533 @@ + # 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])]) ++AC_SUBST($1)dnl ++]) + ++# GLIB_WITH_NLS ++#----------------- ++glib_DEFUN([GLIB_WITH_NLS], ++ dnl NLS is obligatory ++ [USE_NLS=yes ++ AC_SUBST(USE_NLS) + +-# 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. ++ gt_cv_have_gettext=no + +-# serial 8 ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + +-# 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... ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" + ++ # ++ # 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 + +-# _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 ++ # ++ # 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)])]) + +-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=]) ++ 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 + +-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 ++ # ++ # 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" + +- 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 ++ 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 + +- 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 ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes + 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_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" + fi +- fi +- done ++ ++ 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 ++ ]) + +- 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 test "$gt_cv_have_gettext" = "yes" ; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [always defined to indicate that i18n is enabled]) ++ fi + ++ 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 + +-# 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 +-]) ++ # We need to process the po/ directory. ++ POSUB=po + ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) + +-# 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]) +-]) ++ 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 + +-# Generate code to set up dependency tracking. -*- Autoconf -*- ++ 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) 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. ++# 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 3 ++ 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_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 ++ 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 ++ ++ 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 ++ ]) + +-# 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"]) ++# 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" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++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" ++AC_DEFINE_UNQUOTED($1, "$localedir", ++ [Define the location where the catalogs will be installed]) + ]) + +-# 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. ++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 + +-# serial 8 ++# gnome-common.m4 ++# + +-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++dnl GNOME_COMMON_INIT + +-# Do all the work for Automake. -*- Autoconf -*- ++AC_DEFUN([GNOME_COMMON_INIT], ++[ ++ dnl this macro should come after AC_CONFIG_MACRO_DIR ++ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) + +-# 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 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 + +-# serial 12 ++ AC_SUBST([ACLOCAL_AMFLAGS]) ++]) + +-# 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. ++AC_DEFUN([GNOME_DEBUG_CHECK], ++[ ++ AC_ARG_ENABLE([debug], ++ AC_HELP_STRING([--enable-debug], ++ [turn on debugging]),, ++ [enable_debug=no]) + +-# 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 ++ if test x$enable_debug = xyes ; then ++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1, ++ [Enable additional debugging at the expense of performance and size]) ++ 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]) ++dnl GNOME_MAINTAINER_MODE_DEFINES () ++dnl define DISABLE_DEPRECATED ++dnl ++AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], ++[ ++ AC_REQUIRE([AM_MAINTAINER_MODE]) + +-# 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 ++ 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) ++]) + +-_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_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 ****************************** + +-# 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_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])"]) + ++ warnCFLAGS= ++ if test "x$GCC" != xyes; then ++ enable_compile_warnings=no ++ 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. ++ warning_flags= ++ realsave_CFLAGS="$CFLAGS" + +-# 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]) ++ 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) + +-# 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(iso-c, ++ AC_HELP_STRING([--enable-iso-c], ++ [Try to warn if code is not ISO C ]),, ++ [enable_iso_c=no]) + +-# 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)]) ++ 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) 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. ++ WARN_CFLAGS="$warning_flags $complCFLAGS" ++ AC_SUBST(WARN_CFLAGS) ++]) + +-# serial 2 ++dnl For C++, do basically the same thing. + +-# 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_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])"]) + +-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +-# From Jim Meyering ++ 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 + +-# 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. ++ ## -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) + +-# serial 4 ++ 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_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_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 + +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ case " $CXXFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; ++ esac ++ fi ++ fi ++ AC_MSG_RESULT($complCXXFLAGS) + +-# Check to see how 'make' treats includes. -*- Autoconf -*- ++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" ++ AC_SUBST(WARN_CXXFLAGS) ++]) + +-# 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. ++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 3 ++# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL + +-# 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 -*- ++# 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) 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. + +-# serial 4 ++# 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_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) ++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 + + +-# 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 +-]) ++# _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 + +-# 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. ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +-# 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' +- fi +-fi +-AC_SUBST([mkdir_p])]) ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++AC_SUBST(LIBTOOL)dnl + +-# Helper functions for option handling. -*- Autoconf -*- ++# Prevent multiple expansion ++define([AC_PROG_LIBTOOL], []) ++])# _AC_PROG_LIBTOOL + +-# 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. + +-# serial 3 ++# 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 + +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++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 + +-# _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)]) ++AC_LIBTOOL_SYS_MAX_CMD_LEN ++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++AC_LIBTOOL_OBJDIR + +-# _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)])]) ++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++_LT_AC_PROG_ECHO_BACKSLASH + +-# _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])]) ++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 + +-# Check to make sure that the build environment is sane. -*- Autoconf -*- ++# 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'] + +-# 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. ++# Same as above, but do not quote variable references. ++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +-# serial 4 ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +-# 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 ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' + +- # 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 ++# Constants: ++rm="rm -f" + +- 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)]) ++# Global variables: ++default_ofile=libtool ++can_build_shared=yes + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# 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" + +-# 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])]) ++AC_CHECK_TOOL(AR, ar, false) ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++AC_CHECK_TOOL(STRIP, strip, :) + +-# Check how to create a tarball. -*- Autoconf -*- ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" + +-# 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. ++# 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 + +-# serial 2 ++# 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= + +-# _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 ++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" + ;; + esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi + +- # 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 ++_LT_CC_BASENAME([$compiler]) + +- # 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 ++# 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 +-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 +- +-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 ++ ;; ++esac + +-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 ++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_ARG_WITH(gconf-source, +- [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) ++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 + +- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) +- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++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 test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' +- fi ++# Use C for the default configuration in the libtool script ++tagname= ++AC_LIBTOOL_LANG_C_CONFIG ++_LT_AC_TAGCONFIG ++])# AC_LIBTOOL_SETUP + +- 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]) ++# _LT_AC_SYS_COMPILER ++# ------------------- ++AC_DEFUN([_LT_AC_SYS_COMPILER], ++[AC_REQUIRE([AC_PROG_CC])dnl + +- 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]) +-]) ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} + +-# 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) ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +-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 ++# Allow CC to be a program name with arguments. ++compiler=$CC ++])# _LT_AC_SYS_COMPILER + +-# 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 +- AC_MSG_RESULT(no) +-fi +-AC_SUBST($1)dnl ++# _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-%%"` + ]) + +-# GLIB_WITH_NLS +-#----------------- +-glib_DEFUN([GLIB_WITH_NLS], +- dnl NLS is obligatory +- [USE_NLS=yes +- AC_SUBST(USE_NLS) +- +- gt_cv_have_gettext=no +- +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= + +- AC_CHECK_HEADER(libintl.h, +- [gt_cv_func_dgettext_libintl="no" +- libintl_extra_libs="" ++# _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 + +- # +- # 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 + +- # +- # 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)])]) ++# _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_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_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 + +- 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 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 +- ]) ++# _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 + +- if test "$gt_cv_have_gettext" = "yes" ; then +- AC_DEFINE(ENABLE_NLS, 1, +- [always defined to indicate that i18n is enabled]) +- fi + +- 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 ++# _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} + +- # We need to process the po/ directory. +- POSUB=po ++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_OUTPUT_COMMANDS( +- [case "$CONFIG_FILES" in *po/Makefile.in*) +- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +- esac]) ++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 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 ++if test "X[$]1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat </dev/null 2>&1 && unset CDPATH + +-# 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 +- +- 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 +- +- 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 +- ]) +- +-# 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" +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-test "x$exec_prefix" = xNONE && exec_prefix=$prefix +-if test "x$CATOBJEXT" = "x.mo" ; then +- localedir=`eval echo "${libdir}/locale"` +-else +- localedir=`eval echo "${datadir}/locale"` ++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 +-prefix="$glib_save_prefix" +-exec_prefix="$glib_save_exec_prefix" +-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 +- +-# 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]) +-]) ++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. + +-AC_DEFUN([GNOME_DEBUG_CHECK], +-[ +- AC_ARG_ENABLE([debug], +- AC_HELP_STRING([--enable-debug], +- [turn on debugging]),, +- [enable_debug=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" + +- if test x$enable_debug = xyes ; then +- AC_DEFINE(GNOME_ENABLE_DEBUG, 1, +- [Enable additional debugging at the expense of performance and size]) +- fi +-]) ++ 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=: + +-dnl GNOME_MAINTAINER_MODE_DEFINES () +-dnl define DISABLE_DEPRECATED +-dnl +-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +-[ +- AC_REQUIRE([AM_MAINTAINER_MODE]) ++ 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 + +- if test $USE_MAINTAINER_MODE = yes; then +- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED" ++ 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 +- DISABLE_DEPRECATED="" ++ # Oops. We lost completely, so just stick with echo. ++ echo=echo + fi +- AC_SUBST(DISABLE_DEPRECATED) +-]) +- +-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 ****************************** ++ fi ++ fi ++ fi ++fi ++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])"]) ++# 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 + +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi ++AC_SUBST(ECHO) ++])])# _LT_AC_PROG_ECHO_BACKSLASH + +- warning_flags= +- realsave_CFLAGS="$CFLAGS" + +- 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) +- +- 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 +- fi +- fi +- AC_MSG_RESULT($complCFLAGS) +- +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- AC_SUBST(WARN_CFLAGS) +-]) +- +-dnl For C++, do basically the same thing. +- +-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])"]) ++# _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 + +- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) +- warnCXXFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=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 +- if test "x$enable_cxx_warnings" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-Wall[\ \ ]*) ;; +- *) warnCXXFLAGS="-Wall -Wno-unused" ;; +- esac +- +- ## -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 ++ 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 +- AC_MSG_RESULT($warnCXXFLAGS) +- +- AC_ARG_ENABLE(iso-cxx, +- AC_HELP_STRING([--enable-iso-cxx], +- [Try to warn if code is not ISO C++ ]),, +- [enable_iso_cxx=no]) ++ rm -rf conftest* ++ ;; + +- 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" ;; ++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 +- +- case " $CXXFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; ++ ;; ++ *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 +- fi +- fi +- AC_MSG_RESULT($complCXXFLAGS) +- +- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" +- AC_SUBST(WARN_CXXFLAGS) +-]) ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; + +-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++*-*-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 ++ ;; ++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* ++ ;; + +-# serial 47 AC_PROG_LIBTOOL ++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 + ++need_locks="$enable_libtool_lock" + +-# 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])])]) ++])# _LT_AC_LOCK + + +-# 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_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* ++]) + +-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 test x"[$]$2" = xyes; then ++ ifelse([$5], , :, [$5]) ++else ++ ifelse([$6], , :, [$6]) ++fi ++])# AC_LIBTOOL_COMPILER_OPTION + + +-# _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_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" ++]) + +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++if test x"[$]$2" = xyes; then ++ ifelse([$4], , :, [$4]) ++else ++ ifelse([$5], , :, [$5]) ++fi ++])# AC_LIBTOOL_LINKER_OPTION + +-# 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_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" + ++ 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 ++ ;; + +-# 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 ++ 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_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 ++ 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; ++ ;; + +-AC_LIBTOOL_SYS_MAX_CMD_LEN +-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-AC_LIBTOOL_OBJDIR ++ 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; ++ ;; + +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-_LT_AC_PROG_ECHO_BACKSLASH ++ 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` ++ ;; + +-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 ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; + +-# 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'] ++ 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 + +-# Same as above, but do not quote variable references. +-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +-# Sed substitution to delay expansion of an escaped shell variable in a +-# double_quote_subst'ed string. +-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++# _LT_AC_CHECK_DLFCN ++# ------------------ ++AC_DEFUN([_LT_AC_CHECK_DLFCN], ++[AC_CHECK_HEADERS(dlfcn.h)dnl ++])# _LT_AC_CHECK_DLFCN + +-# Sed substitution to avoid accidental globbing in evaled expressions +-no_glob_subst='s/\*/\\\*/g' + +-# Constants: +-rm="rm -f" ++# _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 + +-# All known linkers require a `.a' archive for static linking (except M$VC, +-# which needs '.lib'). +-libext=a +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" +-with_gnu_ld="$lt_cv_prog_gnu_ld" ++#include + +-AC_CHECK_TOOL(AR, ar, false) +-AC_CHECK_TOOL(RANLIB, ranlib, :) +-AC_CHECK_TOOL(STRIP, strip, :) ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif + +-old_CC="$CC" +-old_CFLAGS="$CFLAGS" ++/* 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 + +-# 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 "$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 ++#ifdef __cplusplus ++extern "C" void exit (int); ++#endif + +-# 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= ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; ++ ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); ++ ++ 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 ++ ++ ++# 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="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes + ;; ++ ++ mingw* | pw32*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ 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 ++ ]) ++ ;; ++ + *) +- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ++ 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 +- 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 ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no + 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) ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + +-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 ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + +-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 ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" + +-# Use C for the default configuration in the libtool script +-tagname= +-AC_LIBTOOL_LANG_C_CONFIG +-_LT_AC_TAGCONFIG +-])# AC_LIBTOOL_SETUP ++ 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_AC_SYS_COMPILER +-# ------------------- +-AC_DEFUN([_LT_AC_SYS_COMPILER], +-[AC_REQUIRE([AC_PROG_CC])dnl ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac + +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac + +-# Allow CC to be a program name with arguments. +-compiler=$CC +-])# _LT_AC_SYS_COMPILER ++ 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_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-%%"` +-]) +- +- +-# _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' >conftest.err +-_lt_compiler_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_COMPILER_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_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' >conftest.err +-_lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_LINKER_BOILERPLATE ++ 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_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 ++# 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_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_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 + +-# _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_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 + +-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! +- : ++ # 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 +- : +-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. + +- 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" ++# 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 ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi ++need_lib_prefix=unknown ++hardcode_into_libs=no + +- 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=: ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown + +- 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 ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH + +- 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 ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ ++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" ++ 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" + ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" ++ 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}' + ;; + esac +- 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 + ;; +-*-*-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 ++ ++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' + ;; + +-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* ++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 + ;; + +-*-*-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 ++freebsd1*) ++ dynamic_linker=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) ++ ++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' + ;; +- ]) +-esac + +-need_locks="$enable_libtool_lock" ++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 ++ 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 ++ ;; + +-])# _LT_AC_LOCK ++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 ++ ;; + ++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' ++ ;; + +-# 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}? :&$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 >conftest.exp +- $SED '/^$/d' conftest.err >conftest.er2 +- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then +- $2=yes +- fi +- fi +- $rm conftest* +-]) ++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 ++ ;; + +-if test x"[$]$2" = xyes; then +- ifelse([$5], , :, [$5]) +-else +- ifelse([$6], , :, [$6]) +-fi +-])# AC_LIBTOOL_COMPILER_OPTION +- +- +-# 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 compiler 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 > conftest.exp +- $SED '/^$/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" +-]) +- +-if test x"[$]$2" = xyes; then +- ifelse([$4], , :, [$4]) +-else +- ifelse([$5], , :, [$5]) +-fi +-])# AC_LIBTOOL_LINKER_OPTION +- +- +-# 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" +- +- 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; +- ;; +- +- 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; +- ;; +- +- 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; +- ;; +- +- 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 *BSD +- 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` +- ;; +- 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 ++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= + ;; + *) +- # 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` ++ 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 +-]) +-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 +- ++ 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 ++ ;; + +-# _LT_AC_CHECK_DLFCN +-# -------------------- +-AC_DEFUN([_LT_AC_CHECK_DLFCN], +-[AC_CHECK_HEADERS(dlfcn.h)dnl +-])# _LT_AC_CHECK_DLFCN ++# 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 + +-# _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 ++ # 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' ++ ;; + +-#include ++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' ++ ;; + +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif ++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' ++ ;; + +-/* 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 +- +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; +- +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } +- +- exit (status); +-}] +-EOF +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) $1 ;; +- x$lt_dlneed_uscore) $2 ;; +- x$lt_unknown|x*) $3 ;; +- esac +- else : +- # compilation failed +- $3 ++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 +-fi +-rm -fr conftest* +-])# _LT_AC_TRY_DLOPEN_SELF ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; + ++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_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= ++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 +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ;; +- +- mingw* | pw32*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; +- +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; +- +- 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 +- ]) +- ;; +- +- *) +- 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"]) +- ]) +- ]) +- ]) +- ]) +- ]) +- ;; ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; + esac +- +- if test "x$lt_cv_dlopen" != xno; then +- enable_dlopen=yes ++ 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 +- enable_dlopen=no ++ shlibpath_overrides_runpath=yes + fi ++ ;; + +- 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" +- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++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 ++ ;; + +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" ++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_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) +- ]) ++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' ++ ;; + +- if test "x$lt_cv_dlopen_self" = xyes; then +- LDFLAGS="$LDFLAGS $link_static_flag" +- 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 ++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 ++ ;; + +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +- ;; ++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 ++ ;; + +- case $lt_cv_dlopen_self in +- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; +- *) enable_dlopen_self=unknown ;; +- esac ++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 ++ ;; + +- 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 ++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 ++ ;; + +-# 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 ++*) ++ dynamic_linker=no ++ ;; ++esac ++AC_MSG_RESULT([$dynamic_linker]) ++test "$dynamic_linker" = no && can_build_shared=no + +- 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}? :&$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 > out/conftest.exp +- $SED '/^$/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.err || 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 . +- $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 ++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_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 ++# _LT_AC_TAGCONFIG ++# ---------------- ++AC_DEFUN([_LT_AC_TAGCONFIG], ++[AC_ARG_WITH([tags], ++ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], ++ [include additional configurations @<:@automatic@:>@])], ++ [tagnames="$withval"]) + +-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 ++if test -f "$ltmain" && test -n "$tagnames"; then ++ if test ! -f "${ofile}"; then ++ AC_MSG_WARN([output file `$ofile' does not exist]) + fi +-else +- need_locks=no +-fi +-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS + ++ 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_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 ++ # 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_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 ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null ++ then ++ AC_MSG_ERROR([tag name \"$tagname\" already exists]) ++ fi + +- # 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 ++ # Update the list of available tags. ++ if test -n "$tagname"; then ++ echo appending configuration tag \"$tagname\" to $ofile ++ ++ 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 ++ ;; ++ ++ F77) ++ if test -n "$F77" && test "X$F77" != "Xno"; then ++ AC_LIBTOOL_LANG_F77_CONFIG ++ else ++ tagname="" ++ fi ++ ;; ++ ++ GCJ) ++ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then ++ AC_LIBTOOL_LANG_GCJ_CONFIG ++ else ++ tagname="" ++ fi ++ ;; ++ ++ RC) ++ AC_LIBTOOL_LANG_RC_CONFIG ++ ;; ++ ++ *) ++ 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 +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- _LT_AC_TAGVAR(hardcode_action, $1)=immediate ++ rm -f "${ofile}T" ++ AC_MSG_ERROR([unable to update list of available tagged configurations.]) + 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)]) ++])# _LT_AC_TAGCONFIG + +-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_LIBTOOL_DLOPEN ++# ----------------- ++# enable checks for dlopen support ++AC_DEFUN([AC_LIBTOOL_DLOPEN], ++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) ++])# AC_LIBTOOL_DLOPEN + +-# 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 + ++# 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_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 +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi +-need_lib_prefix=unknown +-hardcode_into_libs=no + +-# when you set need_version to no, make sure it does not cause -set_version +-# flags to be left without arguments +-need_version=unknown ++# 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 $host_os in +-aix3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' +- shlibpath_var=LIBPATH + +- # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; ++# 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 + +-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 ++ ++# 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 +- # 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 +- ;; ++ esac], ++ [enable_static=]AC_ENABLE_STATIC_DEFAULT) ++])# AC_ENABLE_STATIC + +-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' +- ;; + +-beos*) +- library_names_spec='${libname}${shared_ext}' +- dynamic_linker="$host_os ld.so" +- shlibpath_var=LIBRARY_PATH +- ;; ++# 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 + +-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 +- ;; + +-cygwin* | mingw* | pw32*) +- version_type=windows +- shrext_cmds=".dll" +- need_version=no +- need_lib_prefix=no ++# 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 + +- 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' +- 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" +- ;; +- 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}' +- ;; +- esac +- ;; ++# 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 + +- *) +- 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 +- ;; + +-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' +- ;; ++# 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 + +-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 +- ;; + +-freebsd1*) +- dynamic_linker=no +- ;; ++# 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]) ++])]) + +-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. +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +- 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 +- ;; +- *) # from 3.2 on +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- esac ++# 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 + +-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 +- ;; ++*** 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 + +-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" ++EOF ++ fi ;; ++ esac ++ fi ++ break + 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' ++ 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 + +-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 +- ;; ++# 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=: ++ fi ++fi ++])# AC_PATH_MAGIC + +-# 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}" +- ;; ++# 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 /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 ++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 + ;; + +-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 ++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' + ;; + +-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 ++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' + ;; + +-openbsd*) +- version_type=sunos +- 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 ++darwin* | rhapsody*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++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.*` ++ ;; ++ esac + else +- shlibpath_overrides_runpath=yes ++ lt_cv_deplibs_check_method=pass_all + fi + ;; + +-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 ++gnu*) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-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" ++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 + ;; + +-sco3.2v5*) +- version_type=osf +- 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 ++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)$' + ;; + +-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' ++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 + ;; + +-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 ++# This must be Linux ELF. ++linux*) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- 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 ++netbsd* | netbsdelf*-gnu | knetbsd*-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 + ;; + +-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 ++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 + ;; + +-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 ++nto-qnx*) ++ lt_cv_deplibs_check_method=unknown + ;; + +-*) +- dynamic_linker=no ++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 + ;; +-esac +-AC_MSG_RESULT([$dynamic_linker]) +-test "$dynamic_linker" = no && can_build_shared=no +-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER + ++osf3* | osf4* | osf5*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +-# _LT_AC_TAGCONFIG +-# ---------------- +-AC_DEFUN([_LT_AC_TAGCONFIG], +-[AC_ARG_WITH([tags], +- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], +- [include additional configurations @<:@automatic@:>@])], +- [tagnames="$withval"]) ++solaris*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +-if test -f "$ltmain" && test -n "$tagnames"; then +- if test ! -f "${ofile}"; then +- AC_MSG_WARN([output file `$ofile' does not exist]) +- 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 ++ ;; ++ 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 ++ ;; + +- 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 ++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 + +- # 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 ++# 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" +- # 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 ++ done ++ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++fi]) ++NM="$lt_cv_path_NM" ++])# AC_PROG_NM + +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null +- then +- AC_MSG_ERROR([tag name \"$tagname\" already exists]) +- fi + +- # Update the list of available tags. +- if test -n "$tagname"; then +- echo appending configuration tag \"$tagname\" to $ofile +- +- 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 +- ;; +- +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- AC_LIBTOOL_LANG_F77_CONFIG +- else +- tagname="" +- fi +- ;; +- +- GCJ) +- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then +- AC_LIBTOOL_LANG_GCJ_CONFIG +- else +- tagname="" +- fi +- ;; ++# 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 + +- RC) +- AC_LIBTOOL_LANG_RC_CONFIG +- ;; + +- *) +- AC_MSG_ERROR([Unsupported tag name: $tagname]) +- ;; +- esac ++# 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 + +- # 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" ++# 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 +- rm -f "${ofile}T" +- AC_MSG_ERROR([unable to update list of available tagged configurations.]) ++ ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ++ LIBLTDL="-lltdl" ++ LTDLINCL= + fi +-fi +-])# _LT_AC_TAGCONFIG ++ # For backwards non-gettext consistent compatibility... ++ INCLTDL="$LTDLINCL" ++])# AC_LIBLTDL_INSTALLABLE + + +-# AC_LIBTOOL_DLOPEN +-# ----------------- +-# enable checks for dlopen support +-AC_DEFUN([AC_LIBTOOL_DLOPEN], +- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_DLOPEN ++# AC_LIBTOOL_CXX ++# -------------- ++# enable support for C++ libraries ++AC_DEFUN([AC_LIBTOOL_CXX], ++[AC_REQUIRE([_LT_AC_LANG_CXX]) ++])# AC_LIBTOOL_CXX + + +-# AC_LIBTOOL_WIN32_DLL +-# -------------------- +-# declare package support for building win32 dll's +-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_WIN32_DLL ++# _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 + ++# _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 + +-# 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_LIBTOOL_F77 ++# -------------- ++# enable support for Fortran 77 libraries ++AC_DEFUN([AC_LIBTOOL_F77], ++[AC_REQUIRE([_LT_AC_LANG_F77]) ++])# AC_LIBTOOL_F77 + + +-# 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 ++# _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 + + +-# 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 ++# AC_LIBTOOL_GCJ ++# -------------- ++# enable support for GCJ libraries ++AC_DEFUN([AC_LIBTOOL_GCJ], ++[AC_REQUIRE([_LT_AC_LANG_GCJ]) ++])# AC_LIBTOOL_GCJ + + +-# 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 ++# _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 + + +-# 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_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 + + +-# 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_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) + ++# Source file extension for C test sources. ++ac_ext=c + +-# 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 ++# 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_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]) +-])]) ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(){return(0);}\n' + ++_LT_AC_SYS_COMPILER + +-# 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 ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +-*** 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 ++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 + +-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 +- AC_MSG_RESULT(no) +-fi +-])# AC_PATH_TOOL_PREFIX ++# 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_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=: ++# 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 +-fi +-])# AC_PATH_MAGIC +- ++ ;; + +-# 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 ++aix4* | aix5*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi + ;; +- 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 GNU ld's 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 +- 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 +- ;; ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER + +-gnu*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +-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 +- ;; ++# 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]) + +-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 +- ;; ++# 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 + +-# This must be Linux ELF. +-linux*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++if test "$GXX" = yes; then ++ # Set up default GNU C++ configuration + +-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 +- ;; ++ AC_PROG_LD + +-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 +- ;; ++ # 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' + +-nto-qnx*) +- lt_cv_deplibs_check_method=unknown +- ;; ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + +-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)$' ++ # 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}' ++ ++ # 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 + else +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' +- fi +- ;; ++ with_gnu_ld=no ++ wlarc= + +-osf3* | osf4* | osf5*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ # 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 + +-sco3.2v5*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ # 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"' + +-solaris*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++else ++ GXX=no ++ with_gnu_ld=no ++ wlarc= ++fi + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- 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 +- ;; +- 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 ++# 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 + ;; +- esac +- ;; ++ 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 + +-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | 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 ++ # 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 + ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi + +-# 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_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/${ac_tool_prefix}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 ++ # 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 "$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 +- done +- IFS="$lt_save_ifs" +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +-fi]) +-NM="$lt_cv_path_NM" +-])# AC_PROG_NM + ++ # 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" + +-# 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 ++ _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 ++ ;; + ++ 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 ++ ;; + +-# 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 LIBLTDL +-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. 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 ++ chorus*) ++ case $cc_basename in ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; + ++ 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 + +-# 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 LIBLTDL +-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. 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 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. +-# 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 ++ 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 + ++ 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 ++ ;; + +-# AC_LIBTOOL_CXX +-# -------------- +-# enable support for C++ libraries +-AC_DEFUN([AC_LIBTOOL_CXX], +-[AC_REQUIRE([_LT_AC_LANG_CXX]) +-])# AC_LIBTOOL_CXX ++ 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. + ++ 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)=: + +-# _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 ++ 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 + +-# _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 ++ 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_LIBTOOL_F77 +-# -------------- +-# enable support for Fortran 77 libraries +-AC_DEFUN([AC_LIBTOOL_F77], +-[AC_REQUIRE([_LT_AC_LANG_F77]) +-])# AC_LIBTOOL_F77 ++ # 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 + ++ # 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' + +-# _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,$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' + +-# AC_LIBTOOL_GCJ +-# -------------- +-# enable support for GCJ libraries +-AC_DEFUN([AC_LIBTOOL_GCJ], +-[AC_REQUIRE([_LT_AC_LANG_GCJ]) +-])# AC_LIBTOOL_GCJ ++ _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)=: + +-# _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 ++ # 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 | knetbsd*-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' + +-# 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 ++ _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_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) ++ ;; ++ 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' + +-# 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. ++ # ++ # 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' + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(){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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +-_LT_AC_SYS_COMPILER ++ 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 + +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE ++ # 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' + +-# +-# Check for any special shared library compilation flags. +-# +-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= +-if test "$GCC" = no; then +- case $host_os in +- sco3.2v5*) +- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' ++ _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 ++ # 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)=: ++ ++ # 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' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $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 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac + ;; +- esac +-fi +-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then +- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) +- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then : +- else +- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) +- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no +- fi +-fi ++ 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(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 + +-# +-# Check to make sure the static flag actually works. +-# +-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), +- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), +- [], +- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ++ output_verbose_link_cmd='echo' + ++ # 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' + +-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($1) ++ # 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' + +-# Report which librarie types wil 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. ++ 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_MSG_CHECKING([whether to build shared libraries]) +-test "$can_build_shared" = "no" && enable_shared=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 -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ fi + +-# 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 +- ;; ++ _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' + +-aix4* | aix5*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi ++ 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' ++ ++ 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([$enable_shared]) ++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +-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]) ++_LT_AC_TAGVAR(GCC, $1)="$GXX" ++_LT_AC_TAGVAR(LD, $1)="$LD" ++ ++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_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]) ++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 ++ ++# 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= ++AC_LIBTOOL_CONFIG($1) + +- # 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 ++AC_LANG_POP ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_F77_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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +-else +- GXX=no +- with_gnu_ld=no +- wlarc= +-fi ++# 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 + +-# 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 ++# Source file extension for Java test sources. ++ac_ext=java + +- # 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 ++# Object file extension for compiled Java test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="class foo {}\n" + +- # 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. ++# Code to be used in simple link tests ++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' + +- _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 ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER + +- 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 ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +- # 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" ++# 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(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${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 $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_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' +- # -bexpall does not export symbols beginning with underscore (_) +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; +- chorus*) +- case $cc_basename in +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; ++# GCJ did not exist at the time GCC didn't implicitly link libc in. ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + +- 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 ++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) + +- 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}--image-base=0x10000000 ${wl}--out-implib,$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}--image-base=0x10000000 ${wl}--out-implib,$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 ++AC_LIBTOOL_CONFIG($1) + +- 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 ld's +- 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 ld's +- _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 +- ;; ++AC_LANG_RESTORE ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_GCJ_CONFIG + +- 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. + +- 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 +- case "$host_cpu" in +- hppa*64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- ;; +- *) +- _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' +- ;; +- esac +- fi +- case "$host_cpu" in +- hppa*64*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- ia64*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- *) +- _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_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 + +- 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*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' +- ;; +- *) +- _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 +- ia64*|hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' +- ;; +- *) +- _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 +- ;; +- 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' ++# Source file extension for RC test sources. ++ac_ext=rc + +- # 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 ++# Object file extension for compiled RC test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +- # 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' ++# Code to be used in simple compile tests ++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++# Code to be used in simple link tests ++lt_simple_link_test_code="$lt_simple_compile_test_code" + +- # 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' ++# 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(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' ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# 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 + +- # 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 +- ;; ++AC_LIBTOOL_CONFIG($1) ++ ++AC_LANG_RESTORE ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_RC_CONFIG ++ ++ ++# 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"/'` + ;; +- 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 ++ esac + +- # 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' ++ifelse([$1], [], ++ [cfgfile="${ofile}T" ++ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 ++ $rm -f "$cfgfile" ++ AC_MSG_NOTICE([creating $ofile])], ++ [cfgfile="$ofile"]) + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ cat <<__EOF__ >> "$cfgfile" ++ifelse([$1], [], ++[#! $SHELL + +- # 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' ++# `$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. + +- ;; +- 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' ++# A sed program that does not truncate output. ++SED=$lt_SED + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# Sed that helps us avoid accidentally triggering echo(1) options like -n. ++Xsed="$SED -e 1s/^X//" + +- # 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' ++# 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 + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# The names of the tagged configurations supported by this script. ++available_tags= + +- # 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"' ++# ### BEGIN LIBTOOL CONFIG], ++[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) + +- 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 ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +- # 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' ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared + +- # 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' ++# Whether or not to build static libraries. ++build_old_libs=$enable_static + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) + +- # 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' ++# 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) + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install + +- # 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"' ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os + +- 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 +- ;; +- sco*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case $cc_basename in +- CC*) +- # 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 +- ;; +- 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(no_undefined_flag, $1)=' -zdefs' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -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} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os + +- _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 ++# An echo program that does not interpret backslashes. ++echo=$lt_echo + +- # 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 -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS + +- # 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' ++# A C compiler. ++LTCC=$lt_LTCC + +- # 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' ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS + +- # 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' ++# A language-specific compiler. ++CC=$lt_[]_LT_AC_TAGVAR(compiler, $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 -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- fi ++# Is the compiler the GNU C compiler? ++with_gcc=$_LT_AC_TAGVAR(GCC, $1) + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' +- fi +- ;; +- esac +- ;; +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- ;; +- 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 ++# An ERE matcher. ++EGREP=$lt_EGREP + +-_LT_AC_TAGVAR(GCC, $1)="$GXX" +-_LT_AC_TAGVAR(LD, $1)="$LD" ++# The linker used to build libraries. ++LD=$lt_[]_LT_AC_TAGVAR(LD, $1) + +-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_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF($1) ++# Whether we need hard or soft links. ++LN_S=$lt_LN_S + +-AC_LIBTOOL_CONFIG($1) ++# A BSD-compatible nm program. ++NM=$lt_NM + +-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 symbol stripping program ++STRIP=$lt_STRIP + +-# 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 <> "$cfgfile" +-ifelse([$1], [], +-[#! $SHELL ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $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. +- +-# A sed program that does not truncate output. +-SED=$lt_SED ++# Compile-time system search path for libraries ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +-# Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="$SED -e 1s/^X//" ++# Run-time system search path for libraries ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +-# 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 ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" + +-# The names of the tagged configurations supported by this script. +-available_tags= ++# Set to yes if exported symbols are required. ++always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) + +-# ### BEGIN LIBTOOL CONFIG], +-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) + +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds + +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) + +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared ++# Symbols that must always be exported. ++include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) + +-# Whether or not to build static libraries. +-build_old_libs=$enable_static ++ifelse([$1],[], ++[# ### END LIBTOOL CONFIG], ++[# ### END LIBTOOL TAG CONFIG: $tagname]) + +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) ++__EOF__ + +-# 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) ++ifelse([$1],[], [ ++ case $host_os in ++ aix3*) ++ cat <<\EOF >> "$cfgfile" + +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install ++# 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 ++EOF ++ ;; ++ esac + +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) + +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os ++ mv -f "$cfgfile" "$ofile" || \ ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++]) ++else ++ # If there is no Makefile yet, we rely on a make rule to execute ++ # `config.status --recheck' to rerun these tests and create the ++ # libtool script then. ++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++ if test -f "$ltmain_in"; then ++ test -f Makefile && make "$ltmain" ++ fi ++fi ++])# AC_LIBTOOL_CONFIG + +-# An echo program that does not interpret backslashes. +-echo=$lt_echo + +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS ++# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) ++# ------------------------------------------- ++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], ++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl + +-# A C compiler. +-LTCC=$lt_LTCC ++_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +-# A language-specific compiler. +-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) ++if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + +-# Is the compiler the GNU C compiler? +-with_gcc=$_LT_AC_TAGVAR(GCC, $1) ++ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], ++ lt_cv_prog_compiler_rtti_exceptions, ++ [-fno-rtti -fno-exceptions], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) ++fi ++])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI + +-# An ERE matcher. +-EGREP=$lt_EGREP + +-# The linker used to build libraries. +-LD=$lt_[]_LT_AC_TAGVAR(LD, $1) ++# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++# --------------------------------- ++AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], ++[AC_REQUIRE([AC_CANONICAL_HOST]) ++AC_REQUIRE([AC_PROG_NM]) ++AC_REQUIRE([AC_OBJEXT]) ++# Check for command to grab the raw symbol name followed by C symbol from nm. ++AC_MSG_CHECKING([command to parse $NM output from $compiler object]) ++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], ++[ ++# These are sane defaults that work on at least a few old systems. ++# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S ++# Character class describing NM global symbol codes. ++symcode='[[BCDEGRST]]' + +-# A BSD-compatible nm program. +-NM=$lt_NM ++# Regexp to match symbols that can be accessed directly from C. ++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +-# A symbol stripping program +-STRIP=$lt_STRIP ++# Transform an extracted symbol line into a proper C declaration ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD ++# Transform an extracted symbol line into symbol name and symbol address ++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'" + +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" ++# Define system-specific variables. ++case $host_os in ++aix*) ++ symcode='[[BCDT]]' ++ ;; ++cygwin* | mingw* | pw32*) ++ symcode='[[ABCDGISTW]]' ++ ;; ++hpux*) # Its linker distinguishes data from code symbols ++ if test "$host_cpu" = ia64; then ++ symcode='[[ABCDEGRST]]' ++ fi ++ 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*) ++ 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'" ++ 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'" ++ fi ++ ;; ++irix* | nonstopux*) ++ symcode='[[BCDEGRST]]' ++ ;; ++osf*) ++ symcode='[[BCDEGQRST]]' ++ ;; ++solaris*) ++ symcode='[[BDRT]]' ++ ;; ++sco3.2v5*) ++ symcode='[[DT]]' ++ ;; ++sysv4.2uw2*) ++ symcode='[[DT]]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[[ABDT]]' ++ ;; ++sysv4) ++ symcode='[[DFNSTU]]' ++ ;; ++esac + +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" ++# Handle CRLF in mingw tool chain ++opt_cr= ++case $build_os in ++mingw*) ++ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; ++esac + +-# Used on cygwin: assembler. +-AS="$AS" ++# If we're using GNU nm, then use its standard symbol codes. ++case `$NM -V 2>&1` in ++*GNU* | *'with BFD'*) ++ symcode='[[ABCDGIRSTW]]' ;; ++esac + +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir ++# Try without a prefix undercore, then with it. ++for ac_symprfx in "" "_"; do + +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" + +-# How to pass a linker flag through the compiler. +-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++ # Write the raw and C identifiers. ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + +-# Object file suffix (normally "o"). +-objext="$ac_objext" ++ # Check to see that the pipe works correctly. ++ pipe_works=no + +-# Old archive suffix (normally "a"). +-libext="$libext" ++ rm -f conftest* ++ cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then ++ # Try sorting and uniquifying the output. ++ if sort "$nlist" | uniq > "$nlist"T; then ++ mv -f "$nlist"T "$nlist" ++ else ++ rm -f "$nlist"T ++ fi + +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var ++ # Make sure that we snagged all the symbols we need. ++ if grep ' nm_test_var$' "$nlist" >/dev/null; then ++ if grep ' nm_test_func$' "$nlist" >/dev/null; then ++ cat < conftest.$ac_ext ++#ifdef __cplusplus ++extern "C" { ++#endif + +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var ++EOF ++ # Now generate the symbol file. ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ cat <> conftest.$ac_ext ++#if defined (__STDC__) && __STDC__ ++# define lt_ptr_t void * ++#else ++# define lt_ptr_t char * ++# define const ++#endif + +-# How to hardcode a shared library path into an executable. +-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) ++/* The mapping between symbol names and symbols. */ ++const struct { ++ const char *name; ++ lt_ptr_t address; ++} ++lt_preloaded_symbols[[]] = ++{ ++EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext ++ cat <<\EOF >> conftest.$ac_ext ++ {0, (lt_ptr_t) 0} ++}; + +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs ++#ifdef __cplusplus ++} ++#endif ++EOF ++ # Now try linking the two files. ++ mv conftest.$ac_objext conftstm.$ac_objext ++ lt_save_LIBS="$LIBS" ++ lt_save_CFLAGS="$CFLAGS" ++ LIBS="conftstm.$ac_objext" ++ CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then ++ pipe_works=yes ++ fi ++ LIBS="$lt_save_LIBS" ++ CFLAGS="$lt_save_CFLAGS" ++ else ++ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD ++ cat conftest.$ac_ext >&5 ++ fi ++ rm -f conftest* conftst* + +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) ++ # Do not use the global_symbol_pipe unless it works. ++ if test "$pipe_works" = yes; then ++ break ++ else ++ lt_cv_sys_global_symbol_pipe= ++ fi ++done ++]) ++if test -z "$lt_cv_sys_global_symbol_pipe"; then ++ lt_cv_sys_global_symbol_to_cdecl= ++fi ++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++ AC_MSG_RESULT(failed) ++else ++ AC_MSG_RESULT(ok) ++fi ++]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE + +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) + +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) ++# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) ++# --------------------------------------- ++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], ++[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= ++_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= + +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) ++AC_MSG_CHECKING([for $compiler option to produce PIC]) ++ ifelse([$1],[CXX],[ ++ # C++ specific cases for pic, static, wl, etc. ++ if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) ++ 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* | os2* | pw32*) ++ # 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' ++ ;; ++ *djgpp*) ++ # DJGPP does not support shared libraries at all ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ ;; ++ interix3*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ 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*) ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ else ++ case $host_os in ++ aix4* | aix5*) ++ # 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' ++ else ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ chorus*) ++ case $cc_basename in ++ cxch68*) ++ # Green Hills C++ Compiler ++ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++ ;; ++ esac ++ ;; ++ 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 ++ ;; ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ freebsd* | kfreebsd*-gnu | dragonfly*) ++ # FreeBSD uses GNU C++ ++ ;; ++ hpux9* | hpux10* | hpux11*) ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ if test "$host_cpu" != ia64; then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ fi ++ ;; ++ aCC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; ++ irix5* | irix6* | nonstopux*) ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ # CC pic flag -KPIC is the default. ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ linux*) ++ case $cc_basename in ++ KCC*) ++ # KAI C++ Compiler ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ icpc* | ecpc*) ++ # Intel C++ ++ _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*) ++ # Portland Group C++ compiler. ++ _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' ++ ;; ++ cxx*) ++ # Compaq C++ ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ lynxos*) ++ ;; ++ m88k*) ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) ++ ;; ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; ++ cxx*) ++ # Digital/Compaq C++ ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ psos*) ++ ;; ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ lcc*) ++ # Lucid ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ _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' ++ ;; ++ 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' ++ ++ 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*) ++ 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' ++ ;; ++ kfreebsd*-gnu) ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ ;; ++ linux*) ++ _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 + +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) ++ _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 to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) ++ # 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 + +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" ++ # 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 + +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) ++*** 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. + +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++EOF ++ fi ++ ;; + +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ 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 + +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" ++ # 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 ++ ;; + +-# Set to yes if exported symbols are required. +-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) ++ 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 ++ ;; + +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) ++ 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' + +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ 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 ++ ;; + +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) ++ 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' ++ ;; + +-# Symbols that must always be exported. +-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) ++ 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' + +-ifelse([$1],[], +-[# ### END LIBTOOL CONFIG], +-[# ### END LIBTOOL TAG CONFIG: $tagname]) ++ 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 ++ ;; + +-__EOF__ ++ netbsd* | netbsdelf*-gnu | knetbsd*-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 ++ ;; + +-ifelse([$1],[], [ +- case $host_os in +- aix3*) +- cat <<\EOF >> "$cfgfile" ++ 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. + +-# 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 + EOF +- ;; +- esac ++ 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 ++ ;; + +- # We use sed instead of cat because bash on DJGPP gets confused if +- # if finds mixed CR/LF and LF-only lines. Since sed operates in +- # text mode, it properly converts lines to CR/LF. This bash problem +- # is reportedly fixed, but why not run on old versions too? +- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) ++ 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 + +- mv -f "$cfgfile" "$ofile" || \ +- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") +- chmod +x "$ofile" +-]) +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi +-])# AC_LIBTOOL_CONFIG ++*** 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 ++ ;; + +-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) +-# ------------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++ *) ++ 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 + +-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++ 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 ++ ;; + +-if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++ 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_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], +- lt_cv_prog_compiler_rtti_exceptions, +- [-fno-rtti -fno-exceptions], [], +- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +-fi +-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI ++ # 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 + +-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-# --------------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], +-[AC_REQUIRE([AC_CANONICAL_HOST]) +-AC_REQUIRE([AC_PROG_NM]) +-AC_REQUIRE([AC_OBJEXT]) +-# Check for command to grab the raw symbol name followed by C symbol from nm. +-AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +-[ +-# These are sane defaults that work on at least a few old systems. +-# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++ # 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. + +-# Character class describing NM global symbol codes. +-symcode='[[BCDEGRST]]' ++ _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 + +-# Regexp to match symbols that can be accessed directly from C. +-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' ++ 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 + +-# Transform an extracted symbol line into a proper C declaration +-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" ++ # 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 ++ ;; + +-# Transform an extracted symbol line into symbol name and symbol address +-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'" ++ 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 ++ ;; + +-# Define system-specific variables. +-case $host_os in +-aix*) +- symcode='[[BCDT]]' +- ;; +-cygwin* | mingw* | pw32*) +- symcode='[[ABCDGISTW]]' +- ;; +-hpux*) # Its linker distinguishes data from code symbols +- if test "$host_cpu" = ia64; then +- symcode='[[ABCDEGRST]]' +- fi +- 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*) +- 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'" +- 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'" +- fi +- ;; +-irix* | nonstopux*) +- symcode='[[BCDEGRST]]' +- ;; +-osf*) +- symcode='[[BCDEGQRST]]' +- ;; +-solaris* | sysv5*) +- symcode='[[BDRT]]' +- ;; +-sysv4) +- symcode='[[DFNSTU]]' +- ;; +-esac ++ bsdi[[45]]*) ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++ ;; + +-# Handle CRLF in mingw tool chain +-opt_cr= +-case $build_os in +-mingw*) +- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp +- ;; +-esac ++ 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 ++ ;; + +-# If we're using GNU nm, then use its standard symbol codes. +-case `$NM -V 2>&1` in +-*GNU* | *'with BFD'*) +- symcode='[[ABCDGIRSTW]]' ;; +-esac ++ 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 ++ ;; + +-# Try without a prefix undercore, then with it. +-for ac_symprfx in "" "_"; do ++ 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 ++ ;; + +- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. +- symxfrm="\\1 $ac_symprfx\\2 \\2" ++ freebsd1*) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; + +- # Write the raw and C identifiers. +- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ # 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 ++ ;; + +- # Check to see that the pipe works correctly. +- pipe_works=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 ++ ;; + +- rm -f conftest* +- cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then +- # Try sorting and uniquifying the output. +- if sort "$nlist" | uniq > "$nlist"T; then +- mv -f "$nlist"T "$nlist" ++ 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 +- rm -f "$nlist"T ++ _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 + +- # Make sure that we snagged all the symbols we need. +- if grep ' nm_test_var$' "$nlist" >/dev/null; then +- if grep ' nm_test_func$' "$nlist" >/dev/null; then +- cat < conftest.$ac_ext +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-EOF +- # Now generate the symbol file. +- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' +- +- cat <> conftest.$ac_ext +-#if defined (__STDC__) && __STDC__ +-# define lt_ptr_t void * +-#else +-# define lt_ptr_t char * +-# define const +-#endif +- +-/* The mapping between symbol names and symbols. */ +-const struct { +- const char *name; +- lt_ptr_t address; +-} +-lt_preloaded_symbols[[]] = +-{ +-EOF +- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext +- cat <<\EOF >> conftest.$ac_ext +- {0, (lt_ptr_t) 0} +-}; ++ # 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' ++ ;; + +-#ifdef __cplusplus +-} +-#endif +-EOF +- # Now try linking the two files. +- mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" +- LIBS="conftstm.$ac_objext" +- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then +- pipe_works=yes +- fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" +- else +- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD +- fi ++ 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 +- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi +- else +- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD +- cat conftest.$ac_ext >&5 +- fi +- rm -f conftest* conftst* ++ 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)=: + +- # Do not use the global_symbol_pipe unless it works. +- if test "$pipe_works" = yes; then +- break +- else +- lt_cv_sys_global_symbol_pipe= +- fi +-done +-]) +-if test -z "$lt_cv_sys_global_symbol_pipe"; then +- lt_cv_sys_global_symbol_to_cdecl= +-fi +-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- AC_MSG_RESULT(failed) +-else +- AC_MSG_RESULT(ok) +-fi +-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++ _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 ++ ;; + +-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) +-# --------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], +-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= +-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= ++ 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)=: + +-AC_MSG_CHECKING([for $compiler option to produce PIC]) +- ifelse([$1],[CXX],[ +- # C++ specific cases for pic, static, wl, etc. +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ 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' + +- 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' ++ # 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 + ;; +- 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* | os2* | pw32*) +- # 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' +- ;; +- *djgpp*) +- # DJGPP does not support shared libraries at all +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ ++ 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 + ;; +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ ++ netbsd* | netbsdelf*-gnu | knetbsd*-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(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 + ;; +- 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*) +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac ++ ++ 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 + ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ++ 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 + ;; +- esac +- else +- case $host_os in +- aix4* | aix5*) +- # 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' +- else +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; +- chorus*) +- case $cc_basename in +- cxch68*) +- # Green Hills C++ Compiler +- # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" +- ;; +- esac +- ;; +- 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 +- ;; +- dgux*) +- case $cc_basename in +- ec++*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- ;; +- ghcx*) +- # Green Hills C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- ;; +- *) +- ;; +- esac +- ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) +- # FreeBSD uses GNU C++ +- ;; +- hpux9* | hpux10* | hpux11*) +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" +- if test "$host_cpu" != ia64; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +- fi +- ;; +- aCC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" +- case "$host_cpu" in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +- ;; +- esac +- ;; +- *) +- ;; +- esac +- ;; +- irix5* | irix6* | nonstopux*) +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- # CC pic flag -KPIC is the default. +- ;; +- *) +- ;; +- esac +- ;; +- linux*) +- case $cc_basename in +- KCC*) +- # KAI C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- icpc* | ecpc*) +- # Intel C++ +- _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*) +- # Portland Group C++ compiler. +- _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)='-static' +- ;; +- cxx*) +- # Compaq C++ +- # Make sure the PIC flag is empty. It appears that all Alpha +- # Linux and Compaq Tru64 Unix objects are PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- *) +- ;; +- esac +- ;; +- lynxos*) +- ;; +- m88k*) +- ;; +- mvs*) +- case $cc_basename in +- cxx*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' +- ;; +- *) +- ;; +- esac +- ;; +- netbsd*) +- ;; +- osf3* | osf4* | osf5*) +- case $cc_basename in +- KCC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- ;; +- cxx*) +- # Digital/Compaq C++ +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # Make sure the PIC flag is empty. It appears that all Alpha +- # Linux and Compaq Tru64 Unix objects are PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- *) +- ;; +- esac +- ;; +- psos*) +- ;; +- sco*) +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- *) +- ;; +- esac +- ;; +- solaris*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.2, 5.x and Centerline C++ +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' +- ;; +- gcx*) +- # Green Hills C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +- ;; +- *) +- ;; +- esac +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- lcc*) +- # Lucid +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- ;; +- *) +- ;; +- esac +- ;; +- tandem*) +- case $cc_basename in +- NCC*) +- # NonStop-UX NCC 3.20 +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- ;; +- *) +- ;; +- esac +- ;; +- unixware*) +- ;; +- vxworks*) +- ;; ++ ++ 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' ++ ;; ++ ++ 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)=: ++ ;; ++ ++ 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' ++ ++ # 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(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_can_build_shared, $1)=no ++ # 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*) ++ 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) ++ 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(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 ++ ;; ++ ++ 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 ++ ;; ++ ++ 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(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(ld_shlibs, $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' ++]) ++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])]) ++ + +- 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' ++# 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]) ++]) + +- 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' +- ;; ++# 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. ++# ++# 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. ++# ++# 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. + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; ++# 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 ++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 + +- 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' +- ;; ++# 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. ++# ++# ++# 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]) + +- 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' +- ;; + +- 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 +- ;; ++# _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 + +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic +- fi +- ;; ++# _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 + +- 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 +- ;; ++# 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 ++ ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) ++ ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ ++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 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 + +- 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' +- ;; ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: + +- 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' +- ;; ++$$1_PKG_ERRORS + +- 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' +- ;; ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + +- newsos6) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++_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. + +- 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*) +- # 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)='-static' +- ;; +- 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 +- ;; ++_PKG_TEXT + +- 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' +- ;; ++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 + +- sco3.2v5*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' +- ;; ++# -*- Autoconf -*- ++# Copyright (C) 2002, 2003 Free Software Foundation, Inc. ++# Generated from amversion.in; do not edit by hand. + +- 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 +- ;; ++# 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, or (at your option) ++# any later version. + +- 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' +- ;; ++# 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. + +- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- _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' +- ;; ++# 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 + +- 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 +- ;; ++# 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.8"]) + +- unicos*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $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.8.5])]) + +- uts4*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# AM_AUX_DIR_EXPAND + +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; +- esac +- fi +-]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) ++# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +-# +-# 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 +-]) ++# 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, 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. + +-# 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' +- ;; +- *) +- _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 +- ;; +- openbsd*) +- with_gnu_ld=no +- ;; +- esac ++# 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. ++ ++# 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. + +- _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 ++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` ++]) + +-*** 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. ++# AM_CONDITIONAL -*- Autoconf -*- + +-EOF +- fi +- ;; ++# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. + +- 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 ++# 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, or (at your option) ++# any later version. + +- # 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 +- ;; ++# 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. + +- 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 +- ;; ++# 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. + +- 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' ++# serial 6 + +- 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}--image-base=0x10000000 ${wl}--out-implib,$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}--image-base=0x10000000 ${wl}--out-implib,$lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# 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])]) + +- 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* ) # 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' ++# serial 7 -*- Autoconf -*- + +- 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 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 ++# 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, 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. ++ ++ ++# 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... ++ ++ ++ ++# _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=]) ++ ++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 +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ 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 + +- 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 +- ;; ++ 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]) ++]) + +- solaris* | sysv5*) +- 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. ++# 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 ++]) + +-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 +- ;; + +- 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_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 $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 ++# Generate code to set up dependency tracking. -*- 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 "$link_static_flag"; then +- # Neither direct hardcoding nor static linking is supported with a +- # broken collect2. +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- fi +- ;; ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + +- 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 ++# 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, or (at your option) ++# any later version. + +- # 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 ++# 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. + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi ++# 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. + +- # 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 2 + +- _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_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 ++ grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue ++ # Extract the definition of DEP_FILES from the Makefile without ++ # running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" ++ # 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 ' ++ /^DEP_FILES = .*\\\\$/ { ++ s/^DEP_FILES = // ++ :loop ++ s/\\\\$// ++ p ++ n ++ /\\\\$/ b loop ++ p ++ } ++ /^DEP_FILES = / s/^DEP_FILES = //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 + +- 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 $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${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 $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_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' +- # -bexpall does not export symbols beginning with underscore (_) +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; ++# 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"]) ++]) + +- 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 +- ;; ++# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- + +- bsdi[[45]]*) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic +- ;; ++# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. + +- 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 +- ;; ++# 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, or (at your option) ++# any later version. + +- 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 ld's +- _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 ld's +- _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 +- ;; ++# 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. + +- 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 +- ;; ++# 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. + +- freebsd1*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++# serial 7 + +- # 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 +- ;; ++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +- # 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 +- ;; ++# Do all the work for Automake. -*- Autoconf -*- + +- # 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 +- ;; ++# 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. + +- 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 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. + +- # 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' +- ;; ++# 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, or (at your option) ++# any later version. + +- hpux10* | hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -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*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +- ;; +- esac +- fi +- if test "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++# 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. ++ ++# serial 11 ++ ++# 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 ++ ++# 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 ++ ++_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_MISSING_PROG(AMTAR, tar) ++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([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 ++]) ++]) ++ ++ ++# 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. ++ ++# 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]) + +- # 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(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' ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. + +- # 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 +- ;; ++# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +- 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 +- ;; ++# 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, or (at your option) ++# any later version. + +- 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 +- ;; ++# 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. + +- 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 +- ;; ++# 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. + +- 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 +- ;; ++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)]) + +- 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' +- ;; ++# -*- Autoconf -*- ++# Copyright (C) 2003 Free Software Foundation, Inc. + +- 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)=: +- ;; ++# 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, or (at your option) ++# any later version. + +- 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' ++# 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. + +- # 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)=: +- ;; ++# 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. + +- sco3.2v5*) +- _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)='${wl}-Bexport' +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ;; ++# serial 1 + +- 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 +- ;; ++# 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])]) + +- 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 +- ;; ++# Add --enable-maintainer-mode option to configure. ++# From Jim Meyering + +- 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 +- ;; ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004 ++# Free Software Foundation, Inc. + +- 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' +- ;; ++# 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, or (at your option) ++# any later version. + +- 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 +- ;; ++# 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. + +- sysv4.2uw2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- hardcode_runpath_var=yes +- runpath_var=LD_RUN_PATH +- ;; ++# 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. + +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- runpath_var='LD_RUN_PATH' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# serial 3 + +- sysv5*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' +- # $CC -shared without GNU ld will not create a library from C++ +- # object files and a static libstdc++, better avoid it by now +- _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' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var='LD_RUN_PATH' +- ;; ++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 ++] ++) + +- 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 +- ;; ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +- *) +- _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 to see how 'make' treats includes. -*- Autoconf -*- + +-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 ++# Copyright (C) 2001, 2002, 2003 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 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, or (at your option) ++# any later version. + +- 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 ++# 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 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) +- 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 ++# 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. + ++# serial 2 + +-# _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 ++# 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 ++]) + ++# -*- Autoconf -*- + +-# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +-# --------------------------------- +-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) + ++# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + +-# 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 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, or (at your option) ++# any later version. + +-# This is just to silence aclocal about the macro not being used +-ifelse([AC_DISABLE_FAST_INSTALL]) ++# 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. + +-AC_DEFUN([LT_AC_PROG_GCJ], +-[AC_CHECK_TOOL(GCJ, gcj, no) +- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" +- AC_SUBST(GCJFLAGS) +-]) ++# 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. + +-AC_DEFUN([LT_AC_PROG_RC], +-[AC_CHECK_TOOL(RC, windres, no) +-]) ++# serial 3 + +-# 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_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) ++ ++ ++# 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 . +-# ++# AM_PROG_MKDIR_P ++# --------------- ++# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. ++ ++# Copyright (C) 2003, 2004 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. ++# the Free Software Foundation; either version 2, 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. ++ ++# 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). + # +-# 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. ++# 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 ++ # Keeping the `.' argument allows $(mkdir_p) to be used without ++ # argument. Indeed, we sometimes output rules like ++ # $(mkdir_p) $(somedir) ++ # where $(somedir) is conditionally defined. ++ # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more ++ # expensive solution, as it forces Make to start a sub-shell.) ++ 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 ++AC_SUBST([mkdir_p])]) ++ ++# Helper functions for option handling. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003 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, 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. +-# +-# 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. ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. + +-# 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 +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=m4_ifval([$1], [$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 ++# serial 2 + +-# 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. +-# +-# +-# 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]) ++# _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 +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +-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)])]) ++ ++# _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])]) + +-# 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 + # ++# Check to make sure that the build environment is sane. + # +-# -------------------------------------------------------------- +-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 + +-pkg_failed=no +-AC_MSG_CHECKING([for $1]) ++# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. + +-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++# 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, or (at your option) ++# any later version. + +-if test $pkg_failed = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` +- # Put the nasty error message in config.log where it belongs +- echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD ++# 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. + +- ifelse([$4], , [AC_MSG_ERROR(dnl +-[Package requirements ($2) were not met. +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. ++# 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. + +-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details.])], +- [$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. ++# serial 3 ++ ++# 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 + +-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables +-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 + +-To get pkg-config, see .])], +- [$4]) ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : + 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 ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) ++fi ++AC_MSG_RESULT(yes)]) ++ ++# AM_PROG_INSTALL_STRIP ++ ++# Copyright (C) 2001, 2003 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, 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. ++ ++# 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])]) + + m4_include([m4/d-type.m4]) + m4_include([m4/gnome-doc-utils.m4]) +diff -Nur gnome-panel-2.14.1/applets/clock/Makefile.in gnome-panel-2.14.1.new/applets/clock/Makefile.in +--- gnome-panel-2.14.1/applets/clock/Makefile.in 2006-04-10 15:46:22.000000000 +0200 ++++ gnome-panel-2.14.1.new/applets/clock/Makefile.in 2006-05-07 23:41:15.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,6 +15,8 @@ + @SET_MAKE@ + + ++SOURCES = $(clock_applet_SOURCES) ++ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -35,7 +37,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + libexec_PROGRAMS = clock-applet$(EXEEXT) + subdir = applets/clock +@@ -50,8 +51,7 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(schemasdir)" \ +- "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)" ++am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)" + libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(libexec_PROGRAMS) + am__clock_applet_SOURCES_DIST = clock.c calendar-client.c \ +@@ -68,22 +68,19 @@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/calendar-client.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/calendar-sources.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/clock.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(clock_applet_SOURCES) + DIST_SOURCES = $(am__clock_applet_SOURCES_DIST) +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + schemasDATA_INSTALL = $(INSTALL_DATA) + serverDATA_INSTALL = $(INSTALL_DATA) + uiDATA_INSTALL = $(INSTALL_DATA) +@@ -256,8 +253,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -404,21 +399,24 @@ + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -435,7 +433,7 @@ + test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)" + @list='$(schemas_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(schemasDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemasdir)/$$f'"; \ + $(schemasDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemasdir)/$$f"; \ + done +@@ -443,7 +441,7 @@ + uninstall-schemasDATA: + @$(NORMAL_UNINSTALL) + @list='$(schemas_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(schemasdir)/$$f'"; \ + rm -f "$(DESTDIR)$(schemasdir)/$$f"; \ + done +@@ -452,7 +450,7 @@ + test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ + $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ + done +@@ -460,7 +458,7 @@ + uninstall-serverDATA: + @$(NORMAL_UNINSTALL) + @list='$(server_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ + rm -f "$(DESTDIR)$(serverdir)/$$f"; \ + done +@@ -469,7 +467,7 @@ + test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)" + @list='$(ui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \ + $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \ + done +@@ -477,7 +475,7 @@ + uninstall-uiDATA: + @$(NORMAL_UNINSTALL) + @list='$(ui_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \ + rm -f "$(DESTDIR)$(uidir)/$$f"; \ + done +@@ -584,7 +582,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/applets/fish/Makefile.in gnome-panel-2.14.1.new/applets/fish/Makefile.in +--- gnome-panel-2.14.1/applets/fish/Makefile.in 2006-04-10 15:46:22.000000000 +0200 ++++ gnome-panel-2.14.1.new/applets/fish/Makefile.in 2006-05-07 23:41:15.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,6 +15,8 @@ + @SET_MAKE@ + + ++SOURCES = $(libfish_applet_2_la_SOURCES) ++ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -35,9 +37,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-libexec_PROGRAMS = fish-applet-2$(EXEEXT) + subdir = applets/fish + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -50,37 +50,29 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(libexecdir)" \ +- "$(DESTDIR)$(fishbitmapsdir)" "$(DESTDIR)$(gladedir)" \ +- "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(schemasdir)" \ +- "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)" +-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +-PROGRAMS = $(libexec_PROGRAMS) +-am_fish_applet_2_OBJECTS = fish.$(OBJEXT) +-fish_applet_2_OBJECTS = $(am_fish_applet_2_OBJECTS) ++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(fishbitmapsdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)" ++libLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = +-fish_applet_2_DEPENDENCIES = \ ++libfish_applet_2_la_DEPENDENCIES = \ + ../../libpanel-applet/libpanel-applet-2.la \ + $(am__DEPENDENCIES_1) ++am_libfish_applet_2_la_OBJECTS = fish.lo ++libfish_applet_2_la_OBJECTS = $(am_libfish_applet_2_la_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/fish.Plo + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(fish_applet_2_SOURCES) +-DIST_SOURCES = $(fish_applet_2_SOURCES) +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++SOURCES = $(libfish_applet_2_la_SOURCES) ++DIST_SOURCES = $(libfish_applet_2_la_SOURCES) + fishbitmapsDATA_INSTALL = $(INSTALL_DATA) + gladeDATA_INSTALL = $(INSTALL_DATA) + pixmapDATA_INSTALL = $(INSTALL_DATA) +@@ -257,8 +249,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -298,8 +288,9 @@ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(FISH_CFLAGS) + +-fish_applet_2_SOURCES = fish.c +-fish_applet_2_LDADD = \ ++lib_LTLIBRARIES = libfish-applet-2.la ++libfish_applet_2_la_SOURCES = fish.c ++libfish_applet_2_la_LIBADD = \ + ../../libpanel-applet/libpanel-applet-2.la \ + $(FISH_LIBS) + +@@ -365,37 +356,35 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-libexecPROGRAMS: $(libexec_PROGRAMS) ++install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)" +- @list='$(libexec_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- || test -f $$p1 \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \ ++ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ if test -f $$p; then \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +-uninstall-libexecPROGRAMS: ++uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(libexec_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(libexecdir)/$$f"; \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ done ++ ++clean-libLTLIBRARIES: ++ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ++ test "$$dir" != "$$p" || dir=.; \ ++ echo "rm -f \"$${dir}/so_locations\""; \ ++ rm -f "$${dir}/so_locations"; \ + done +- +-clean-libexecPROGRAMS: +- @list='$(libexec_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done +-fish-applet-2$(EXEEXT): $(fish_applet_2_OBJECTS) $(fish_applet_2_DEPENDENCIES) +- @rm -f fish-applet-2$(EXEEXT) +- $(LINK) $(fish_applet_2_LDFLAGS) $(fish_applet_2_OBJECTS) $(fish_applet_2_LDADD) $(LIBS) ++libfish-applet-2.la: $(libfish_applet_2_la_OBJECTS) $(libfish_applet_2_la_DEPENDENCIES) ++ $(LINK) -rpath $(libdir) $(libfish_applet_2_la_LDFLAGS) $(libfish_applet_2_la_OBJECTS) $(libfish_applet_2_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -403,27 +392,30 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fish.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fish.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -440,7 +432,7 @@ + test -z "$(fishbitmapsdir)" || $(mkdir_p) "$(DESTDIR)$(fishbitmapsdir)" + @list='$(fishbitmaps_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(fishbitmapsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(fishbitmapsdir)/$$f'"; \ + $(fishbitmapsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(fishbitmapsdir)/$$f"; \ + done +@@ -448,7 +440,7 @@ + uninstall-fishbitmapsDATA: + @$(NORMAL_UNINSTALL) + @list='$(fishbitmaps_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(fishbitmapsdir)/$$f'"; \ + rm -f "$(DESTDIR)$(fishbitmapsdir)/$$f"; \ + done +@@ -457,7 +449,7 @@ + test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)" + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ + $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ + done +@@ -465,7 +457,7 @@ + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ + rm -f "$(DESTDIR)$(gladedir)/$$f"; \ + done +@@ -474,7 +466,7 @@ + test -z "$(pixmapdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapdir)" + @list='$(pixmap_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(pixmapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pixmapdir)/$$f'"; \ + $(pixmapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pixmapdir)/$$f"; \ + done +@@ -482,7 +474,7 @@ + uninstall-pixmapDATA: + @$(NORMAL_UNINSTALL) + @list='$(pixmap_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(pixmapdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pixmapdir)/$$f"; \ + done +@@ -491,7 +483,7 @@ + test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)" + @list='$(schemas_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(schemasDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemasdir)/$$f'"; \ + $(schemasDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemasdir)/$$f"; \ + done +@@ -499,7 +491,7 @@ + uninstall-schemasDATA: + @$(NORMAL_UNINSTALL) + @list='$(schemas_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(schemasdir)/$$f'"; \ + rm -f "$(DESTDIR)$(schemasdir)/$$f"; \ + done +@@ -508,7 +500,7 @@ + test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ + $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ + done +@@ -516,7 +508,7 @@ + uninstall-serverDATA: + @$(NORMAL_UNINSTALL) + @list='$(server_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ + rm -f "$(DESTDIR)$(serverdir)/$$f"; \ + done +@@ -525,7 +517,7 @@ + test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)" + @list='$(ui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \ + $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \ + done +@@ -533,7 +525,7 @@ + uninstall-uiDATA: + @$(NORMAL_UNINSTALL) + @list='$(ui_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \ + rm -f "$(DESTDIR)$(uidir)/$$f"; \ + done +@@ -615,9 +607,9 @@ + done + check-am: all-am + check: check-am +-all-am: Makefile $(PROGRAMS) $(DATA) ++all-am: Makefile $(LTLIBRARIES) $(DATA) + installdirs: +- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(fishbitmapsdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \ ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(fishbitmapsdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done + install: install-am +@@ -640,14 +632,14 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + clean: clean-am + +-clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \ ++clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am + + distclean: distclean-am +@@ -670,7 +662,7 @@ + install-gladeDATA install-pixmapDATA install-schemasDATA \ + install-serverDATA install-uiDATA + +-install-exec-am: install-libexecPROGRAMS ++install-exec-am: install-libLTLIBRARIES + + install-info: install-info-am + +@@ -697,31 +689,31 @@ + ps-am: + + uninstall-am: uninstall-fishbitmapsDATA uninstall-gladeDATA \ +- uninstall-info-am uninstall-libexecPROGRAMS \ ++ uninstall-info-am uninstall-libLTLIBRARIES \ + uninstall-pixmapDATA uninstall-schemasDATA \ + uninstall-serverDATA uninstall-uiDATA + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libexecPROGRAMS clean-libtool ctags distclean \ ++ clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-exec install-exec-am \ + install-fishbitmapsDATA install-gladeDATA install-info \ +- install-info-am install-libexecPROGRAMS install-man \ ++ install-info-am install-libLTLIBRARIES install-man \ + install-pixmapDATA install-schemasDATA install-serverDATA \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-fishbitmapsDATA uninstall-gladeDATA \ +- uninstall-info-am uninstall-libexecPROGRAMS \ ++ uninstall-info-am uninstall-libLTLIBRARIES \ + uninstall-pixmapDATA uninstall-schemasDATA \ + uninstall-serverDATA uninstall-uiDATA + + + $(server_in_files): $(server_in_files).in +- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ ++ sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@ + + @INTLTOOL_SERVER_RULE@ + +diff -Nur gnome-panel-2.14.1/applets/Makefile.in gnome-panel-2.14.1.new/applets/Makefile.in +--- gnome-panel-2.14.1/applets/Makefile.in 2006-04-10 15:46:22.000000000 +0200 ++++ gnome-panel-2.14.1.new/applets/Makefile.in 2006-05-07 23:41:15.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -33,7 +33,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = applets + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +@@ -224,8 +223,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -313,13 +310,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -331,7 +322,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -339,13 +330,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -366,7 +351,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -465,17 +450,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="../$(top_distdir)" \ ++ distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ +@@ -504,7 +487,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/applets/notification_area/Makefile.in gnome-panel-2.14.1.new/applets/notification_area/Makefile.in +--- gnome-panel-2.14.1/applets/notification_area/Makefile.in 2006-04-10 15:46:22.000000000 +0200 ++++ gnome-panel-2.14.1.new/applets/notification_area/Makefile.in 2006-05-07 23:41:15.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,6 +15,8 @@ + @SET_MAKE@ + + ++SOURCES = $(libnotification_area_applet_la_SOURCES) ++ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -35,9 +37,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-libexec_PROGRAMS = notification-area-applet$(EXEEXT) + subdir = applets/notification_area + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -50,39 +50,35 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(serverdir)" \ +- "$(DESTDIR)$(uidir)" +-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +-PROGRAMS = $(libexec_PROGRAMS) +-am__objects_1 = eggtraymanager.$(OBJEXT) +-am_notification_area_applet_OBJECTS = fixedtip.$(OBJEXT) \ +- main.$(OBJEXT) obox.$(OBJEXT) $(am__objects_1) \ +- eggmarshalers.$(OBJEXT) +-notification_area_applet_OBJECTS = \ +- $(am_notification_area_applet_OBJECTS) ++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)" ++libLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = +-notification_area_applet_DEPENDENCIES = \ ++libnotification_area_applet_la_DEPENDENCIES = \ + ../../libpanel-applet/libpanel-applet-2.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++am__objects_1 = eggtraymanager.lo ++am_libnotification_area_applet_la_OBJECTS = fixedtip.lo main.lo \ ++ obox.lo $(am__objects_1) eggmarshalers.lo ++libnotification_area_applet_la_OBJECTS = \ ++ $(am_libnotification_area_applet_la_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/eggmarshalers.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eggtraymanager.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/fixedtip.Plo ./$(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/obox.Plo + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(notification_area_applet_SOURCES) +-DIST_SOURCES = $(notification_area_applet_SOURCES) +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++SOURCES = $(libnotification_area_applet_la_SOURCES) ++DIST_SOURCES = $(libnotification_area_applet_la_SOURCES) + serverDATA_INSTALL = $(INSTALL_DATA) + uiDATA_INSTALL = $(INSTALL_DATA) + DATA = $(server_DATA) $(ui_DATA) +@@ -254,8 +250,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -300,11 +294,12 @@ + -DDATADIR=\"$(datadir)\" \ + -DLIBDIR=\"$(libdir)\" + ++lib_LTLIBRARIES = libnotification-area-applet.la + EGGFILES = \ + eggtraymanager.h \ + eggtraymanager.c + +-notification_area_applet_SOURCES = \ ++libnotification_area_applet_la_SOURCES = \ + fixedtip.h \ + fixedtip.c \ + main.c \ +@@ -314,7 +309,7 @@ + eggmarshalers.h \ + eggmarshalers.c + +-notification_area_applet_LDADD = \ ++libnotification_area_applet_la_LIBADD = \ + ../../libpanel-applet/libpanel-applet-2.la \ + $(X_LIBS) \ + $(PANEL_LIBS) +@@ -370,37 +365,35 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-libexecPROGRAMS: $(libexec_PROGRAMS) ++install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)" +- @list='$(libexec_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- || test -f $$p1 \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \ ++ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ if test -f $$p; then \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +-uninstall-libexecPROGRAMS: ++uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(libexec_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(libexecdir)/$$f"; \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + +-clean-libexecPROGRAMS: +- @list='$(libexec_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ ++clean-libLTLIBRARIES: ++ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ++ test "$$dir" != "$$p" || dir=.; \ ++ echo "rm -f \"$${dir}/so_locations\""; \ ++ rm -f "$${dir}/so_locations"; \ + done +-notification-area-applet$(EXEEXT): $(notification_area_applet_OBJECTS) $(notification_area_applet_DEPENDENCIES) +- @rm -f notification-area-applet$(EXEEXT) +- $(LINK) $(notification_area_applet_LDFLAGS) $(notification_area_applet_OBJECTS) $(notification_area_applet_LDADD) $(LIBS) ++libnotification-area-applet.la: $(libnotification_area_applet_la_OBJECTS) $(libnotification_area_applet_la_DEPENDENCIES) ++ $(LINK) -rpath $(libdir) $(libnotification_area_applet_la_LDFLAGS) $(libnotification_area_applet_la_OBJECTS) $(libnotification_area_applet_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -408,31 +401,34 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggmarshalers.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggtraymanager.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixedtip.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obox.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggmarshalers.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggtraymanager.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixedtip.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obox.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -449,7 +445,7 @@ + test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ + $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ + done +@@ -457,7 +453,7 @@ + uninstall-serverDATA: + @$(NORMAL_UNINSTALL) + @list='$(server_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ + rm -f "$(DESTDIR)$(serverdir)/$$f"; \ + done +@@ -466,7 +462,7 @@ + test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)" + @list='$(ui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \ + $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \ + done +@@ -474,7 +470,7 @@ + uninstall-uiDATA: + @$(NORMAL_UNINSTALL) + @list='$(ui_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \ + rm -f "$(DESTDIR)$(uidir)/$$f"; \ + done +@@ -557,9 +553,9 @@ + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +-all-am: Makefile $(PROGRAMS) $(DATA) ++all-am: Makefile $(LTLIBRARIES) $(DATA) + installdirs: +- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \ ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done + install: $(BUILT_SOURCES) +@@ -583,7 +579,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -591,7 +587,7 @@ + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + clean: clean-am + +-clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \ ++clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am + + distclean: distclean-am +@@ -612,7 +608,7 @@ + + install-data-am: install-serverDATA install-uiDATA + +-install-exec-am: install-libexecPROGRAMS ++install-exec-am: install-libLTLIBRARIES + + install-info: install-info-am + +@@ -638,26 +634,26 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \ ++uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ + uninstall-serverDATA uninstall-uiDATA + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libexecPROGRAMS clean-libtool ctags distclean \ ++ clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am \ +- install-libexecPROGRAMS install-man install-serverDATA \ ++ install-libLTLIBRARIES install-man install-serverDATA \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-info-am uninstall-libexecPROGRAMS \ ++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \ + uninstall-serverDATA uninstall-uiDATA + + + GNOME_NotificationAreaApplet.server.in: $(srcdir)/GNOME_NotificationAreaApplet.server.in.in +- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ ++ sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@ + + @INTLTOOL_SERVER_RULE@ + +diff -Nur gnome-panel-2.14.1/applets/wncklet/Makefile.in gnome-panel-2.14.1.new/applets/wncklet/Makefile.in +--- gnome-panel-2.14.1/applets/wncklet/Makefile.in 2006-04-10 15:46:23.000000000 +0200 ++++ gnome-panel-2.14.1.new/applets/wncklet/Makefile.in 2006-05-07 23:41:16.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,6 +15,8 @@ + @SET_MAKE@ + + ++SOURCES = $(libwnck_applet_la_SOURCES) ++ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -35,9 +37,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-libexec_PROGRAMS = wnck-applet$(EXEEXT) + subdir = applets/wncklet + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -50,37 +50,34 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(gladedir)" \ +- "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" \ +- "$(DESTDIR)$(uidir)" +-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +-PROGRAMS = $(libexec_PROGRAMS) +-am_wnck_applet_OBJECTS = wncklet.$(OBJEXT) window-menu.$(OBJEXT) \ +- window-list.$(OBJEXT) workspace-switcher.$(OBJEXT) \ +- showdesktop.$(OBJEXT) +-wnck_applet_OBJECTS = $(am_wnck_applet_OBJECTS) ++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)" ++libLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = +-wnck_applet_DEPENDENCIES = ../../libpanel-applet/libpanel-applet-2.la \ ++libwnck_applet_la_DEPENDENCIES = \ ++ ../../libpanel-applet/libpanel-applet-2.la \ + $(am__DEPENDENCIES_1) ++am_libwnck_applet_la_OBJECTS = wncklet.lo window-menu.lo \ ++ window-list.lo workspace-switcher.lo showdesktop.lo ++libwnck_applet_la_OBJECTS = $(am_libwnck_applet_la_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/showdesktop.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/window-list.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/window-menu.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/wncklet.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/workspace-switcher.Plo + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(wnck_applet_SOURCES) +-DIST_SOURCES = $(wnck_applet_SOURCES) +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++SOURCES = $(libwnck_applet_la_SOURCES) ++DIST_SOURCES = $(libwnck_applet_la_SOURCES) + gladeDATA_INSTALL = $(INSTALL_DATA) + schemasDATA_INSTALL = $(INSTALL_DATA) + serverDATA_INSTALL = $(INSTALL_DATA) +@@ -254,8 +251,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -284,6 +279,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++lib_LTLIBRARIES = libwnck-applet.la + INCLUDES = \ + -I$(top_builddir) \ + -I$(top_builddir)/applets/wncklet \ +@@ -300,7 +296,7 @@ + -DDATADIR=\"$(datadir)\" \ + -DLIBDIR=\"$(libdir)\" + +-wnck_applet_SOURCES = \ ++libwnck_applet_la_SOURCES = \ + wncklet.c \ + wncklet.h \ + window-menu.c \ +@@ -312,7 +308,7 @@ + showdesktop.c \ + showdesktop.h + +-wnck_applet_LDADD = \ ++libwnck_applet_la_LIBADD = \ + ../../libpanel-applet/libpanel-applet-2.la \ + $(WNCKLET_LIBS) + +@@ -371,37 +367,35 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-libexecPROGRAMS: $(libexec_PROGRAMS) ++install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)" +- @list='$(libexec_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- || test -f $$p1 \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \ ++ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ if test -f $$p; then \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +-uninstall-libexecPROGRAMS: ++uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(libexec_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(libexecdir)/$$f"; \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ done ++ ++clean-libLTLIBRARIES: ++ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ++ test "$$dir" != "$$p" || dir=.; \ ++ echo "rm -f \"$${dir}/so_locations\""; \ ++ rm -f "$${dir}/so_locations"; \ + done +- +-clean-libexecPROGRAMS: +- @list='$(libexec_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done +-wnck-applet$(EXEEXT): $(wnck_applet_OBJECTS) $(wnck_applet_DEPENDENCIES) +- @rm -f wnck-applet$(EXEEXT) +- $(LINK) $(wnck_applet_LDFLAGS) $(wnck_applet_OBJECTS) $(wnck_applet_LDADD) $(LIBS) ++libwnck-applet.la: $(libwnck_applet_la_OBJECTS) $(libwnck_applet_la_DEPENDENCIES) ++ $(LINK) -rpath $(libdir) $(libwnck_applet_la_LDFLAGS) $(libwnck_applet_la_OBJECTS) $(libwnck_applet_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -409,31 +403,34 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showdesktop.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window-list.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window-menu.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wncklet.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workspace-switcher.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showdesktop.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window-list.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window-menu.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wncklet.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workspace-switcher.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -450,7 +447,7 @@ + test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)" + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ + $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ + done +@@ -458,7 +455,7 @@ + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ + rm -f "$(DESTDIR)$(gladedir)/$$f"; \ + done +@@ -467,7 +464,7 @@ + test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)" + @list='$(schemas_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(schemasDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemasdir)/$$f'"; \ + $(schemasDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemasdir)/$$f"; \ + done +@@ -475,7 +472,7 @@ + uninstall-schemasDATA: + @$(NORMAL_UNINSTALL) + @list='$(schemas_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(schemasdir)/$$f'"; \ + rm -f "$(DESTDIR)$(schemasdir)/$$f"; \ + done +@@ -484,7 +481,7 @@ + test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ + $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ + done +@@ -492,7 +489,7 @@ + uninstall-serverDATA: + @$(NORMAL_UNINSTALL) + @list='$(server_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ + rm -f "$(DESTDIR)$(serverdir)/$$f"; \ + done +@@ -501,7 +498,7 @@ + test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)" + @list='$(ui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \ + $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \ + done +@@ -509,7 +506,7 @@ + uninstall-uiDATA: + @$(NORMAL_UNINSTALL) + @list='$(ui_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \ + rm -f "$(DESTDIR)$(uidir)/$$f"; \ + done +@@ -591,9 +588,9 @@ + done + check-am: all-am + check: check-am +-all-am: Makefile $(PROGRAMS) $(DATA) ++all-am: Makefile $(LTLIBRARIES) $(DATA) + installdirs: +- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \ ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done + install: install-am +@@ -616,14 +613,14 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + clean: clean-am + +-clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \ ++clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am + + distclean: distclean-am +@@ -645,7 +642,7 @@ + install-data-am: install-data-local install-gladeDATA \ + install-schemasDATA install-serverDATA install-uiDATA + +-install-exec-am: install-libexecPROGRAMS ++install-exec-am: install-libLTLIBRARIES + + install-info: install-info-am + +@@ -672,30 +669,30 @@ + ps-am: + + uninstall-am: uninstall-gladeDATA uninstall-info-am \ +- uninstall-libexecPROGRAMS uninstall-schemasDATA \ ++ uninstall-libLTLIBRARIES uninstall-schemasDATA \ + uninstall-serverDATA uninstall-uiDATA + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libexecPROGRAMS clean-libtool ctags distclean \ ++ clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-exec install-exec-am \ + install-gladeDATA install-info install-info-am \ +- install-libexecPROGRAMS install-man install-schemasDATA \ ++ install-libLTLIBRARIES install-man install-schemasDATA \ + install-serverDATA install-strip install-uiDATA installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-gladeDATA \ +- uninstall-info-am uninstall-libexecPROGRAMS \ ++ uninstall-info-am uninstall-libLTLIBRARIES \ + uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA + + +-$(wnck_applet_OBJECTS): $(BUILT_SOURCES) ++$(libwnck_applet_la_OBJECTS): $(BUILT_SOURCES) + + $(server_in_files): $(server_in_files).in +- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ ++ sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@ + + @INTLTOOL_SERVER_RULE@ + +diff -Nur gnome-panel-2.14.1/config.log gnome-panel-2.14.1.new/config.log +--- gnome-panel-2.14.1/config.log 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/config.log 2006-05-07 23:41:22.000000000 +0200 +@@ -0,0 +1,320 @@ ++This file contains any messages produced by compilers while ++running configure, to aid debugging if configure makes a mistake. ++ ++It was created by gnome-panel configure 2.14.1, which was ++generated by GNU Autoconf 2.59. Invocation command line was ++ ++ $ ./configure --enable-maintainer-mode ++ ++## --------- ## ++## Platform. ## ++## --------- ## ++ ++hostname = jupiter ++uname -m = i686 ++uname -r = 2.6.15-21-k7 ++uname -s = Linux ++uname -v = #1 SMP PREEMPT Fri Apr 21 17:10:51 UTC 2006 ++ ++/usr/bin/uname -p = unknown ++/bin/uname -X = unknown ++ ++/bin/arch = i686 ++/usr/bin/arch -k = unknown ++/usr/convex/getsysinfo = unknown ++hostinfo = unknown ++/bin/machine = unknown ++/usr/bin/oslevel = unknown ++/bin/universe = unknown ++ ++PATH: /usr/local/sbin ++PATH: /usr/local/bin ++PATH: /usr/sbin ++PATH: /usr/bin ++PATH: /sbin ++PATH: /bin ++PATH: /usr/bin/X11 ++PATH: /usr/games ++PATH: /usr/games ++PATH: /home/seb128/bin ++PATH: /usr/games ++PATH: /home/seb128/bin ++ ++ ++## ----------- ## ++## Core tests. ## ++## ----------- ## ++ ++configure:1650: checking for a BSD-compatible install ++configure:1705: result: /usr/bin/install -c ++configure:1716: checking whether build environment is sane ++ ++## ---------------- ## ++## Cache variables. ## ++## ---------------- ## ++ ++ac_cv_env_CC_set= ++ac_cv_env_CC_value= ++ac_cv_env_CFLAGS_set= ++ac_cv_env_CFLAGS_value= ++ac_cv_env_CLOCK_CFLAGS_set= ++ac_cv_env_CLOCK_CFLAGS_value= ++ac_cv_env_CLOCK_LIBS_set= ++ac_cv_env_CLOCK_LIBS_value= ++ac_cv_env_CPPFLAGS_set= ++ac_cv_env_CPPFLAGS_value= ++ac_cv_env_CPP_set= ++ac_cv_env_CPP_value= ++ac_cv_env_CXXCPP_set= ++ac_cv_env_CXXCPP_value= ++ac_cv_env_CXXFLAGS_set= ++ac_cv_env_CXXFLAGS_value= ++ac_cv_env_CXX_set= ++ac_cv_env_CXX_value= ++ac_cv_env_F77_set= ++ac_cv_env_F77_value= ++ac_cv_env_FFLAGS_set= ++ac_cv_env_FFLAGS_value= ++ac_cv_env_FISH_CFLAGS_set= ++ac_cv_env_FISH_CFLAGS_value= ++ac_cv_env_FISH_LIBS_set= ++ac_cv_env_FISH_LIBS_value= ++ac_cv_env_GDU_MODULE_VERSION_CHECK_CFLAGS_set= ++ac_cv_env_GDU_MODULE_VERSION_CHECK_CFLAGS_value= ++ac_cv_env_GDU_MODULE_VERSION_CHECK_LIBS_set= ++ac_cv_env_GDU_MODULE_VERSION_CHECK_LIBS_value= ++ac_cv_env_LDFLAGS_set= ++ac_cv_env_LDFLAGS_value= ++ac_cv_env_LIBPANEL_APPLET_CFLAGS_set= ++ac_cv_env_LIBPANEL_APPLET_CFLAGS_value= ++ac_cv_env_LIBPANEL_APPLET_LIBS_set= ++ac_cv_env_LIBPANEL_APPLET_LIBS_value= ++ac_cv_env_PANEL_CFLAGS_set= ++ac_cv_env_PANEL_CFLAGS_value= ++ac_cv_env_PANEL_LIBS_set= ++ac_cv_env_PANEL_LIBS_value= ++ac_cv_env_PKG_CONFIG_set= ++ac_cv_env_PKG_CONFIG_value= ++ac_cv_env_WNCKLET_CFLAGS_set= ++ac_cv_env_WNCKLET_CFLAGS_value= ++ac_cv_env_WNCKLET_LIBS_set= ++ac_cv_env_WNCKLET_LIBS_value= ++ac_cv_env_build_alias_set= ++ac_cv_env_build_alias_value= ++ac_cv_env_host_alias_set= ++ac_cv_env_host_alias_value= ++ac_cv_env_target_alias_set= ++ac_cv_env_target_alias_value= ++ac_cv_path_install='/usr/bin/install -c' ++ ++## ----------------- ## ++## Output variables. ## ++## ----------------- ## ++ ++ACLOCAL='' ++ACLOCAL_AMFLAGS='' ++AMDEPBACKSLASH='' ++AMDEP_FALSE='' ++AMDEP_TRUE='' ++AMTAR='' ++AR='' ++AS='' ++AUTOCONF='' ++AUTOHEADER='' ++AUTOMAKE='' ++AWK='' ++BONOBO_ACT_IDLDIR='' ++BONOBO_IDLDIR='' ++CATALOGS='' ++CATOBJEXT='' ++CC='' ++CCDEPMODE='' ++CFLAGS='' ++CLOCK_CFLAGS='' ++CLOCK_LIBS='' ++CONFIG_STATUS_DEPENDENCIES='' ++CPP='' ++CPPFLAGS='' ++CXX='' ++CXXCPP='' ++CXXDEPMODE='' ++CXXFLAGS='' ++CYGPATH_W='' ++DATADIRNAME='' ++DEFS='' ++DEPDIR='' ++DISABLE_DEPRECATED='' ++DISABLE_DEPRECATED_CFLAGS='' ++DLLTOOL='' ++DOC_USER_FORMATS='' ++ECHO='echo' ++ECHO_C='' ++ECHO_N='-n' ++ECHO_T='' ++EGREP='' ++ENABLE_GTK_DOC_FALSE='' ++ENABLE_GTK_DOC_TRUE='' ++ENABLE_SK_FALSE='' ++ENABLE_SK_TRUE='' ++EXEEXT='' ++F77='' ++FFLAGS='' ++FISH_CFLAGS='' ++FISH_LIBS='' ++GCONFTOOL='' ++GCONF_SCHEMAS_INSTALL_FALSE='' ++GCONF_SCHEMAS_INSTALL_TRUE='' ++GCONF_SCHEMA_CONFIG_SOURCE='' ++GCONF_SCHEMA_FILE_DIR='' ++GDU_MODULE_VERSION_CHECK_CFLAGS='' ++GDU_MODULE_VERSION_CHECK_LIBS='' ++GETTEXT_PACKAGE='' ++GLIB_GENMARSHAL='' ++GMOFILES='' ++GMSGFMT='' ++GTK_DOC_USE_LIBTOOL_FALSE='' ++GTK_DOC_USE_LIBTOOL_TRUE='' ++HAVE_LIBECAL_FALSE='' ++HAVE_LIBECAL_TRUE='' ++HELP_DIR='' ++HTML_DIR='' ++INSTALL_DATA='${INSTALL} -m 644' ++INSTALL_PROGRAM='${INSTALL}' ++INSTALL_SCRIPT='${INSTALL}' ++INSTALL_STRIP_PROGRAM='' ++INSTOBJEXT='' ++INTLLIBS='' ++INTLTOOL_CAVES_RULE='' ++INTLTOOL_DESKTOP_RULE='' ++INTLTOOL_DIRECTORY_RULE='' ++INTLTOOL_EXTRACT='' ++INTLTOOL_ICONV='' ++INTLTOOL_KBD_RULE='' ++INTLTOOL_KEYS_RULE='' ++INTLTOOL_MERGE='' ++INTLTOOL_MSGFMT='' ++INTLTOOL_MSGMERGE='' ++INTLTOOL_OAF_RULE='' ++INTLTOOL_PERL='' ++INTLTOOL_PONG_RULE='' ++INTLTOOL_PROP_RULE='' ++INTLTOOL_SCHEMAS_RULE='' ++INTLTOOL_SERVER_RULE='' ++INTLTOOL_SERVICE_RULE='' ++INTLTOOL_SHEET_RULE='' ++INTLTOOL_SOUNDLIST_RULE='' ++INTLTOOL_THEME_RULE='' ++INTLTOOL_UI_RULE='' ++INTLTOOL_UPDATE='' ++INTLTOOL_XAM_RULE='' ++INTLTOOL_XGETTEXT='' ++INTLTOOL_XML_NOMERGE_RULE='' ++INTLTOOL_XML_RULE='' ++LDFLAGS='' ++LIBOBJS='' ++LIBPANEL_APPLET_CFLAGS='' ++LIBPANEL_APPLET_LIBS='' ++LIBS='' ++LIBTOOL='' ++LIB_PANEL_APPLET_LT_VERSION='' ++LN_S='' ++LTLIBOBJS='' ++MAINT='' ++MAINTAINER_MODE_FALSE='' ++MAINTAINER_MODE_TRUE='' ++MAKEINFO='' ++MKINSTALLDIRS='' ++MSGFMT='' ++OBJDUMP='' ++OBJEXT='' ++OMF_DIR='' ++ORBIT_IDL='' ++PACKAGE='' ++PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel' ++PACKAGE_NAME='gnome-panel' ++PACKAGE_STRING='gnome-panel 2.14.1' ++PACKAGE_TARNAME='gnome-panel' ++PACKAGE_VERSION='2.14.1' ++PANEL_CFLAGS='' ++PANEL_LIBS='' ++PATH_SEPARATOR=':' ++PERL='' ++PKG_CONFIG='' ++POFILES='' ++POSUB='' ++PO_IN_DATADIR_FALSE='' ++PO_IN_DATADIR_TRUE='' ++RANLIB='' ++REBUILD='' ++SCROLLKEEPER_CONFIG='' ++SET_MAKE='' ++SHELL='/bin/sh' ++STRIP='' ++USE_NLS='' ++VERSION='' ++WARN_CFLAGS='' ++WNCKLET_CFLAGS='' ++WNCKLET_LIBS='' ++XGETTEXT='' ++X_CFLAGS='' ++X_EXTRA_LIBS='' ++X_LIBS='' ++X_PRE_LIBS='' ++ac_ct_AR='' ++ac_ct_AS='' ++ac_ct_CC='' ++ac_ct_CXX='' ++ac_ct_DLLTOOL='' ++ac_ct_F77='' ++ac_ct_OBJDUMP='' ++ac_ct_RANLIB='' ++ac_ct_STRIP='' ++ac_pt_PKG_CONFIG='' ++am__fastdepCC_FALSE='' ++am__fastdepCC_TRUE='' ++am__fastdepCXX_FALSE='' ++am__fastdepCXX_TRUE='' ++am__include='' ++am__leading_dot='' ++am__quote='' ++bindir='${exec_prefix}/bin' ++build='' ++build_alias='' ++build_cpu='' ++build_os='' ++build_vendor='' ++datadir='${prefix}/share' ++exec_prefix='NONE' ++host='' ++host_alias='' ++host_cpu='' ++host_os='' ++host_vendor='' ++includedir='${prefix}/include' ++infodir='${prefix}/info' ++install_sh='' ++libdir='${exec_prefix}/lib' ++libexecdir='${exec_prefix}/libexec' ++localstatedir='${prefix}/var' ++mandir='${prefix}/man' ++mkdir_p='' ++oldincludedir='/usr/include' ++prefix='NONE' ++program_transform_name='s,x,x,' ++sbindir='${exec_prefix}/sbin' ++sharedstatedir='${prefix}/com' ++sysconfdir='${prefix}/etc' ++target_alias='' ++ ++## ----------- ## ++## confdefs.h. ## ++## ----------- ## ++ ++#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel" ++#define PACKAGE_NAME "gnome-panel" ++#define PACKAGE_STRING "gnome-panel 2.14.1" ++#define PACKAGE_TARNAME "gnome-panel" ++#define PACKAGE_VERSION "2.14.1" ++ ++configure: caught signal 2 ++configure: exit 1 +diff -Nur gnome-panel-2.14.1/configure gnome-panel-2.14.1.new/configure +--- gnome-panel-2.14.1/configure 2006-04-10 15:46:17.000000000 +0200 ++++ gnome-panel-2.14.1.new/configure 2006-05-07 23:41:11.000000000 +0200 +@@ -287,8 +287,8 @@ + # 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`" && ++ 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 +@@ -464,7 +464,7 @@ + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ACLOCAL_AMFLAGS LIB_PANEL_APPLET_LT_VERSION MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT DISABLE_DEPRECATED INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GLIB_GENMARSHAL GCONFTOOL WARN_CFLAGS DISABLE_DEPRECATED_CFLAGS PKG_CONFIG ac_pt_PKG_CONFIG PANEL_CFLAGS PANEL_LIBS LIBPANEL_APPLET_CFLAGS LIBPANEL_APPLET_LIBS WNCKLET_CFLAGS WNCKLET_LIBS HAVE_LIBECAL_TRUE HAVE_LIBECAL_FALSE CLOCK_CFLAGS CLOCK_LIBS FISH_CFLAGS FISH_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS ORBIT_IDL BONOBO_IDLDIR BONOBO_ACT_IDLDIR GETTEXT_PACKAGE CONFIG_STATUS_DEPENDENCIES USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE GDU_MODULE_VERSION_CHECK_CFLAGS GDU_MODULE_VERSION_CHECK_LIBS HELP_DIR OMF_DIR DOC_USER_FORMATS ENABLE_SK_TRUE ENABLE_SK_FALSE SCROLLKEEPER_CONFIG GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE PERL REBUILD LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot ACLOCAL_AMFLAGS LIB_PANEL_APPLET_LT_VERSION MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT DISABLE_DEPRECATED INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GLIB_GENMARSHAL GCONFTOOL WARN_CFLAGS DISABLE_DEPRECATED_CFLAGS PKG_CONFIG ac_pt_PKG_CONFIG PANEL_CFLAGS PANEL_LIBS LIBPANEL_APPLET_CFLAGS LIBPANEL_APPLET_LIBS WNCKLET_CFLAGS WNCKLET_LIBS HAVE_LIBECAL_TRUE HAVE_LIBECAL_FALSE CLOCK_CFLAGS CLOCK_LIBS FISH_CFLAGS FISH_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS ORBIT_IDL BONOBO_IDLDIR BONOBO_ACT_IDLDIR GETTEXT_PACKAGE CONFIG_STATUS_DEPENDENCIES USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE GDU_MODULE_VERSION_CHECK_CFLAGS GDU_MODULE_VERSION_CHECK_LIBS HELP_DIR OMF_DIR DOC_USER_FORMATS ENABLE_SK_TRUE ENABLE_SK_FALSE SCROLLKEEPER_CONFIG GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE PERL REBUILD LIBOBJS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -1249,7 +1249,7 @@ + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + +@@ -1608,7 +1608,7 @@ + + ac_config_headers="$ac_config_headers config.h" + +-am__api_version="1.9" ++am__api_version="1.8" + ac_aux_dir= + for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then +@@ -1785,21 +1785,13 @@ + fi + + 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 ++ # Keeping the `.' argument allows $(mkdir_p) to be used without ++ # argument. Indeed, we sometimes output rules like + # $(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 --' ++ # where $(somedir) is conditionally defined. ++ # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more ++ # expensive solution, as it forces Make to start a sub-shell.) ++ mkdir_p='mkdir -p -- .' + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as +@@ -1943,6 +1935,9 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + ++ ++AMTAR=${AMTAR-"${am_missing_run}tar"} ++ + install_sh=${install_sh-"$am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user +@@ -2035,13 +2030,6 @@ + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +-# Always define AMTAR for backward compatibility. +- +-AMTAR=${AMTAR-"${am_missing_run}tar"} +- +-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +- +- + + + +@@ -2107,7 +2095,7 @@ + + + if test $USE_MAINTAINER_MODE = yes; then +- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DBONOBO_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 +@@ -3051,8 +3039,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3110,8 +3097,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3227,8 +3213,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3282,8 +3267,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3328,8 +3312,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3373,8 +3356,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3561,8 +3543,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3616,8 +3597,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4016,8 +3996,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4075,8 +4054,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4192,8 +4170,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4247,8 +4224,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4293,8 +4269,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4338,8 +4313,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4770,8 +4744,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5146,7 +5119,7 @@ + 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 GNU ld's only accept -v. ++ # 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 &6 + else +- # I'd rather use --version here, but apparently some GNU ld's only accept -v. ++ # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &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" ++ 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 + ;; + *) +- 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 ++ 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 +- esac +- fi ++ fi ++ done ++ IFS="$lt_save_ifs" + done +- IFS="$lt_save_ifs" + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + fi + fi +@@ -5350,7 +5330,7 @@ + + hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file +- case "$host_cpu" in ++ 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 +@@ -5366,6 +5346,11 @@ + 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;; +@@ -5381,7 +5366,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu | knetbsd*-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 +@@ -5411,15 +5396,11 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-sco3.2v5*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- + solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++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]' +@@ -5440,10 +5421,13 @@ + siemens) + lt_cv_deplibs_check_method=pass_all + ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + esac + ;; + +-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*) ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + esac +@@ -5461,6 +5445,9 @@ + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ + # Allow CC to be a program name with arguments. + compiler=$CC + +@@ -5495,7 +5482,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5498 "configure"' > conftest.$ac_ext ++ echo '#line 5485 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -5538,7 +5525,7 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- case "`/usr/bin/file conftest.o`" in ++ case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*linux*) +@@ -5615,8 +5602,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5651,6 +5637,26 @@ + CFLAGS="$SAVE_CFLAGS" + fi + ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > 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.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* ++ ;; ++ + *-*-cygwin* | *-*-mingw* | *-*-pw32*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +@@ -5937,8 +5943,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6005,8 +6010,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6266,8 +6270,7 @@ + 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' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6325,8 +6328,7 @@ + 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' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6397,8 +6399,7 @@ + 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' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6442,8 +6443,7 @@ + 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' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6961,8 +6961,7 @@ + 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' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7011,8 +7010,7 @@ + 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' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7112,12 +7110,18 @@ + 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 *BSD ++ 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` + ;; ++ ++ 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 +@@ -7131,6 +7135,17 @@ + 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 +@@ -7216,9 +7231,18 @@ + osf*) + symcode='[BCDEGQRST]' + ;; +-solaris* | sysv5*) ++solaris*) + symcode='[BDRT]' + ;; ++sco3.2v5*) ++ symcode='[DT]' ++ ;; ++sysv4.2uw2*) ++ symcode='[DT]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[ABDT]' ++ ;; + sysv4) + symcode='[DFNSTU]' + ;; +@@ -7427,7 +7451,7 @@ + default_ofile=libtool + can_build_shared=yes + +-# All known linkers require a `.a' archive for static linking (except M$VC, ++# All known linkers require a `.a' archive for static linking (except MSVC, + # which needs '.lib'). + libext=a + ltmain="$ac_aux_dir/ltmain.sh" +@@ -7684,6 +7708,7 @@ + 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" +@@ -7703,10 +7728,10 @@ + if test -n "$RANLIB"; then + case $host_os in + openbsd*) +- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) +- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +@@ -7748,7 +7773,7 @@ + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) +- file_magic_regex="`expr \"$deplibs_check_method\" : \"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 +@@ -7810,7 +7835,7 @@ + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) +- file_magic_regex="`expr \"$deplibs_check_method\" : \"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 +@@ -7905,6 +7930,9 @@ + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ + # Allow CC to be a program name with arguments. + compiler=$CC + +@@ -7912,82 +7940,17 @@ + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" >conftest.$ac_ext +-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext + printf "$lt_simple_link_test_code" >conftest.$ac_ext +-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` + $rm conftest* + + +-# +-# Check for any special shared library compilation flags. +-# +-lt_prog_cc_shlib= +-if test "$GCC" = no; then +- case $host_os in +- sco3.2v5*) +- lt_prog_cc_shlib='-belf' +- ;; +- esac +-fi +-if test -n "$lt_prog_cc_shlib"; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5 +-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;} +- if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then : +- else +- { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 +-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} +- lt_cv_prog_cc_can_build_shared=no +- fi +-fi +- +- +-# +-# Check to make sure the static flag actually works. +-# +-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6 +-if test "${lt_prog_compiler_static_works+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_prog_compiler_static_works=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $lt_prog_compiler_static" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext +- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +- # The compiler 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>&5 +- $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp +- $SED '/^$/d' conftest.err >conftest.er2 +- if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works=yes +- fi +- else +- lt_prog_compiler_static_works=yes +- fi +- fi +- $rm conftest* +- LDFLAGS="$save_LDFLAGS" +- +-fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 +- +-if test x"$lt_prog_compiler_static_works" = xyes; then +- : +-else +- lt_prog_compiler_static= +-fi +- +- +- + + lt_prog_compiler_no_builtin_flag= + +@@ -8010,20 +7973,20 @@ + # 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}? :&$lt_compiler_flag :; t' \ ++ -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:8016: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7979: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8020: \$? = $ac_status" >&5 ++ echo "$as_me:7983: \$? = $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. +- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp +- $SED '/^$/d' conftest.err >conftest.er2 +- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then ++ $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 + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi +@@ -8084,6 +8047,11 @@ + lt_prog_compiler_pic='-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. +@@ -8100,7 +8068,7 @@ + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -8147,7 +8115,7 @@ + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -8177,12 +8145,12 @@ + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; +- pgcc* | pgf77* | pgf90*) ++ pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' +- lt_prog_compiler_static='-static' ++ lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' +@@ -8198,11 +8166,6 @@ + lt_prog_compiler_static='-non_shared' + ;; + +- sco3.2v5*) +- lt_prog_compiler_pic='-Kpic' +- lt_prog_compiler_static='-dn' +- ;; +- + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' +@@ -8220,7 +8183,7 @@ + lt_prog_compiler_static='-Bstatic' + ;; + +- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' +@@ -8233,6 +8196,12 @@ + fi + ;; + ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no +@@ -8272,20 +8241,20 @@ + # 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}? :&$lt_compiler_flag :; t' \ ++ -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:8278: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8247: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8282: \$? = $ac_status" >&5 ++ echo "$as_me:8251: \$? = $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. +- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp +- $SED '/^$/d' conftest.err >conftest.er2 +- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then ++ $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 + lt_prog_compiler_pic_works=yes + fi + fi +@@ -8306,7 +8275,7 @@ + fi + + fi +-case "$host_os" in ++case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= +@@ -8316,6 +8285,48 @@ + ;; + esac + ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" ++echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 ++if test "${lt_prog_compiler_static_works+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_prog_compiler_static_works=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ 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>&5 ++ $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 ++ lt_prog_compiler_static_works=yes ++ fi ++ else ++ lt_prog_compiler_static_works=yes ++ fi ++ fi ++ $rm conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 ++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 ++ ++if test x"$lt_prog_compiler_static_works" = xyes; then ++ : ++else ++ lt_prog_compiler_static= ++fi ++ ++ + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 + if test "${lt_cv_prog_compiler_c_o+set}" = set; then +@@ -8334,25 +8345,25 @@ + # 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}? :&$lt_compiler_flag :; t' \ ++ -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:8340: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8351: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8344: \$? = $ac_status" >&5 ++ echo "$as_me:8355: \$? = $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 + # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp +- $SED '/^$/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ $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_cv_prog_compiler_c_o=yes + fi + fi +- chmod u+w . ++ chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation +@@ -8448,6 +8459,10 @@ + 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 + ;; +@@ -8532,7 +8547,7 @@ + export_symbols_cmds='$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 +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ archive_cmds='$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... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +@@ -8541,22 +8556,37 @@ + 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}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $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 + ld_shlibs=no + fi + ;; + ++ interix3*) ++ hardcode_direct=no ++ hardcode_shlibpath_var=no ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec='${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. ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ 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*) + 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 +- whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ whole_archive_flag_spec='${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* ) # Portland Group f77 and f90 compilers +- whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ whole_archive_flag_spec='${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' ;; +@@ -8573,12 +8603,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 | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -8588,7 +8619,7 @@ + fi + ;; + +- solaris* | sysv5*) ++ solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <&2 +@@ -8609,6 +8640,33 @@ + fi + ;; + ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) ++ ld_shlibs=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 ++ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ esac ++ ;; ++ + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= +@@ -8642,7 +8700,7 @@ + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes +- if test "$GCC" = yes && test -z "$link_static_flag"; then ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported +@@ -8676,6 +8734,7 @@ + break + fi + done ++ ;; + esac + + exp_sym_flag='-bexport' +@@ -8713,6 +8772,7 @@ + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi ++ ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then +@@ -8725,11 +8785,11 @@ + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else +- if test "$aix_use_runtimelinking" = yes; then ++ if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' +- fi ++ fi + fi + fi + +@@ -8765,8 +8825,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8794,12 +8853,12 @@ + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ archive_expsym_cmds="\$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 + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" +- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" ++ archive_expsym_cmds="\$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. + cat >conftest.$ac_ext <<_ACEOF +@@ -8826,8 +8885,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8859,13 +8917,11 @@ + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' +- # -bexpall does not export symbols beginning with underscore (_) +- always_export_symbols=yes + # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec=' ' ++ whole_archive_flag_spec='$convenience' + archive_cmds_need_lc=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ # This is similar to how AIX traditionally builds its shared libraries. ++ archive_expsym_cmds="\$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 + ;; +@@ -8904,7 +8960,7 @@ + ;; + + darwin* | rhapsody*) +- case "$host_os" in ++ case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag='${wl}-undefined ${wl}suppress' + ;; +@@ -8933,7 +8989,7 @@ + output_verbose_link_cmd='echo' + archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds='$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 ld's ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds='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}' + module_expsym_cmds='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 +@@ -8942,7 +8998,7 @@ + output_verbose_link_cmd='echo' + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds='$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 ld's ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds='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}' + module_expsym_cmds='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}' + ;; +@@ -8983,11 +9039,20 @@ + ;; + + # 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 ++ hardcode_shlibpath_var=no ++ ;; ++ ++ # GNU/kFreeBSD uses gcc -shared to do shared libraries. ++ kfreebsd*-gnu) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ++ link_all_deplibs=no + ;; + + hpux9*) +@@ -9006,47 +9071,62 @@ + export_dynamic_flag_spec='${wl}-E' + ;; + +- hpux10* | hpux11*) ++ hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*|ia64*) ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator=: ++ ++ hardcode_direct=yes ++ export_dynamic_flag_spec='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; ++ ia64*) ++ archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; + *) + archive_cmds='$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*|ia64*) +- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ archive_cmds='$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 +- case "$host_cpu" in +- hppa*64*) +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) + hardcode_libdir_flag_spec_ld='+b $libdir' +- hardcode_libdir_separator=: +- hardcode_direct=no +- hardcode_shlibpath_var=no +- ;; +- ia64*) +- hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=no + hardcode_shlibpath_var=no +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L=yes + ;; + *) +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator=: + hardcode_direct=yes + export_dynamic_flag_spec='${wl}-E' + +@@ -9070,7 +9150,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -9148,14 +9228,6 @@ + hardcode_libdir_separator=: + ;; + +- sco3.2v5*) +- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var=no +- export_dynamic_flag_spec='${wl}-Bexport' +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ;; +- + solaris*) + no_undefined_flag=' -z text' + if test "$GCC" = yes; then +@@ -9241,36 +9313,45 @@ + fi + ;; + +- sysv4.2uw2*) +- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct=yes +- hardcode_minus_L=no ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ++ no_undefined_flag='${wl}-z,text' ++ archive_cmds_need_lc=no + hardcode_shlibpath_var=no +- hardcode_runpath_var=yes +- runpath_var=LD_RUN_PATH +- ;; ++ runpath_var='LD_RUN_PATH' + +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) +- no_undefined_flag='${wl}-z ${wl}text' + if test "$GCC" = yes; then +- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi +- runpath_var='LD_RUN_PATH' +- hardcode_shlibpath_var=no + ;; + +- sysv5*) +- no_undefined_flag=' -z text' +- # $CC -shared without GNU ld will not create a library from C++ +- # object files and a static libstdc++, better avoid it by now +- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds='$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' +- hardcode_libdir_flag_spec= ++ 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. ++ no_undefined_flag='${wl}-z,text' ++ allow_undefined_flag='${wl}-z,nodefs' ++ archive_cmds_need_lc=no + hardcode_shlibpath_var=no ++ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ hardcode_libdir_separator=':' ++ link_all_deplibs=yes ++ export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi + ;; + + uts4*) +@@ -9289,11 +9370,6 @@ + echo "${ECHO_T}$ld_shlibs" >&6 + test "$ld_shlibs" = 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 +- + # + # Do we need to explicitly link libc? + # +@@ -9326,6 +9402,7 @@ + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl ++ pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= +@@ -9486,7 +9563,8 @@ + 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' ++ $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' +@@ -9539,7 +9617,7 @@ + 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)' ++ 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"` +@@ -9577,7 +9655,14 @@ + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[123]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +@@ -9599,12 +9684,17 @@ + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +- *) # from 3.2 on ++ 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 + ;; +- esac +- ;; ++ freebsd*) # from 4.6 on ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac ++ ;; + + gnu*) + version_type=linux +@@ -9622,7 +9712,7 @@ + version_type=sunos + need_lib_prefix=no + need_version=no +- case "$host_cpu" in ++ case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes +@@ -9662,6 +9752,18 @@ + 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 ++ ;; ++ + irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; +@@ -9719,31 +9821,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 9726 "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 +@@ -9755,6 +9836,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + knetbsd*-gnu) + version_type=linux + need_lib_prefix=no +@@ -9804,6 +9897,7 @@ + + 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 +@@ -9847,13 +9941,6 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +-sco3.2v5*) +- version_type=osf +- 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 +- ;; +- + solaris*) + version_type=linux + need_lib_prefix=no +@@ -9879,7 +9966,7 @@ + need_version=yes + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++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' +@@ -9912,6 +9999,29 @@ + 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' ++ ;; ++ + uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -9927,6 +10037,11 @@ + echo "${ECHO_T}$dynamic_linker" >&6 + 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 ++ + echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 + hardcode_action= +@@ -10058,8 +10173,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10162,8 +10276,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10228,8 +10341,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10322,8 +10434,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10388,8 +10499,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10455,8 +10565,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10522,8 +10631,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10582,7 +10690,7 @@ + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" +- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" +@@ -10598,7 +10706,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null ++ (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; +- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; ++ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed +@@ -10684,7 +10794,7 @@ + echo "${ECHO_T}$lt_cv_dlopen_self" >&6 + + if test "x$lt_cv_dlopen_self" = xyes; then +- LDFLAGS="$LDFLAGS $link_static_flag" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 + echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 + if test "${lt_cv_dlopen_self_static+set}" = set; then +@@ -10696,7 +10806,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null ++ (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; +- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; ++ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed +@@ -10800,7 +10912,7 @@ + fi + + +-# Report which librarie types wil actually be built ++# Report which library types will actually be built + echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 + echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $can_build_shared" >&5 +@@ -10812,7 +10924,7 @@ + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. +-case "$host_os" in ++case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then +@@ -10850,7 +10962,7 @@ + # 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 NM \ ++ 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 \ +@@ -11016,6 +11128,9 @@ + # A C compiler. + LTCC=$lt_LTCC + ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS ++ + # A language-specific compiler. + CC=$lt_compiler + +@@ -11346,6 +11461,9 @@ + echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} + fi + fi ++ if test -z "$LTCFLAGS"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" ++ fi + + # Extract list of available tagged configurations in $ofile. + # Note that this assumes the entire list is on one line. +@@ -11398,6 +11516,7 @@ + hardcode_libdir_flag_spec_ld_CXX= + hardcode_libdir_separator_CXX= + hardcode_minus_L_CXX=no ++hardcode_shlibpath_var_CXX=unsupported + hardcode_automatic_CXX=no + module_cmds_CXX= + module_expsym_cmds_CXX= +@@ -11415,7 +11534,7 @@ + compiler_lib_search_path_CXX= + + # Source file extension for C++ test sources. +-ac_ext=cc ++ac_ext=cpp + + # Object file extension for compiled C++ test sources. + objext=o +@@ -11425,13 +11544,16 @@ + lt_simple_compile_test_code="int some_variable = 0;\n" + + # Code to be used in simple link tests +-lt_simple_link_test_code='int main(int, char *) { return(0); }\n' ++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. + + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ + # Allow CC to be a program name with arguments. + compiler=$CC + +@@ -11439,13 +11561,13 @@ + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" >conftest.$ac_ext +-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext + printf "$lt_simple_link_test_code" >conftest.$ac_ext +-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` + $rm conftest* + +@@ -11460,12 +11582,12 @@ + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else +- unset lt_cv_prog_gnu_ld ++ $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 +- unset lt_cv_path_LD ++ $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} +@@ -11551,7 +11673,7 @@ + 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 GNU ld's only accept -v. ++ # 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 &6 + else +- # I'd rather use --version here, but apparently some GNU ld's only accept -v. ++ # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -11795,12 +11918,12 @@ + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + +- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ archive_expsym_cmds_CXX="\$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 + hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_CXX="-z nodefs" +- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" ++ archive_expsym_cmds_CXX="\$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. + cat >conftest.$ac_ext <<_ACEOF +@@ -11827,8 +11950,7 @@ + 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' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -11860,16 +11982,26 @@ + # -berok will link without error, but may produce a broken library. + no_undefined_flag_CXX=' ${wl}-bernotok' + allow_undefined_flag_CXX=' ${wl}-berok' +- # -bexpall does not export symbols beginning with underscore (_) +- always_export_symbols_CXX=yes + # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec_CXX=' ' ++ whole_archive_flag_spec_CXX='$convenience' + archive_cmds_need_lc_CXX=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ # This is similar to how AIX traditionally builds its shared libraries. ++ archive_expsym_cmds_CXX="\$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 + ;; ++ ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ allow_undefined_flag_CXX=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ + chorus*) + case $cc_basename in + *) +@@ -11879,7 +12011,6 @@ + esac + ;; + +- + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. +@@ -11889,7 +12020,7 @@ + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ archive_cmds_CXX='$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... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +@@ -11898,13 +12029,13 @@ + 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}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $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 + ld_shlibs_CXX=no + fi + ;; + darwin* | rhapsody*) +- case "$host_os" in ++ case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' + ;; +@@ -11942,7 +12073,7 @@ + archive_cmds_CXX='$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 + module_cmds_CXX='$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 ld's ++ # 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 + archive_expsym_cmds_CXX='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 +@@ -11955,7 +12086,7 @@ + output_verbose_link_cmd='echo' + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_CXX='$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 ld's ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_CXX='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}' + module_expsym_cmds_CXX='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}' + ;; +@@ -12035,33 +12166,22 @@ + ;; + hpux10*|hpux11*) + if test $with_gnu_ld = no; then +- case "$host_cpu" in +- hppa*64*) +- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' ++ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) + hardcode_libdir_flag_spec_ld_CXX='+b $libdir' +- hardcode_libdir_separator_CXX=: +- ;; +- ia64*) +- hardcode_libdir_flag_spec_CXX='-L$libdir' + ;; + *) +- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_CXX=: + export_dynamic_flag_spec_CXX='${wl}-E' + ;; + esac + fi +- case "$host_cpu" in +- hppa*64*) +- hardcode_direct_CXX=no +- hardcode_shlibpath_var_CXX=no +- ;; +- ia64*) ++ case $host_cpu in ++ hppa*64*|ia64*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no +- hardcode_minus_L_CXX=yes # Not in the search PATH, +- # but as the default +- # location of the library. + ;; + *) + hardcode_direct_CXX=yes +@@ -12077,9 +12197,12 @@ + ld_shlibs_CXX=no + ;; + aCC*) +- case "$host_cpu" in +- hppa*64*|ia64*) +- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +@@ -12098,9 +12221,12 @@ + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then +- case "$host_cpu" in +- ia64*|hppa*64*) +- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +@@ -12114,6 +12240,20 @@ + ;; + esac + ;; ++ interix3*) ++ hardcode_direct_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_CXX='${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. ++ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ archive_expsym_cmds_CXX='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*) +@@ -12199,7 +12339,7 @@ + + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- whole_archive_flag_spec_CXX='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ whole_archive_flag_spec_CXX='${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++ +@@ -12242,7 +12382,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu | knetbsd*-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= +@@ -12396,19 +12536,6 @@ + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; +- sco*) +- archive_cmds_need_lc_CXX=no +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; + sunos4*) + case $cc_basename in + CC*) +@@ -12431,10 +12558,11 @@ + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ ++ archive_cmds_need_lc_CXX=yes + no_undefined_flag_CXX=' -zdefs' +- archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $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' + + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_shlibpath_var_CXX=no +@@ -12454,15 +12582,7 @@ + esac + link_all_deplibs_CXX=yes + +- # 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 -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is +@@ -12508,8 +12628,59 @@ + ;; + esac + ;; +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) ++ no_undefined_flag_CXX='${wl}-z,text' ++ archive_cmds_need_lc_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$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. ++ no_undefined_flag_CXX='${wl}-z,text' ++ allow_undefined_flag_CXX='${wl}-z,nodefs' + archive_cmds_need_lc_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ hardcode_libdir_separator_CXX=':' ++ link_all_deplibs_CXX=yes ++ export_dynamic_flag_spec_CXX='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac + ;; + tandem*) + case $cc_basename in +@@ -12566,7 +12737,7 @@ + # 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\"`" ++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` + + for p in `eval $output_verbose_link_cmd`; do + case $p in +@@ -12642,6 +12813,29 @@ + + $rm -f confest.$objext + ++# PORTME: override above test on systems where it is broken ++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. ++ predep_objects_CXX= ++ postdep_objects_CXX= ++ postdeps_CXX= ++ ;; ++ ++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. ++ postdeps_CXX='-lCstd -lCrun' ++ ;; ++ esac ++ ;; ++esac ++ ++ + case " $postdeps_CXX " in + *" -lc "*) archive_cmds_need_lc_CXX=no ;; + esac +@@ -12689,6 +12883,10 @@ + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; ++ interix3*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_CXX=-Kconform_pic +@@ -12697,7 +12895,7 @@ + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + ;; + *) +@@ -12758,15 +12956,15 @@ + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" ++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + lt_prog_compiler_pic_CXX='+Z' + fi + ;; + aCC*) + lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" +- case "$host_cpu" in ++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -12779,6 +12977,10 @@ + ;; + esac + ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) +@@ -12807,7 +13009,7 @@ + # Portland Group C++ compiler. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fpic' +- lt_prog_compiler_static_CXX='-static' ++ lt_prog_compiler_static_CXX='-Bstatic' + ;; + cxx*) + # Compaq C++ +@@ -12833,7 +13035,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -12858,15 +13060,6 @@ + ;; + psos*) + ;; +- sco*) +- case $cc_basename in +- CC*) +- lt_prog_compiler_pic_CXX='-fPIC' +- ;; +- *) +- ;; +- esac +- ;; + solaris*) + case $cc_basename in + CC*) +@@ -12908,7 +13101,14 @@ + ;; + esac + ;; +- unixware*) ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ esac + ;; + vxworks*) + ;; +@@ -12941,20 +13141,20 @@ + # 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}? :&$lt_compiler_flag :; t' \ ++ -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:12947: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13147: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12951: \$? = $ac_status" >&5 ++ echo "$as_me:13151: \$? = $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. +- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp +- $SED '/^$/d' conftest.err >conftest.er2 +- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then ++ $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 + lt_prog_compiler_pic_works_CXX=yes + fi + fi +@@ -12975,7 +13175,7 @@ + fi + + fi +-case "$host_os" in ++case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_CXX= +@@ -12985,6 +13185,48 @@ + ;; + esac + ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" ++echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 ++if test "${lt_prog_compiler_static_works_CXX+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_prog_compiler_static_works_CXX=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ 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>&5 ++ $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 ++ lt_prog_compiler_static_works_CXX=yes ++ fi ++ else ++ lt_prog_compiler_static_works_CXX=yes ++ fi ++ fi ++ $rm conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 ++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 ++ ++if test x"$lt_prog_compiler_static_works_CXX" = xyes; then ++ : ++else ++ lt_prog_compiler_static_CXX= ++fi ++ ++ + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 + if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +@@ -13003,25 +13245,25 @@ + # 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}? :&$lt_compiler_flag :; t' \ ++ -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:13009: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13251: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13013: \$? = $ac_status" >&5 ++ echo "$as_me:13255: \$? = $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 + # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp +- $SED '/^$/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ $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_cv_prog_compiler_c_o_CXX=yes + fi + fi +- chmod u+w . ++ chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation +@@ -13078,6 +13320,12 @@ + 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' + ;; ++ kfreebsd*-gnu) ++ link_all_deplibs_CXX=no ++ ;; ++ linux*) ++ link_all_deplibs_CXX=no ++ ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -13087,11 +13335,6 @@ + echo "${ECHO_T}$ld_shlibs_CXX" >&6 + test "$ld_shlibs_CXX" = 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 +- + # + # Do we need to explicitly link libc? + # +@@ -13124,6 +13367,7 @@ + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX ++ pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= +@@ -13284,7 +13528,8 @@ + 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' ++ $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' +@@ -13337,7 +13582,7 @@ + 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)' ++ 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"` +@@ -13375,7 +13620,14 @@ + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[123]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +@@ -13397,10 +13649,15 @@ + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +- *) # from 3.2 on ++ 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 + ;; + +@@ -13420,7 +13677,7 @@ + version_type=sunos + need_lib_prefix=no + need_version=no +- case "$host_cpu" in ++ case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes +@@ -13460,6 +13717,18 @@ + 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 ++ ;; ++ + irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; +@@ -13517,31 +13786,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 13524 "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 +@@ -13553,6 +13801,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + knetbsd*-gnu) + version_type=linux + need_lib_prefix=no +@@ -13602,6 +13862,7 @@ + + 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 +@@ -13645,13 +13906,6 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +-sco3.2v5*) +- version_type=osf +- 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 +- ;; +- + solaris*) + version_type=linux + need_lib_prefix=no +@@ -13677,7 +13931,7 @@ + need_version=yes + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++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' +@@ -13710,13 +13964,36 @@ + fi + ;; + +-uts4*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++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 ++ ;; ++ + *) + dynamic_linker=no + ;; +@@ -13725,6 +14002,11 @@ + echo "${ECHO_T}$dynamic_linker" >&6 + 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 ++ + echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 + hardcode_action_CXX= +@@ -13762,1339 +14044,995 @@ + enable_fast_install=needless + fi + +-striplib= +-old_striplib= +-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +-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" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +-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" +- 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 +-fi +- ;; +- *) +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- ;; +- esac +-fi + +-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= ++# 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 \ ++ compiler_CXX \ ++ CC_CXX \ ++ LD_CXX \ ++ lt_prog_compiler_wl_CXX \ ++ lt_prog_compiler_pic_CXX \ ++ lt_prog_compiler_static_CXX \ ++ lt_prog_compiler_no_builtin_flag_CXX \ ++ export_dynamic_flag_spec_CXX \ ++ thread_safe_flag_spec_CXX \ ++ whole_archive_flag_spec_CXX \ ++ enable_shared_with_static_runtimes_CXX \ ++ old_archive_cmds_CXX \ ++ old_archive_from_new_cmds_CXX \ ++ predep_objects_CXX \ ++ postdep_objects_CXX \ ++ predeps_CXX \ ++ postdeps_CXX \ ++ compiler_lib_search_path_CXX \ ++ archive_cmds_CXX \ ++ archive_expsym_cmds_CXX \ ++ postinstall_cmds_CXX \ ++ postuninstall_cmds_CXX \ ++ old_archive_from_expsyms_cmds_CXX \ ++ allow_undefined_flag_CXX \ ++ no_undefined_flag_CXX \ ++ export_symbols_cmds_CXX \ ++ hardcode_libdir_flag_spec_CXX \ ++ hardcode_libdir_flag_spec_ld_CXX \ ++ hardcode_libdir_separator_CXX \ ++ hardcode_automatic_CXX \ ++ module_cmds_CXX \ ++ module_expsym_cmds_CXX \ ++ lt_cv_prog_compiler_c_o_CXX \ ++ exclude_expsyms_CXX \ ++ include_expsyms_CXX; do + +- case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes ++ case $var in ++ old_archive_cmds_CXX | \ ++ old_archive_from_new_cmds_CXX | \ ++ archive_cmds_CXX | \ ++ archive_expsym_cmds_CXX | \ ++ module_cmds_CXX | \ ++ module_expsym_cmds_CXX | \ ++ old_archive_from_expsyms_cmds_CXX | \ ++ export_symbols_cmds_CXX | \ ++ 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 + +- mingw* | pw32*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; ++cfgfile="$ofile" + +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; ++ cat <<__EOF__ >> "$cfgfile" ++# ### BEGIN LIBTOOL TAG CONFIG: $tagname + +- darwin*) +- # if libdl is installed we need to link against it +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-int +-main () +-{ +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dl_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL + +-ac_cv_lib_dl_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +-if test $ac_cv_lib_dl_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared + +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes ++# Whether or not to build static libraries. ++build_old_libs=$enable_static + +-fi ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc_CXX + +- ;; ++# Whether or not to disallow shared libs when runtime libs are static ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX + +- *) +- echo "$as_me:$LINENO: checking for shl_load" >&5 +-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +-if test "${ac_cv_func_shl_load+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. */ +-/* Define shl_load to an innocuous variant, in case declares shl_load. +- For example, HP-UX 11i declares gettimeofday. */ +-#define shl_load innocuous_shl_load ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shl_load (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os + +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os + +-#undef shl_load ++# An echo program that does not interpret backslashes. ++echo=$lt_echo + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char shl_load (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_shl_load) || defined (__stub___shl_load) +-choke me +-#else +-char (*f) () = shl_load; +-#endif +-#ifdef __cplusplus +-} +-#endif ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS + +-int +-main () +-{ +-return f != shl_load; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_shl_load=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++# A C compiler. ++LTCC=$lt_LTCC + +-ac_cv_func_shl_load=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +-if test $ac_cv_func_shl_load = yes; then +- lt_cv_dlopen="shl_load" +-else +- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char shl_load (); +-int +-main () +-{ +-shl_load (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dld_shl_load=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++# A language-specific compiler. ++CC=$lt_compiler_CXX + +-ac_cv_lib_dld_shl_load=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +-if test $ac_cv_lib_dld_shl_load = yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +-else +- echo "$as_me:$LINENO: checking for dlopen" >&5 +-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +-if test "${ac_cv_func_dlopen+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. */ +-/* Define dlopen to an innocuous variant, in case declares dlopen. +- For example, HP-UX 11i declares gettimeofday. */ +-#define dlopen innocuous_dlopen ++# Is the compiler the GNU C compiler? ++with_gcc=$GCC_CXX + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char dlopen (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ ++# An ERE matcher. ++EGREP=$lt_EGREP + +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif ++# The linker used to build libraries. ++LD=$lt_LD_CXX + +-#undef dlopen ++# Whether we need hard or soft links. ++LN_S=$lt_LN_S + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_dlopen) || defined (__stub___dlopen) +-choke me +-#else +-char (*f) () = dlopen; +-#endif +-#ifdef __cplusplus +-} +-#endif ++# A BSD-compatible nm program. ++NM=$lt_NM + +-int +-main () +-{ +-return f != dlopen; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++# A symbol stripping program ++STRIP=$lt_STRIP + +-ac_cv_func_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +-if test $ac_cv_func_dlopen = yes; then +- lt_cv_dlopen="dlopen" +-else +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++# Used to examine libraries when file_magic_cmd begins "file" ++MAGIC_CMD=$MAGIC_CMD + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-int +-main () +-{ +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dl_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++# Used on cygwin: DLL creation program. ++DLLTOOL="$DLLTOOL" + +-ac_cv_lib_dl_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +-if test $ac_cv_lib_dl_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsvld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++# Used on cygwin: object dumper. ++OBJDUMP="$OBJDUMP" + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-int +-main () +-{ +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_svld_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++# Used on cygwin: assembler. ++AS="$AS" + +-ac_cv_lib_svld_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +-if test $ac_cv_lib_svld_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +-else +- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir + +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dld_link (); +-int +-main () +-{ +-dld_link (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dld_dld_link=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds + +-ac_cv_lib_dld_dld_link=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +-if test $ac_cv_lib_dld_dld_link = yes; then +- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" +-fi ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl_CXX + ++# Object file suffix (normally "o"). ++objext="$ac_objext" + +-fi ++# Old archive suffix (normally "a"). ++libext="$libext" + ++# Shared library suffix (normally ".so"). ++shrext_cmds='$shrext_cmds' + +-fi ++# Executable file suffix (normally ""). ++exeext="$exeext" + ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic_CXX ++pic_mode=$pic_mode + +-fi ++# 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_cv_prog_compiler_c_o_CXX + +-fi ++# 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 + +-fi ++# Do we need a version for libraries? ++need_version=$need_version + +- ;; +- esac ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen + +- if test "x$lt_cv_dlopen" != xno; then +- enable_dlopen=yes +- else +- enable_dlopen=no +- fi ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self + +- case $lt_cv_dlopen in +- dlopen) +- save_CPPFLAGS="$CPPFLAGS" +- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static + +- save_LDFLAGS="$LDFLAGS" +- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static_CXX + +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX + +- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 +-if test "${lt_cv_dlopen_self+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test "$cross_compiling" = yes; then : +- lt_cv_dlopen_self=cross +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < +-#endif ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX + +-#include ++# Compiler flag to generate thread-safe objects. ++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX + +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif ++# Library versioning type. ++version_type=$version_type + +-/* 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 ++# Format of library name prefix. ++libname_spec=$lt_libname_spec + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif ++# 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 + +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec + +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } ++# Commands used to build and install an old-style archive. ++RANLIB=$lt_RANLIB ++old_archive_cmds=$lt_old_archive_cmds_CXX ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds + +- exit (status); +-} +-EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; +- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; +- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; +- esac +- else : +- # compilation failed +- lt_cv_dlopen_self=no +- fi +-fi +-rm -fr conftest* ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX + ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX + +-fi +-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self" >&6 ++# Commands used to build and install a shared archive. ++archive_cmds=$lt_archive_cmds_CXX ++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX ++postinstall_cmds=$lt_postinstall_cmds ++postuninstall_cmds=$lt_postuninstall_cmds + +- if test "x$lt_cv_dlopen_self" = xyes; then +- LDFLAGS="$LDFLAGS $link_static_flag" +- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 +-if test "${lt_cv_dlopen_self_static+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test "$cross_compiling" = yes; then : +- lt_cv_dlopen_self_static=cross +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < +-#endif ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib + +-#include ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predep_objects=$lt_predep_objects_CXX + +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdep_objects=$lt_postdep_objects_CXX + +-/* 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 ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predeps=$lt_predeps_CXX + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdeps=$lt_postdeps_CXX + +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX + +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method + +- exit (status); +-} +-EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; +- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; +- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; +- esac +- else : +- # compilation failed +- lt_cv_dlopen_self_static=no +- fi +-fi +-rm -fr conftest* ++# Command to use when deplibs_check_method == file_magic. ++file_magic_cmd=$lt_file_magic_cmd + ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag_CXX + +-fi +-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +- fi ++# Flag that forces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag_CXX + +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +- ;; +- esac ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds + +- case $lt_cv_dlopen_self in +- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; +- *) enable_dlopen_self=unknown ;; +- esac ++# Same as above, but a single script fragment to be evaled but not shown. ++finish_eval=$lt_finish_eval + +- 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 ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + ++# Transform the output of nm in a proper C declaration ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +-# 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 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 \ +- compiler_CXX \ +- CC_CXX \ +- LD_CXX \ +- lt_prog_compiler_wl_CXX \ +- lt_prog_compiler_pic_CXX \ +- lt_prog_compiler_static_CXX \ +- lt_prog_compiler_no_builtin_flag_CXX \ +- export_dynamic_flag_spec_CXX \ +- thread_safe_flag_spec_CXX \ +- whole_archive_flag_spec_CXX \ +- enable_shared_with_static_runtimes_CXX \ +- old_archive_cmds_CXX \ +- old_archive_from_new_cmds_CXX \ +- predep_objects_CXX \ +- postdep_objects_CXX \ +- predeps_CXX \ +- postdeps_CXX \ +- compiler_lib_search_path_CXX \ +- archive_cmds_CXX \ +- archive_expsym_cmds_CXX \ +- postinstall_cmds_CXX \ +- postuninstall_cmds_CXX \ +- old_archive_from_expsyms_cmds_CXX \ +- allow_undefined_flag_CXX \ +- no_undefined_flag_CXX \ +- export_symbols_cmds_CXX \ +- hardcode_libdir_flag_spec_CXX \ +- hardcode_libdir_flag_spec_ld_CXX \ +- hardcode_libdir_separator_CXX \ +- hardcode_automatic_CXX \ +- module_cmds_CXX \ +- module_expsym_cmds_CXX \ +- lt_cv_prog_compiler_c_o_CXX \ +- exclude_expsyms_CXX \ +- include_expsyms_CXX; do ++# Transform the output of nm in a C name address pair ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +- case $var in +- old_archive_cmds_CXX | \ +- old_archive_from_new_cmds_CXX | \ +- archive_cmds_CXX | \ +- archive_expsym_cmds_CXX | \ +- module_cmds_CXX | \ +- module_expsym_cmds_CXX | \ +- old_archive_from_expsyms_cmds_CXX | \ +- export_symbols_cmds_CXX | \ +- 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 ++# This is the shared library runtime path variable. ++runpath_var=$runpath_var + +- case $lt_echo in +- *'\$0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` +- ;; +- esac ++# This is the shared library path variable. ++shlibpath_var=$shlibpath_var + +-cfgfile="$ofile" ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +- cat <<__EOF__ >> "$cfgfile" +-# ### BEGIN LIBTOOL TAG CONFIG: $tagname ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action_CXX + +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs + +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX + +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared ++# If ld is used when linking, flag to hardcode \$libdir into ++# a binary during linking. This must work even if \$libdir does ++# not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX + +-# Whether or not to build static libraries. +-build_old_libs=$enable_static ++# Whether we need a single -rpath flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX + +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc_CXX ++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the ++# resulting binary. ++hardcode_direct=$hardcode_direct_CXX + +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX ++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the ++# resulting binary. ++hardcode_minus_L=$hardcode_minus_L_CXX + +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install ++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into ++# the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX + +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os ++# Set to yes if building a shared library automatically hardcodes DIR into the library ++# and all subsequent libraries and executables linked against it. ++hardcode_automatic=$hardcode_automatic_CXX + +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at relink time. ++variables_saved_for_relink="$variables_saved_for_relink" + +-# An echo program that does not interpret backslashes. +-echo=$lt_echo ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs_CXX + +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS ++# Compile-time system search path for libraries ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +-# A C compiler. +-LTCC=$lt_LTCC ++# Run-time system search path for libraries ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +-# A language-specific compiler. +-CC=$lt_compiler_CXX ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path="$fix_srcfile_path_CXX" + +-# Is the compiler the GNU C compiler? +-with_gcc=$GCC_CXX ++# Set to yes if exported symbols are required. ++always_export_symbols=$always_export_symbols_CXX + +-# An ERE matcher. +-EGREP=$lt_EGREP ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds_CXX + +-# The linker used to build libraries. +-LD=$lt_LD_CXX ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds + +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms_CXX + +-# A BSD-compatible nm program. +-NM=$lt_NM ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms_CXX + +-# A symbol stripping program +-STRIP=$lt_STRIP ++# ### END LIBTOOL TAG CONFIG: $tagname + +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD ++__EOF__ + +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" + +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" ++else ++ # If there is no Makefile yet, we rely on a make rule to execute ++ # `config.status --recheck' to rerun these tests and create the ++ # libtool script then. ++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++ if test -f "$ltmain_in"; then ++ test -f Makefile && make "$ltmain" ++ fi ++fi + +-# Used on cygwin: assembler. +-AS="$AS" + +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds ++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 + +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_CXX ++ else ++ tagname="" ++ fi ++ ;; + +-# Object file suffix (normally "o"). +-objext="$ac_objext" ++ F77) ++ if test -n "$F77" && test "X$F77" != "Xno"; then + +-# Old archive suffix (normally "a"). +-libext="$libext" ++ac_ext=f ++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_f77_compiler_gnu + +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' + +-# Executable file suffix (normally ""). +-exeext="$exeext" ++archive_cmds_need_lc_F77=no ++allow_undefined_flag_F77= ++always_export_symbols_F77=no ++archive_expsym_cmds_F77= ++export_dynamic_flag_spec_F77= ++hardcode_direct_F77=no ++hardcode_libdir_flag_spec_F77= ++hardcode_libdir_flag_spec_ld_F77= ++hardcode_libdir_separator_F77= ++hardcode_minus_L_F77=no ++hardcode_automatic_F77=no ++module_cmds_F77= ++module_expsym_cmds_F77= ++link_all_deplibs_F77=unknown ++old_archive_cmds_F77=$old_archive_cmds ++no_undefined_flag_F77= ++whole_archive_flag_spec_F77= ++enable_shared_with_static_runtimes_F77=no + +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_CXX +-pic_mode=$pic_mode ++# Source file extension for f77 test sources. ++ac_ext=f + +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len ++# Object file extension for compiled f77 test sources. ++objext=o ++objext_F77=$objext + +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX ++# Code to be used in simple compile tests ++lt_simple_compile_test_code=" subroutine t\n return\n end\n" + +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks ++# Code to be used in simple link tests ++lt_simple_link_test_code=" program t\n end\n" + +-# 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 ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. + +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} + +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static_CXX ++# Allow CC to be a program name with arguments. ++compiler=$CC + +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX + +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX ++# save warnings/boilerplate of simple test code ++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* + +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX ++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* + +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX + +-# Library versioning type. +-version_type=$version_type ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${F77-"f77"} ++compiler=$CC ++compiler_F77=$CC ++for cc_temp in $compiler""; 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-%%"` + +-# 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 ++echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 ++echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++echo "${ECHO_T}$can_build_shared" >&6 + +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec ++echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 ++test "$can_build_shared" = "no" && enable_shared=no + +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_old_archive_cmds_CXX +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds ++# 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 ++echo "$as_me:$LINENO: result: $enable_shared" >&5 ++echo "${ECHO_T}$enable_shared" >&6 + +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX ++echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 ++# Make sure either enable_shared or enable_static is yes. ++test "$enable_shared" = yes || enable_static=yes ++echo "$as_me:$LINENO: result: $enable_static" >&5 ++echo "${ECHO_T}$enable_static" >&6 + +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX ++GCC_F77="$G77" ++LD_F77="$LD" + +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_archive_cmds_CXX +-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds ++lt_prog_compiler_wl_F77= ++lt_prog_compiler_pic_F77= ++lt_prog_compiler_static_F77= + +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_module_cmds_CXX +-module_expsym_cmds=$lt_module_expsym_cmds_CXX ++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 + +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib ++ if test "$GCC" = yes; then ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_static_F77='-static' + +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_predep_objects_CXX ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_F77='-Bstatic' ++ fi ++ ;; + +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_postdep_objects_CXX ++ 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_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' ++ ;; + +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_predeps_CXX ++ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; + +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_postdeps_CXX ++ 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_prog_compiler_pic_F77='-DDLL_EXPORT' ++ ;; + +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic_F77='-fno-common' ++ ;; + +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method ++ interix3*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; + +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ lt_prog_compiler_can_build_shared_F77=no ++ enable_shared=no ++ ;; + +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag_CXX ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic_F77=-Kconform_pic ++ fi ++ ;; + +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag_CXX ++ 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_prog_compiler_pic_F77='-fPIC' ++ ;; ++ esac ++ ;; + +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds ++ *) ++ lt_prog_compiler_pic_F77='-fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_F77='-Bstatic' ++ else ++ lt_prog_compiler_static_F77='-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_prog_compiler_pic_F77='-qnocommon' ++ lt_prog_compiler_wl_F77='-Wl,' ++ ;; ++ esac ++ ;; + +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval ++ 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_prog_compiler_pic_F77='-DDLL_EXPORT' ++ ;; + +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++ hpux9* | hpux10* | hpux11*) ++ lt_prog_compiler_wl_F77='-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_prog_compiler_pic_F77='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ lt_prog_compiler_static_F77='${wl}-a ${wl}archive' ++ ;; + +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++ irix5* | irix6* | nonstopux*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ # PIC (with -KPIC) is the default. ++ lt_prog_compiler_static_F77='-non_shared' ++ ;; + +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ newsos6) ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; + +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var +- +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action_CXX ++ linux*) ++ case $cc_basename in ++ icc* | ecc*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_pic_F77='-fpic' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; ++ ccc*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ # All Alpha code is PIC. ++ lt_prog_compiler_static_F77='-non_shared' ++ ;; ++ esac ++ ;; + +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs ++ osf3* | osf4* | osf5*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ # All OSF/1 code is PIC. ++ lt_prog_compiler_static_F77='-non_shared' ++ ;; + +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX ++ solaris*) ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ lt_prog_compiler_wl_F77='-Qoption ld ';; ++ *) ++ lt_prog_compiler_wl_F77='-Wl,';; ++ esac ++ ;; + +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX ++ sunos4*) ++ lt_prog_compiler_wl_F77='-Qoption ld ' ++ lt_prog_compiler_pic_F77='-PIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; + +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; + +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$hardcode_direct_CXX ++ sysv4*MP*) ++ if test -d /usr/nec ;then ++ lt_prog_compiler_pic_F77='-Kconform_pic' ++ lt_prog_compiler_static_F77='-Bstatic' ++ fi ++ ;; + +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$hardcode_minus_L_CXX ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; + +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX ++ unicos*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_can_build_shared_F77=no ++ ;; + +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$hardcode_automatic_CXX ++ uts4*) ++ lt_prog_compiler_pic_F77='-pic' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; + +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" ++ *) ++ lt_prog_compiler_can_build_shared_F77=no ++ ;; ++ esac ++ fi + +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs_CXX ++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 + +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$lt_prog_compiler_pic_F77"; then + +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 ++if test "${lt_prog_compiler_pic_works_F77+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_prog_compiler_pic_works_F77=no ++ ac_outfile=conftest.$ac_objext ++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$lt_prog_compiler_pic_F77" ++ # 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:14839: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:14843: \$? = $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. ++ $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 ++ lt_prog_compiler_pic_works_F77=yes ++ fi ++ fi ++ $rm conftest* + +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_CXX" ++fi ++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 + +-# Set to yes if exported symbols are required. +-always_export_symbols=$always_export_symbols_CXX ++if test x"$lt_prog_compiler_pic_works_F77" = xyes; then ++ case $lt_prog_compiler_pic_F77 in ++ "" | " "*) ;; ++ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; ++ esac ++else ++ lt_prog_compiler_pic_F77= ++ lt_prog_compiler_can_build_shared_F77=no ++fi + +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds_CXX ++fi ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic_F77= ++ ;; ++ *) ++ lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" ++ ;; ++esac + +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" ++echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 ++if test "${lt_prog_compiler_static_works_F77+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_prog_compiler_static_works_F77=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ 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>&5 ++ $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 ++ lt_prog_compiler_static_works_F77=yes ++ fi ++ else ++ lt_prog_compiler_static_works_F77=yes ++ fi ++ fi ++ $rm conftest* ++ LDFLAGS="$save_LDFLAGS" + +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms_CXX ++fi ++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 ++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 + +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms_CXX ++if test x"$lt_prog_compiler_static_works_F77" = xyes; then ++ : ++else ++ lt_prog_compiler_static_F77= ++fi + +-# ### END LIBTOOL TAG CONFIG: $tagname + +-__EOF__ ++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 ++if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_c_o_F77=no ++ $rm -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ printf "$lt_simple_compile_test_code" > conftest.$ac_ext + ++ 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:14943: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:14947: \$? = $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 ++ # 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_cv_prog_compiler_c_o_F77=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $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* + +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi + fi ++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 + + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-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 +- +- else +- tagname="" +- fi +- ;; +- +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- +-ac_ext=f +-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' +-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_f77_compiler_gnu +- +- +-archive_cmds_need_lc_F77=no +-allow_undefined_flag_F77= +-always_export_symbols_F77=no +-archive_expsym_cmds_F77= +-export_dynamic_flag_spec_F77= +-hardcode_direct_F77=no +-hardcode_libdir_flag_spec_F77= +-hardcode_libdir_flag_spec_ld_F77= +-hardcode_libdir_separator_F77= +-hardcode_minus_L_F77=no +-hardcode_automatic_F77=no +-module_cmds_F77= +-module_expsym_cmds_F77= +-link_all_deplibs_F77=unknown +-old_archive_cmds_F77=$old_archive_cmds +-no_undefined_flag_F77= +-whole_archive_flag_spec_F77= +-enable_shared_with_static_runtimes_F77=no +- +-# Source file extension for f77 test sources. +-ac_ext=f +- +-# Object file extension for compiled f77 test sources. +-objext=o +-objext_F77=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code=" subroutine t\n return\n end\n" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code=" program t\n end\n" +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +- +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} +- +-# Allow CC to be a program name with arguments. +-compiler=$CC +- +- +-# save warnings/boilerplate of simple test code +-ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext +-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +-_lt_compiler_boilerplate=`cat conftest.err` +-$rm conftest* +- +-ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext +-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +-_lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++hard_links="nottested" ++if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 ++ 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 ++ echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6 ++ if test "$hard_links" = no; then ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi + ++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 + +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${F77-"f77"} +-compiler=$CC +-compiler_F77=$CC +-for cc_temp in $compiler""; do ++ runpath_var= ++ allow_undefined_flag_F77= ++ enable_shared_with_static_runtimes_F77=no ++ archive_cmds_F77= ++ archive_expsym_cmds_F77= ++ old_archive_From_new_cmds_F77= ++ old_archive_from_expsyms_cmds_F77= ++ export_dynamic_flag_spec_F77= ++ whole_archive_flag_spec_F77= ++ thread_safe_flag_spec_F77= ++ hardcode_libdir_flag_spec_F77= ++ hardcode_libdir_flag_spec_ld_F77= ++ hardcode_libdir_separator_F77= ++ hardcode_direct_F77=no ++ hardcode_minus_L_F77=no ++ hardcode_shlibpath_var_F77=unsupported ++ link_all_deplibs_F77=unknown ++ hardcode_automatic_F77=no ++ module_cmds_F77= ++ module_expsym_cmds_F77= ++ always_export_symbols_F77=no ++ export_symbols_cmds_F77='$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 ++ include_expsyms_F77= ++ # 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'. ++ exclude_expsyms_F77="_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. ++ for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; +@@ -15104,500 +15042,459 @@ + done + cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + ++ 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 + +-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 +-echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-echo "${ECHO_T}$can_build_shared" >&6 +- +-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +-test "$can_build_shared" = "no" && enable_shared=no +- +-# 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 +-echo "$as_me:$LINENO: result: $enable_shared" >&5 +-echo "${ECHO_T}$enable_shared" >&6 +- +-echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-echo "$as_me:$LINENO: result: $enable_static" >&5 +-echo "${ECHO_T}$enable_static" >&6 +- +-test "$ld_shlibs_F77" = no && can_build_shared=no +- +-GCC_F77="$G77" +-LD_F77="$LD" ++ ld_shlibs_F77=yes ++ if test "$with_gnu_ld" = yes; then ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ wlarc='${wl}' + +-lt_prog_compiler_wl_F77= +-lt_prog_compiler_pic_F77= +-lt_prog_compiler_static_F77= ++ # 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 ++ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' ++ export_dynamic_flag_spec_F77='${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 ++ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ whole_archive_flag_spec_F77= ++ 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 + +-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ++ # 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 ++ ld_shlibs_F77=no ++ cat <&2 + +- if test "$GCC" = yes; then +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_static_F77='-static' ++*** 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. + +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static_F77='-Bstatic' ++EOF + 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_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' +- ;; +- +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; ++ archive_cmds_F77='$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)' ++ hardcode_libdir_flag_spec_F77='-L$libdir' ++ hardcode_minus_L_F77=yes + +- 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_prog_compiler_pic_F77='-DDLL_EXPORT' ++ # 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. ++ ld_shlibs_F77=no + ;; + +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- lt_prog_compiler_pic_F77='-fno-common' ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ allow_undefined_flag_F77=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ ld_shlibs_F77=no ++ fi + ;; + +- msdosdjgpp*) +- # Just because we use GCC doesn't mean we suddenly get shared libraries +- # on systems that don't support them. +- lt_prog_compiler_can_build_shared_F77=no +- enable_shared=no +- ;; ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec_F77='-L$libdir' ++ allow_undefined_flag_F77=unsupported ++ always_export_symbols_F77=no ++ enable_shared_with_static_runtimes_F77=yes ++ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + +- sysv4*MP*) +- if test -d /usr/nec; then +- lt_prog_compiler_pic_F77=-Kconform_pic ++ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++ archive_cmds_F77='$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... ++ archive_expsym_cmds_F77='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 ++ ld_shlibs_F77=no + 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_prog_compiler_pic_F77='-fPIC' +- ;; +- esac ++ interix3*) ++ hardcode_direct_F77=no ++ hardcode_shlibpath_var_F77=no ++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_F77='${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. ++ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ 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' + ;; + +- *) +- lt_prog_compiler_pic_F77='-fPIC' +- ;; +- esac +- else +- # PORTME Check for flag to pass linker flags through the system compiler. +- case $host_os in +- aix*) +- lt_prog_compiler_wl_F77='-Wl,' +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static_F77='-Bstatic' ++ 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 ++ whole_archive_flag_spec_F77='${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 ++ whole_archive_flag_spec_F77='${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 ++ archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++ if test $supports_anon_versioning = yes; then ++ archive_expsym_cmds_F77='$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 ++ link_all_deplibs_F77=no + else +- lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' ++ ld_shlibs_F77=no + fi + ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- lt_prog_compiler_pic_F77='-qnocommon' +- lt_prog_compiler_wl_F77='-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_prog_compiler_pic_F77='-DDLL_EXPORT' +- ;; + +- hpux9* | hpux10* | hpux11*) +- lt_prog_compiler_wl_F77='-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_prog_compiler_pic_F77='+Z' +- ;; +- esac +- # Is there a better lt_prog_compiler_static that works with the bundled CC? +- lt_prog_compiler_static_F77='${wl}-a ${wl}archive' ++ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ wlarc= ++ else ++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi + ;; + +- irix5* | irix6* | nonstopux*) +- lt_prog_compiler_wl_F77='-Wl,' +- # PIC (with -KPIC) is the default. +- lt_prog_compiler_static_F77='-non_shared' +- ;; ++ solaris*) ++ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++ ld_shlibs_F77=no ++ cat <&2 + +- newsos6) +- lt_prog_compiler_pic_F77='-KPIC' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; ++*** 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. + +- linux*) +- case $cc_basename in +- icc* | ecc*) +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_pic_F77='-KPIC' +- lt_prog_compiler_static_F77='-static' +- ;; +- pgcc* | pgf77* | pgf90*) +- # Portland Group compilers (*not* the Pentium gcc compiler, +- # which looks to be a dead project) +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_pic_F77='-fpic' +- lt_prog_compiler_static_F77='-static' +- ;; +- ccc*) +- lt_prog_compiler_wl_F77='-Wl,' +- # All Alpha code is PIC. +- lt_prog_compiler_static_F77='-non_shared' +- ;; +- esac ++EOF ++ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs_F77=no ++ fi + ;; + +- osf3* | osf4* | osf5*) +- lt_prog_compiler_wl_F77='-Wl,' +- # All OSF/1 code is PIC. +- lt_prog_compiler_static_F77='-non_shared' +- ;; ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) ++ ld_shlibs_F77=no ++ cat <<_LT_EOF 1>&2 + +- sco3.2v5*) +- lt_prog_compiler_pic_F77='-Kpic' +- lt_prog_compiler_static_F77='-dn' +- ;; ++*** 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. + +- solaris*) +- lt_prog_compiler_pic_F77='-KPIC' +- lt_prog_compiler_static_F77='-Bstatic' +- case $cc_basename in +- f77* | f90* | f95*) +- lt_prog_compiler_wl_F77='-Qoption ld ';; +- *) +- lt_prog_compiler_wl_F77='-Wl,';; ++_LT_EOF ++ ;; ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ ld_shlibs_F77=no ++ fi ++ ;; + esac + ;; + + sunos4*) +- lt_prog_compiler_wl_F77='-Qoption ld ' +- lt_prog_compiler_pic_F77='-PIC' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; +- +- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_pic_F77='-KPIC' +- lt_prog_compiler_static_F77='-Bstatic' ++ archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ hardcode_direct_F77=yes ++ hardcode_shlibpath_var_F77=no + ;; + +- sysv4*MP*) +- if test -d /usr/nec ;then +- lt_prog_compiler_pic_F77='-Kconform_pic' +- lt_prog_compiler_static_F77='-Bstatic' ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs_F77=no + fi + ;; ++ esac + +- unicos*) +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_can_build_shared_F77=no ++ if test "$ld_shlibs_F77" = no; then ++ runpath_var= ++ hardcode_libdir_flag_spec_F77= ++ export_dynamic_flag_spec_F77= ++ whole_archive_flag_spec_F77= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ allow_undefined_flag_F77=unsupported ++ always_export_symbols_F77=yes ++ archive_expsym_cmds_F77='$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. ++ hardcode_minus_L_F77=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ hardcode_direct_F77=unsupported ++ fi + ;; + +- uts4*) +- lt_prog_compiler_pic_F77='-pic' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; ++ 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 ++ export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ else ++ export_symbols_cmds_F77='$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 + +- *) +- lt_prog_compiler_can_build_shared_F77=no +- ;; +- esac +- fi ++ # 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 + +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi + +-# +-# Check to make sure the PIC flag actually works. +-# +-if test -n "$lt_prog_compiler_pic_F77"; then ++ # 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. + +-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 +-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_prog_compiler_pic_works_F77=no +- ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="$lt_prog_compiler_pic_F77" +- # 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}? :&$lt_compiler_flag :; t' \ +- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15382: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&5 +- echo "$as_me:15386: \$? = $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. +- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp +- $SED '/^$/d' conftest.err >conftest.er2 +- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works_F77=yes +- fi +- fi +- $rm conftest* ++ archive_cmds_F77='' ++ hardcode_direct_F77=yes ++ hardcode_libdir_separator_F77=':' ++ link_all_deplibs_F77=yes + +-fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 ++ 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 ++ hardcode_direct_F77=yes ++ else ++ # We have old collect2 ++ hardcode_direct_F77=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 ++ hardcode_minus_L_F77=yes ++ hardcode_libdir_flag_spec_F77='-L$libdir' ++ hardcode_libdir_separator_F77= ++ 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 + +-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then +- case $lt_prog_compiler_pic_F77 in +- "" | " "*) ;; +- *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; +- esac +-else +- lt_prog_compiler_pic_F77= +- lt_prog_compiler_can_build_shared_F77=no +-fi ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ always_export_symbols_F77=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. ++ allow_undefined_flag_F77='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ cat >conftest.$ac_ext <<_ACEOF ++ program main + +-fi +-case "$host_os" in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- lt_prog_compiler_pic_F77= +- ;; +- *) +- lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" +- ;; +-esac ++ end ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_f77_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + +-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++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 + else +- lt_cv_prog_compiler_c_o_F77=no +- $rm -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- 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}? :&$lt_compiler_flag :; t' \ +- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15444: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&5 +- echo "$as_me:15448: \$? = $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 +- # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp +- $SED '/^$/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_c_o_F77=yes +- fi +- fi +- chmod u+w . +- $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* +- +-fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 +- ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-hard_links="nottested" +-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 +- 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 +- echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6 +- if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} +- need_locks=warn +- fi +-else +- need_locks=no + fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 ++ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" ++ archive_expsym_cmds_F77="\$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 ++ hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' ++ allow_undefined_flag_F77="-z nodefs" ++ archive_expsym_cmds_F77="\$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. ++ cat >conftest.$ac_ext <<_ACEOF ++ program main + +- runpath_var= +- allow_undefined_flag_F77= +- enable_shared_with_static_runtimes_F77=no +- archive_cmds_F77= +- archive_expsym_cmds_F77= +- old_archive_From_new_cmds_F77= +- old_archive_from_expsyms_cmds_F77= +- export_dynamic_flag_spec_F77= +- whole_archive_flag_spec_F77= +- thread_safe_flag_spec_F77= +- hardcode_libdir_flag_spec_F77= +- hardcode_libdir_flag_spec_ld_F77= +- hardcode_libdir_separator_F77= +- hardcode_direct_F77=no +- hardcode_minus_L_F77=no +- hardcode_shlibpath_var_F77=unsupported +- link_all_deplibs_F77=unknown +- hardcode_automatic_F77=no +- module_cmds_F77= +- module_expsym_cmds_F77= +- always_export_symbols_F77=no +- export_symbols_cmds_F77='$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 +- include_expsyms_F77= +- # 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'. +- exclude_expsyms_F77="_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. +- for cc_temp in $compiler""; 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-%%"` +- +- 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 +- ;; +- openbsd*) +- with_gnu_ld=no +- ;; +- esac +- +- ld_shlibs_F77=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 +- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' +- export_dynamic_flag_spec_F77='${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 +- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- whole_archive_flag_spec_F77= +- 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 ++ end ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_f77_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + +- # 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 +- ld_shlibs_F77=no +- cat <&2 ++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 ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-*** 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. ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +-EOF ++ hardcode_libdir_flag_spec_F77='${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. ++ no_undefined_flag_F77=' ${wl}-bernotok' ++ allow_undefined_flag_F77=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ whole_archive_flag_spec_F77='$convenience' ++ archive_cmds_need_lc_F77=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ archive_expsym_cmds_F77="\$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 + ;; + +@@ -15605,685 +15502,348 @@ + archive_cmds_F77='$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)' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=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. ++ # see comment about different semantics on the GNU ld section + ld_shlibs_F77=no + ;; + +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- allow_undefined_flag_F77=unsupported +- # Joseph Beckenbach says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- ld_shlibs_F77=no +- fi ++ bsdi[45]*) ++ export_dynamic_flag_spec_F77=-rdynamic + ;; + + cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, +- # as there is no search path for DLLs. +- hardcode_libdir_flag_spec_F77='-L$libdir' ++ # 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. ++ hardcode_libdir_flag_spec_F77=' ' + allow_undefined_flag_F77=unsupported +- always_export_symbols_F77=no ++ # 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. ++ archive_cmds_F77='$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. ++ old_archive_From_new_cmds_F77='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ fix_srcfile_path_F77='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_F77=yes +- export_symbols_cmds_F77='$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 +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- archive_expsym_cmds_F77='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}--image-base=0x10000000 ${wl}--out-implib,$lib' +- else +- ld_shlibs_F77=no +- fi + ;; + +- 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 +- whole_archive_flag_spec_F77='${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* ) # Portland Group f77 and f90 compilers +- whole_archive_flag_spec_F77='${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 +- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[012]) ++ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[012]) ++ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ archive_cmds_need_lc_F77=no ++ hardcode_direct_F77=no ++ hardcode_automatic_F77=yes ++ hardcode_shlibpath_var_F77=unsupported ++ whole_archive_flag_spec_F77='' ++ link_all_deplibs_F77=yes ++ if test "$GCC" = yes ; then ++ output_verbose_link_cmd='echo' ++ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ module_cmds_F77='$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 ++ archive_expsym_cmds_F77='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}' ++ module_expsym_cmds_F77='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' ++ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ module_cmds_F77='$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 ++ archive_expsym_cmds_F77='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}' ++ module_expsym_cmds_F77='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}' ++ ;; ++ *) ++ ld_shlibs_F77=no ++ ;; ++ esac ++ fi ++ ;; + +- if test $supports_anon_versioning = yes; then +- archive_expsym_cmds_F77='$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 +- ld_shlibs_F77=no +- fi ++ dgux*) ++ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec_F77='-L$libdir' ++ hardcode_shlibpath_var_F77=no + ;; + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' +- wlarc= +- else +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- fi ++ freebsd1*) ++ ld_shlibs_F77=no + ;; + +- solaris* | sysv5*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- ld_shlibs_F77=no +- cat <&2 ++ # 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*) ++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ hardcode_libdir_flag_spec_F77='-R$libdir' ++ hardcode_direct_F77=yes ++ hardcode_shlibpath_var_F77=no ++ ;; + +-*** 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. ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct_F77=yes ++ hardcode_minus_L_F77=yes ++ hardcode_shlibpath_var_F77=no ++ ;; + +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- ld_shlibs_F77=no +- fi ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | dragonfly*) ++ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec_F77='-R$libdir' ++ hardcode_direct_F77=yes ++ hardcode_shlibpath_var_F77=no + ;; + +- sunos4*) +- archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- wlarc= ++ # GNU/kFreeBSD uses gcc -shared to do shared libraries. ++ kfreebsd*-gnu) ++ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no ++ link_all_deplibs_F77=no + ;; + +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ hpux9*) ++ if test "$GCC" = yes; then ++ archive_cmds_F77='$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 +- ld_shlibs_F77=no ++ archive_cmds_F77='$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 +- ;; +- esac ++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_F77=: ++ hardcode_direct_F77=yes + +- if test "$ld_shlibs_F77" = no; then +- runpath_var= +- hardcode_libdir_flag_spec_F77= +- export_dynamic_flag_spec_F77= +- whole_archive_flag_spec_F77= +- fi +- else +- # PORTME fill in a description of your system's linker (not GNU ld) +- case $host_os in +- aix3*) +- allow_undefined_flag_F77=unsupported +- always_export_symbols_F77=yes +- archive_expsym_cmds_F77='$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. ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. + hardcode_minus_L_F77=yes +- if test "$GCC" = yes && test -z "$link_static_flag"; then +- # Neither direct hardcoding nor static linking is supported with a +- # broken collect2. +- hardcode_direct_F77=unsupported ++ export_dynamic_flag_spec_F77='${wl}-E' ++ ;; ++ ++ hpux10*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_F77=: ++ ++ hardcode_direct_F77=yes ++ export_dynamic_flag_spec_F77='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L_F77=yes + 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="" ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac + 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 +- export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' +- else +- export_symbols_cmds_F77='$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 ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_F77='$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 ++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_F77=: + +- # 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 ++ case $host_cpu in ++ hppa*64*|ia64*) ++ hardcode_libdir_flag_spec_ld_F77='+b $libdir' ++ hardcode_direct_F77=no ++ hardcode_shlibpath_var_F77=no ++ ;; ++ *) ++ hardcode_direct_F77=yes ++ export_dynamic_flag_spec_F77='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L_F77=yes ++ ;; + esac ++ fi ++ ;; + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ archive_cmds_F77='$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 ++ archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' + fi ++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_F77=: ++ link_all_deplibs_F77=yes ++ ;; + +- # 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. ++ netbsd* | netbsdelf*-gnu | knetbsd*-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 ++ archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ fi ++ hardcode_libdir_flag_spec_F77='-R$libdir' ++ hardcode_direct_F77=yes ++ hardcode_shlibpath_var_F77=no ++ ;; + +- archive_cmds_F77='' ++ newsos6) ++ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=yes +- hardcode_libdir_separator_F77=':' +- link_all_deplibs_F77=yes ++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_F77=: ++ hardcode_shlibpath_var_F77=no ++ ;; + +- 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 +- hardcode_direct_F77=yes +- else +- # We have old collect2 +- hardcode_direct_F77=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 +- hardcode_minus_L_F77=yes +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_libdir_separator_F77= +- fi +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi ++ openbsd*) ++ hardcode_direct_F77=yes ++ hardcode_shlibpath_var_F77=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_F77='${wl}-E' + 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 ++ case $host_os in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec_F77='-R$libdir' ++ ;; ++ *) ++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ++ ;; ++ esac + fi ++ ;; + +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- always_export_symbols_F77=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. +- allow_undefined_flag_F77='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +- program main +- +- end +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_f77_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-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 +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +- +- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" +- archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' +- allow_undefined_flag_F77="-z nodefs" +- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +- program main +- +- end +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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_f77_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-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 +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +- +- hardcode_libdir_flag_spec_F77='${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. +- no_undefined_flag_F77=' ${wl}-bernotok' +- allow_undefined_flag_F77=' ${wl}-berok' +- # -bexpall does not export symbols beginning with underscore (_) +- always_export_symbols_F77=yes +- # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec_F77=' ' +- archive_cmds_need_lc_F77=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; +- +- amigaos*) +- archive_cmds_F77='$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)' ++ os2*) + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=yes +- # see comment about different semantics on the GNU ld section +- ld_shlibs_F77=no ++ allow_undefined_flag_F77=unsupported ++ archive_cmds_F77='$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' ++ old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + +- bsdi[45]*) +- export_dynamic_flag_spec_F77=-rdynamic ++ osf3*) ++ if test "$GCC" = yes; then ++ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds_F77='$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 ++ allow_undefined_flag_F77=' -expect_unresolved \*' ++ archive_cmds_F77='$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 ++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_F77=: + ;; + +- 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. +- hardcode_libdir_flag_spec_F77=' ' +- allow_undefined_flag_F77=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. +- archive_cmds_F77='$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. +- old_archive_From_new_cmds_F77='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path_F77='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes_F77=yes ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds_F77='$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' ++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' ++ else ++ allow_undefined_flag_F77=' -expect_unresolved \*' ++ archive_cmds_F77='$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' ++ archive_expsym_cmds_F77='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' ++ ++ # Both c and cxx compiler support -rpath directly ++ hardcode_libdir_flag_spec_F77='-rpath $libdir' ++ fi ++ hardcode_libdir_separator_F77=: + ;; + +- darwin* | rhapsody*) +- case "$host_os" in +- rhapsody* | darwin1.[012]) +- allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; ++ solaris*) ++ no_undefined_flag_F77=' -z text' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$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='' ++ archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ archive_expsym_cmds_F77='$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 ++ hardcode_libdir_flag_spec_F77='-R$libdir' ++ hardcode_shlibpath_var_F77=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 ++ '') ++ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; ++ *) ++ whole_archive_flag_spec_F77='${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 +- archive_cmds_need_lc_F77=no +- hardcode_direct_F77=no +- hardcode_automatic_F77=yes +- hardcode_shlibpath_var_F77=unsupported +- whole_archive_flag_spec_F77='' + link_all_deplibs_F77=yes +- if test "$GCC" = yes ; then +- output_verbose_link_cmd='echo' +- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- module_cmds_F77='$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 ld's +- archive_expsym_cmds_F77='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}' +- module_expsym_cmds_F77='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' +- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' +- module_cmds_F77='$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 ld's +- archive_expsym_cmds_F77='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}' +- module_expsym_cmds_F77='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}' +- ;; +- *) +- ld_shlibs_F77=no +- ;; +- esac +- fi + ;; + +- dgux*) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ 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. ++ archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi + hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_shlibpath_var_F77=no +- ;; +- +- freebsd1*) +- ld_shlibs_F77=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*) +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no +- ;; +- +- # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_F77=yes +- hardcode_minus_L_F77=yes +- hardcode_shlibpath_var_F77=no +- ;; +- +- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) +- archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_F77='-R$libdir' +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no +- ;; +- +- hpux9*) +- if test "$GCC" = yes; then +- archive_cmds_F77='$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 +- archive_cmds_F77='$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 +- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- hardcode_direct_F77=yes +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_F77=yes +- export_dynamic_flag_spec_F77='${wl}-E' +- ;; +- +- hpux10* | hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*|ia64*) +- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- archive_cmds_F77='$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*|ia64*) +- archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' +- ;; +- *) +- archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +- ;; +- esac +- fi +- if test "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*) +- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' +- hardcode_libdir_flag_spec_ld_F77='+b $libdir' +- hardcode_libdir_separator_F77=: +- hardcode_direct_F77=no +- hardcode_shlibpath_var_F77=no +- ;; +- ia64*) +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_direct_F77=no +- hardcode_shlibpath_var_F77=no +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_F77=yes +- ;; +- *) +- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- hardcode_direct_F77=yes +- export_dynamic_flag_spec_F77='${wl}-E' +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_F77=yes +- ;; +- esac +- fi +- ;; +- +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- archive_cmds_F77='$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 +- archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' +- fi +- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- link_all_deplibs_F77=yes +- ;; +- +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out +- else +- archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +- fi +- hardcode_libdir_flag_spec_F77='-R$libdir' +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no +- ;; +- +- newsos6) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_F77=yes +- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- hardcode_shlibpath_var_F77=no +- ;; +- +- openbsd*) +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_F77='${wl}-E' +- else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_F77='-R$libdir' +- ;; +- *) +- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +- ;; +- esac +- fi +- ;; +- +- os2*) +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_minus_L_F77=yes +- allow_undefined_flag_F77=unsupported +- archive_cmds_F77='$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' +- old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' +- ;; +- +- osf3*) +- if test "$GCC" = yes; then +- allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_F77='$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 +- allow_undefined_flag_F77=' -expect_unresolved \*' +- archive_cmds_F77='$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 +- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- ;; +- +- osf4* | osf5*) # as osf3* with the addition of -msym flag +- if test "$GCC" = yes; then +- allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_F77='$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' +- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' +- else +- allow_undefined_flag_F77=' -expect_unresolved \*' +- archive_cmds_F77='$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' +- archive_expsym_cmds_F77='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' +- +- # Both c and cxx compiler support -rpath directly +- hardcode_libdir_flag_spec_F77='-rpath $libdir' +- fi +- hardcode_libdir_separator_F77=: +- ;; +- +- sco3.2v5*) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var_F77=no +- export_dynamic_flag_spec_F77='${wl}-Bexport' +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ;; +- +- solaris*) +- no_undefined_flag_F77=' -z text' +- if test "$GCC" = yes; then +- wlarc='${wl}' +- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_F77='$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='' +- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds_F77='$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 +- hardcode_libdir_flag_spec_F77='-R$libdir' +- hardcode_shlibpath_var_F77=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 +- '') +- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; +- *) +- whole_archive_flag_spec_F77='${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 +- link_all_deplibs_F77=yes +- ;; +- +- 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. +- archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' +- fi +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_direct_F77=yes +- hardcode_minus_L_F77=yes ++ hardcode_minus_L_F77=yes + hardcode_shlibpath_var_F77=no + ;; + +@@ -16325,36 +15885,45 @@ + fi + ;; + +- sysv4.2uw2*) +- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_F77=yes +- hardcode_minus_L_F77=no ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ++ no_undefined_flag_F77='${wl}-z,text' ++ archive_cmds_need_lc_F77=no + hardcode_shlibpath_var_F77=no +- hardcode_runpath_var=yes +- runpath_var=LD_RUN_PATH +- ;; ++ runpath_var='LD_RUN_PATH' + +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) +- no_undefined_flag_F77='${wl}-z ${wl}text' + if test "$GCC" = yes; then +- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi +- runpath_var='LD_RUN_PATH' +- hardcode_shlibpath_var_F77=no + ;; + +- sysv5*) +- no_undefined_flag_F77=' -z text' +- # $CC -shared without GNU ld will not create a library from C++ +- # object files and a static libstdc++, better avoid it by now +- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds_F77='$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' +- hardcode_libdir_flag_spec_F77= ++ 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. ++ no_undefined_flag_F77='${wl}-z,text' ++ allow_undefined_flag_F77='${wl}-z,nodefs' ++ archive_cmds_need_lc_F77=no + hardcode_shlibpath_var_F77=no ++ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ hardcode_libdir_separator_F77=':' ++ link_all_deplibs_F77=yes ++ export_dynamic_flag_spec_F77='${wl}-Bexport' + runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi + ;; + + uts4*) +@@ -16373,11 +15942,6 @@ + echo "${ECHO_T}$ld_shlibs_F77" >&6 + test "$ld_shlibs_F77" = 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 +- + # + # Do we need to explicitly link libc? + # +@@ -16410,6 +15974,7 @@ + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_F77 ++ pic_flag=$lt_prog_compiler_pic_F77 + compiler_flags=-v + linker_flags=-v + verstring= +@@ -16570,7 +16135,8 @@ + 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' ++ $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' +@@ -16623,7 +16189,7 @@ + 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)' ++ 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"` +@@ -16661,7 +16227,14 @@ + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[123]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +@@ -16683,10 +16256,15 @@ + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +- *) # from 3.2 on ++ 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 + ;; + +@@ -16706,7 +16284,7 @@ + version_type=sunos + need_lib_prefix=no + need_version=no +- case "$host_cpu" in ++ case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes +@@ -16746,6 +16324,18 @@ + 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 ++ ;; ++ + irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; +@@ -16803,31 +16393,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 16810 "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 +@@ -16839,6 +16408,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + knetbsd*-gnu) + version_type=linux + need_lib_prefix=no +@@ -16888,6 +16469,7 @@ + + 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 +@@ -16931,13 +16513,6 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +-sco3.2v5*) +- version_type=osf +- 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 +- ;; +- + solaris*) + version_type=linux + need_lib_prefix=no +@@ -16963,7 +16538,7 @@ + need_version=yes + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++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' +@@ -16996,6 +16571,29 @@ + 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' ++ ;; ++ + uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -17011,6 +16609,11 @@ + echo "${ECHO_T}$dynamic_linker" >&6 + 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 ++ + echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 + hardcode_action_F77= +@@ -17048,36 +16651,6 @@ + enable_fast_install=needless + fi + +-striplib= +-old_striplib= +-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +-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" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +-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" +- 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 +-fi +- ;; +- *) +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- ;; +- esac +-fi +- +- + + # The else clause should only fire when bootstrapping the + # libtool distribution, otherwise you forgot to ship ltmain.sh +@@ -17092,7 +16665,7 @@ + # 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 NM \ ++ 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 \ +@@ -17210,6 +16783,9 @@ + # A C compiler. + LTCC=$lt_LTCC + ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS ++ + # A language-specific compiler. + CC=$lt_compiler_F77 + +@@ -17520,6 +17096,9 @@ + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ + # Allow CC to be a program name with arguments. + compiler=$CC + +@@ -17527,13 +17106,13 @@ + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" >conftest.$ac_ext +-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext + printf "$lt_simple_link_test_code" >conftest.$ac_ext +-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` + $rm conftest* + +@@ -17581,20 +17160,20 @@ + # 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}? :&$lt_compiler_flag :; t' \ ++ -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:17587: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17166: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17591: \$? = $ac_status" >&5 ++ echo "$as_me:17170: \$? = $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. +- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp +- $SED '/^$/d' conftest.err >conftest.er2 +- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then ++ $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 + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi +@@ -17655,6 +17234,11 @@ + lt_prog_compiler_pic_GCJ='-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. +@@ -17671,7 +17255,7 @@ + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -17718,7 +17302,7 @@ + lt_prog_compiler_wl_GCJ='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -17748,12 +17332,12 @@ + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-static' + ;; +- pgcc* | pgf77* | pgf90*) ++ pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-fpic' +- lt_prog_compiler_static_GCJ='-static' ++ lt_prog_compiler_static_GCJ='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -17769,11 +17353,6 @@ + lt_prog_compiler_static_GCJ='-non_shared' + ;; + +- sco3.2v5*) +- lt_prog_compiler_pic_GCJ='-Kpic' +- lt_prog_compiler_static_GCJ='-dn' +- ;; +- + solaris*) + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' +@@ -17791,7 +17370,7 @@ + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + +- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' +@@ -17804,6 +17383,12 @@ + fi + ;; + ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ lt_prog_compiler_pic_GCJ='-KPIC' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ ;; ++ + unicos*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_can_build_shared_GCJ=no +@@ -17843,20 +17428,20 @@ + # 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}? :&$lt_compiler_flag :; t' \ ++ -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:17849: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17434: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17853: \$? = $ac_status" >&5 ++ echo "$as_me:17438: \$? = $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. +- $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp +- $SED '/^$/d' conftest.err >conftest.er2 +- if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then ++ $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 + lt_prog_compiler_pic_works_GCJ=yes + fi + fi +@@ -17877,7 +17462,7 @@ + fi + + fi +-case "$host_os" in ++case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_GCJ= +@@ -17887,6 +17472,48 @@ + ;; + esac + ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" ++echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 ++if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_prog_compiler_static_works_GCJ=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ 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>&5 ++ $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 ++ lt_prog_compiler_static_works_GCJ=yes ++ fi ++ else ++ lt_prog_compiler_static_works_GCJ=yes ++ fi ++ fi ++ $rm conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 ++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 ++ ++if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then ++ : ++else ++ lt_prog_compiler_static_GCJ= ++fi ++ ++ + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 + if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then +@@ -17905,25 +17532,25 @@ + # 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}? :&$lt_compiler_flag :; t' \ ++ -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:17911: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17538: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17915: \$? = $ac_status" >&5 ++ echo "$as_me:17542: \$? = $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 + # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp +- $SED '/^$/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ $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_cv_prog_compiler_c_o_GCJ=yes + fi + fi +- chmod u+w . ++ chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation +@@ -18019,6 +17646,10 @@ + 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 + ;; +@@ -18103,7 +17734,7 @@ + export_symbols_cmds_GCJ='$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 +- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ archive_cmds_GCJ='$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... + archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +@@ -18112,22 +17743,37 @@ + 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}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $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 + ld_shlibs_GCJ=no + fi + ;; + ++ interix3*) ++ hardcode_direct_GCJ=no ++ hardcode_shlibpath_var_GCJ=no ++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_GCJ='${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. ++ archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ 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*) + 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 +- whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ whole_archive_flag_spec_GCJ='${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* ) # Portland Group f77 and f90 compilers +- whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ whole_archive_flag_spec_GCJ='${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' ;; +@@ -18144,12 +17790,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 | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -18159,7 +17806,7 @@ + fi + ;; + +- solaris* | sysv5*) ++ solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs_GCJ=no + cat <&2 +@@ -18180,6 +17827,33 @@ + fi + ;; + ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) ++ ld_shlibs_GCJ=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 ++ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ ld_shlibs_GCJ=no ++ fi ++ ;; ++ esac ++ ;; ++ + sunos4*) + archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= +@@ -18213,7 +17887,7 @@ + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L_GCJ=yes +- if test "$GCC" = yes && test -z "$link_static_flag"; then ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct_GCJ=unsupported +@@ -18247,6 +17921,7 @@ + break + fi + done ++ ;; + esac + + exp_sym_flag='-bexport' +@@ -18284,6 +17959,7 @@ + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_libdir_separator_GCJ= + fi ++ ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then +@@ -18296,11 +17972,11 @@ + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else +- if test "$aix_use_runtimelinking" = yes; then ++ if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' +- fi ++ fi + fi + fi + +@@ -18336,8 +18012,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18365,12 +18040,12 @@ + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" +- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ archive_expsym_cmds_GCJ="\$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 + hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_GCJ="-z nodefs" +- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" ++ archive_expsym_cmds_GCJ="\$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. + cat >conftest.$ac_ext <<_ACEOF +@@ -18397,8 +18072,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18430,13 +18104,11 @@ + # -berok will link without error, but may produce a broken library. + no_undefined_flag_GCJ=' ${wl}-bernotok' + allow_undefined_flag_GCJ=' ${wl}-berok' +- # -bexpall does not export symbols beginning with underscore (_) +- always_export_symbols_GCJ=yes + # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec_GCJ=' ' ++ whole_archive_flag_spec_GCJ='$convenience' + archive_cmds_need_lc_GCJ=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ # This is similar to how AIX traditionally builds its shared libraries. ++ archive_expsym_cmds_GCJ="\$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 + ;; +@@ -18475,7 +18147,7 @@ + ;; + + darwin* | rhapsody*) +- case "$host_os" in ++ case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' + ;; +@@ -18504,7 +18176,7 @@ + output_verbose_link_cmd='echo' + archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds_GCJ='$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 ld's ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_GCJ='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}' + module_expsym_cmds_GCJ='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 +@@ -18513,7 +18185,7 @@ + output_verbose_link_cmd='echo' + archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_GCJ='$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 ld's ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_GCJ='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}' + module_expsym_cmds_GCJ='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}' + ;; +@@ -18554,11 +18226,20 @@ + ;; + + # 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 ++ hardcode_shlibpath_var_GCJ=no ++ ;; ++ ++ # GNU/kFreeBSD uses gcc -shared to do shared libraries. ++ kfreebsd*-gnu) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no ++ link_all_deplibs_GCJ=no + ;; + + hpux9*) +@@ -18577,47 +18258,62 @@ + export_dynamic_flag_spec_GCJ='${wl}-E' + ;; + +- hpux10* | hpux11*) ++ hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*|ia64*) ++ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_GCJ=: ++ ++ hardcode_direct_GCJ=yes ++ export_dynamic_flag_spec_GCJ='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L_GCJ=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) + archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; ++ ia64*) ++ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; + *) + archive_cmds_GCJ='$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*|ia64*) +- archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ archive_cmds_GCJ='$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 +- case "$host_cpu" in +- hppa*64*) +- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' ++ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_GCJ=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) + hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' +- hardcode_libdir_separator_GCJ=: + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + ;; +- ia64*) +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_direct_GCJ=no +- hardcode_shlibpath_var_GCJ=no +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_GCJ=yes +- ;; + *) +- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_GCJ=: + hardcode_direct_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' + +@@ -18641,7 +18337,7 @@ + link_all_deplibs_GCJ=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu | knetbsd*-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 +@@ -18719,14 +18415,6 @@ + hardcode_libdir_separator_GCJ=: + ;; + +- sco3.2v5*) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var_GCJ=no +- export_dynamic_flag_spec_GCJ='${wl}-Bexport' +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ;; +- + solaris*) + no_undefined_flag_GCJ=' -z text' + if test "$GCC" = yes; then +@@ -18812,36 +18500,45 @@ + fi + ;; + +- sysv4.2uw2*) +- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_GCJ=yes +- hardcode_minus_L_GCJ=no ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ++ no_undefined_flag_GCJ='${wl}-z,text' ++ archive_cmds_need_lc_GCJ=no + hardcode_shlibpath_var_GCJ=no +- hardcode_runpath_var=yes +- runpath_var=LD_RUN_PATH +- ;; ++ runpath_var='LD_RUN_PATH' + +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) +- no_undefined_flag_GCJ='${wl}-z ${wl}text' + if test "$GCC" = yes; then +- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi +- runpath_var='LD_RUN_PATH' +- hardcode_shlibpath_var_GCJ=no + ;; + +- sysv5*) +- no_undefined_flag_GCJ=' -z text' +- # $CC -shared without GNU ld will not create a library from C++ +- # object files and a static libstdc++, better avoid it by now +- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds_GCJ='$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' +- hardcode_libdir_flag_spec_GCJ= ++ 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. ++ no_undefined_flag_GCJ='${wl}-z,text' ++ allow_undefined_flag_GCJ='${wl}-z,nodefs' ++ archive_cmds_need_lc_GCJ=no + hardcode_shlibpath_var_GCJ=no ++ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ hardcode_libdir_separator_GCJ=':' ++ link_all_deplibs_GCJ=yes ++ export_dynamic_flag_spec_GCJ='${wl}-Bexport' + runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi + ;; + + uts4*) +@@ -18860,11 +18557,6 @@ + echo "${ECHO_T}$ld_shlibs_GCJ" >&6 + test "$ld_shlibs_GCJ" = 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 +- + # + # Do we need to explicitly link libc? + # +@@ -18897,6 +18589,7 @@ + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_GCJ ++ pic_flag=$lt_prog_compiler_pic_GCJ + compiler_flags=-v + linker_flags=-v + verstring= +@@ -19038,1336 +18731,539 @@ + 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 +- ;; +- +-cygwin* | mingw* | pw32*) +- version_type=windows +- shrext_cmds=".dll" +- need_version=no +- need_lib_prefix=no +- +- 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' +- 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" +- ;; +- 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}' +- ;; +- esac +- ;; +- +- *) +- 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 +- ;; +- +-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' +- ;; +- +-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 +- ;; +- +-freebsd1*) +- 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. +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +- 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 +- ;; +- *) # from 3.2 on +- shlibpath_overrides_runpath=no +- 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 +- ;; +- +-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' +- ;; +- +-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 19297 "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" +- fi +- +- # 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' +- ;; +- +-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 +- ;; +- +-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 +- ;; +- +-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 +- 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 +- ;; +- +-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" +- ;; +- +-sco3.2v5*) +- version_type=osf +- 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 +- ;; +- +-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 +- ;; +- +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- 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 +- ;; +- +-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 +- ;; +- +-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 +- ;; +- +-*) +- dynamic_linker=no +- ;; +-esac +-echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6 +-test "$dynamic_linker" = no && can_build_shared=no +- +-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +-hardcode_action_GCJ= +-if test -n "$hardcode_libdir_flag_spec_GCJ" || \ +- test -n "$runpath_var_GCJ" || \ +- test "X$hardcode_automatic_GCJ" = "Xyes" ; then +- +- # We can hardcode non-existant directories. +- if test "$hardcode_direct_GCJ" != 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, GCJ)" != no && +- test "$hardcode_minus_L_GCJ" != no; then +- # Linking always hardcodes the temporary library directory. +- hardcode_action_GCJ=relink +- else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- hardcode_action_GCJ=immediate +- fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- hardcode_action_GCJ=unsupported +-fi +-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +-echo "${ECHO_T}$hardcode_action_GCJ" >&6 +- +-if test "$hardcode_action_GCJ" = 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 +- +-striplib= +-old_striplib= +-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +-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" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +-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" +- 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 +-fi +- ;; +- *) +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- ;; +- esac +-fi +- +-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= +- +- case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ;; +- +- mingw* | pw32*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; +- +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; +- +- darwin*) +- # if libdl is installed we need to link against it +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $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 gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-int +-main () +-{ +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dl_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dl_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +-if test $ac_cv_lib_dl_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- +-fi +- +- ;; +- +- *) +- echo "$as_me:$LINENO: checking for shl_load" >&5 +-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +-if test "${ac_cv_func_shl_load+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. */ +-/* Define shl_load to an innocuous variant, in case declares shl_load. +- For example, HP-UX 11i declares gettimeofday. */ +-#define shl_load innocuous_shl_load +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shl_load (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef shl_load +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char shl_load (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_shl_load) || defined (__stub___shl_load) +-choke me +-#else +-char (*f) () = shl_load; +-#endif +-#ifdef __cplusplus +-} +-#endif +- +-int +-main () +-{ +-return f != shl_load; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_shl_load=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_func_shl_load=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +-if test $ac_cv_func_shl_load = yes; then +- lt_cv_dlopen="shl_load" +-else +- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $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 gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char shl_load (); +-int +-main () +-{ +-shl_load (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dld_shl_load=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dld_shl_load=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +-if test $ac_cv_lib_dld_shl_load = yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +-else +- echo "$as_me:$LINENO: checking for dlopen" >&5 +-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +-if test "${ac_cv_func_dlopen+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. */ +-/* Define dlopen to an innocuous variant, in case declares dlopen. +- For example, HP-UX 11i declares gettimeofday. */ +-#define dlopen innocuous_dlopen +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char dlopen (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef dlopen +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_dlopen) || defined (__stub___dlopen) +-choke me +-#else +-char (*f) () = dlopen; +-#endif +-#ifdef __cplusplus +-} +-#endif +- +-int +-main () +-{ +-return f != dlopen; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_func_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +-if test $ac_cv_func_dlopen = yes; then +- lt_cv_dlopen="dlopen" +-else +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $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 gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-int +-main () +-{ +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dl_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dl_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +-if test $ac_cv_lib_dl_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsvld $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 gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-int +-main () +-{ +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_svld_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_svld_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +-if test $ac_cv_lib_svld_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +-else +- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $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 gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dld_link (); +-int +-main () +-{ +-dld_link (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dld_dld_link=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dld_dld_link=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +-if test $ac_cv_lib_dld_dld_link = yes; then +- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" +-fi +- +- +-fi +- ++ # 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 ++ ;; + +-fi ++cygwin* | mingw* | pw32*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no + ++ 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 + +-fi ++ 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}' ++ ;; ++ esac ++ ;; + ++ *) ++ 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 ++ ;; + +-fi ++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' ++ ;; + ++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 ++ ;; + +-fi ++freebsd1*) ++ dynamic_linker=no ++ ;; + +- ;; +- esac ++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' ++ ;; + +- if test "x$lt_cv_dlopen" != xno; then +- enable_dlopen=yes ++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 +- enable_dlopen=no ++ case $host_os in ++ freebsd[123]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac + 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 ++ ;; + +- 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" +- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++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 ++ ;; + +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" ++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' ++ ;; + +- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 +-if test "${lt_cv_dlopen_self+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test "$cross_compiling" = yes; then : +- lt_cv_dlopen_self=cross +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < +-#endif ++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 ++ ;; + +-#include ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; + +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif ++# 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 + +-/* 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 ++ # 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 + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif ++ # 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' ++ ;; + +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; ++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' ++ ;; + +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } ++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' ++ ;; + +- exit (status); +-} +-EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; +- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; +- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; +- esac +- else : +- # compilation failed +- lt_cv_dlopen_self=no ++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 +-fi +-rm -fr conftest* +- ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; + +-fi +-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self" >&6 ++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 ++ ;; + +- if test "x$lt_cv_dlopen_self" = xyes; then +- LDFLAGS="$LDFLAGS $link_static_flag" +- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 +-if test "${lt_cv_dlopen_self_static+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test "$cross_compiling" = yes; then : +- lt_cv_dlopen_self_static=cross +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < +-#endif ++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 ++ ;; + +-#include ++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 ++ ;; + +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif ++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" ++ ;; + +-/* 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 ++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' ++ ;; + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif ++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 ++ ;; + +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; ++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 (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } ++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 ++ ;; + +- exit (status); +-} +-EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; +- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; +- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; ++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 +- else : +- # compilation failed +- lt_cv_dlopen_self_static=no + fi +-fi +-rm -fr conftest* ++ 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 ++ ;; + ++*) ++ dynamic_linker=no ++ ;; ++esac ++echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6 ++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 +-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +- fi + +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +- ;; +- esac ++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 ++hardcode_action_GCJ= ++if test -n "$hardcode_libdir_flag_spec_GCJ" || \ ++ test -n "$runpath_var_GCJ" || \ ++ test "X$hardcode_automatic_GCJ" = "Xyes" ; then + +- case $lt_cv_dlopen_self in +- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; +- *) enable_dlopen_self=unknown ;; +- esac ++ # We can hardcode non-existant directories. ++ if test "$hardcode_direct_GCJ" != 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, GCJ)" != no && ++ test "$hardcode_minus_L_GCJ" != no; then ++ # Linking always hardcodes the temporary library directory. ++ hardcode_action_GCJ=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ hardcode_action_GCJ=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ hardcode_action_GCJ=unsupported ++fi ++echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 ++echo "${ECHO_T}$hardcode_action_GCJ" >&6 + +- case $lt_cv_dlopen_self_static in +- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; +- *) enable_dlopen_self_static=unknown ;; +- esac ++if test "$hardcode_action_GCJ" = 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 + + +@@ -20384,7 +19280,7 @@ + # 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 NM \ ++ 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 \ +@@ -20502,6 +19398,9 @@ + # A C compiler. + LTCC=$lt_LTCC + ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS ++ + # A language-specific compiler. + CC=$lt_compiler_GCJ + +@@ -20811,6 +19710,9 @@ + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ + # Allow CC to be a program name with arguments. + compiler=$CC + +@@ -20818,13 +19720,13 @@ + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" >conftest.$ac_ext +-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext + printf "$lt_simple_link_test_code" >conftest.$ac_ext +-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` + $rm conftest* + +@@ -20859,7 +19761,7 @@ + # 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 NM \ ++ 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 \ +@@ -20977,6 +19879,9 @@ + # A C compiler. + LTCC=$lt_LTCC + ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS ++ + # A language-specific compiler. + CC=$lt_compiler_RC + +@@ -21457,8 +20362,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21675,62 +20579,90 @@ + echo $ECHO_N "checking for PANEL... $ECHO_C" >&6 + + if test -n "$PKG_CONFIG"; then ++ if test -n "$PANEL_CFLAGS"; then ++ 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 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\"") >&5 +- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_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") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_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 lpint-bonobo launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_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 lpint-bonobo launchpad-integration") 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 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" 2>/dev/null` ++ pkg_cv_PANEL_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_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 lpint-bonobo launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi ++ fi + else + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then ++ if test -n "$PANEL_LIBS"; then ++ 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 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\"") >&5 +- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_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") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_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 lpint-bonobo launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_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 lpint-bonobo launchpad-integration") 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 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" 2>/dev/null` ++ pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_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 lpint-bonobo launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi ++ fi + else + pkg_failed=untried + fi + ++ ++ + if test $pkg_failed = yes; then +- PANEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_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"` ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _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 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 lpint-bonobo launchpad-integration"` ++ else ++ PANEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_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 lpint-bonobo launchpad-integration"` ++ fi + # Put the nasty error message in config.log where it belongs +- echo "$PANEL_PKG_ERRORS" 1>&5 ++ echo "$PANEL_PKG_ERRORS" >&5 ++ ++ { { echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_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 lpint-bonobo launchpad-integration) were not met: ++ ++$PANEL_PKG_ERRORS + +- { { echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_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) were not met. + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively you may set the PANEL_CFLAGS and PANEL_LIBS environment variables +-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 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) were not met. ++Alternatively, you may set the environment variables PANEL_CFLAGS ++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 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 lpint-bonobo launchpad-integration) were not met: ++ ++$PANEL_PKG_ERRORS ++ + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively you may set the PANEL_CFLAGS and PANEL_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details." >&2;} ++Alternatively, you may set the environment variables PANEL_CFLAGS ++and PANEL_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: 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. + +-Alternatively you may set the PANEL_CFLAGS and PANEL_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details. ++Alternatively, you may set the environment variables PANEL_CFLAGS ++and PANEL_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." >&5 +@@ -21738,9 +20670,9 @@ + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +-Alternatively you may set the PANEL_CFLAGS and PANEL_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details. ++Alternatively, you may set the environment variables PANEL_CFLAGS ++and PANEL_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +@@ -21761,6 +20693,9 @@ + echo $ECHO_N "checking for LIBPANEL_APPLET... $ECHO_C" >&6 + + if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBPANEL_APPLET_CFLAGS"; then ++ pkg_cv_LIBPANEL_APPLET_CFLAGS="$LIBPANEL_APPLET_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 gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED") 2>&5 +@@ -21771,10 +20706,14 @@ + else + pkg_failed=yes + fi ++ fi + else + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBPANEL_APPLET_LIBS"; then ++ pkg_cv_LIBPANEL_APPLET_LIBS="$LIBPANEL_APPLET_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 gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED") 2>&5 +@@ -21785,38 +20724,59 @@ + else + pkg_failed=yes + fi ++ fi + else + pkg_failed=untried + fi + ++ ++ + if test $pkg_failed = yes; then +- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED"` ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED"` ++ else ++ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED"` ++ fi + # Put the nasty error message in config.log where it belongs +- echo "$LIBPANEL_APPLET_PKG_ERRORS" 1>&5 ++ echo "$LIBPANEL_APPLET_PKG_ERRORS" >&5 ++ ++ { { echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED) were not met: ++ ++$LIBPANEL_APPLET_PKG_ERRORS + +- { { echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED) were not met. + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively you may set the LIBPANEL_APPLET_CFLAGS and LIBPANEL_APPLET_LIBS environment variables +-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 gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED) were not met. ++Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS ++and LIBPANEL_APPLET_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 gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED) were not met: ++ ++$LIBPANEL_APPLET_PKG_ERRORS ++ + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively you may set the LIBPANEL_APPLET_CFLAGS and LIBPANEL_APPLET_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details." >&2;} ++Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS ++and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: 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. + +-Alternatively you may set the LIBPANEL_APPLET_CFLAGS and LIBPANEL_APPLET_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details. ++Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS ++and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." >&5 +@@ -21824,9 +20784,9 @@ + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +-Alternatively you may set the LIBPANEL_APPLET_CFLAGS and LIBPANEL_APPLET_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details. ++Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS ++and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +@@ -21847,62 +20807,90 @@ + echo $ECHO_N "checking for WNCKLET... $ECHO_C" >&6 + + if test -n "$PKG_CONFIG"; then ++ if test -n "$WNCKLET_CFLAGS"; then ++ 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 gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5 ++ { (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 gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED lpint-bonobo launchpad-integration\"") >&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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED lpint-bonobo launchpad-integration") 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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null` ++ 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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED lpint-bonobo launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi ++ fi + else + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then ++ if test -n "$WNCKLET_LIBS"; then ++ 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 gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5 ++ { (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 gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED lpint-bonobo launchpad-integration\"") >&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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED lpint-bonobo launchpad-integration") 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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null` ++ 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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED lpint-bonobo launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi ++ fi + else + pkg_failed=untried + fi + ++ ++ + if test $pkg_failed = yes; then +- 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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED"` ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED lpint-bonobo launchpad-integration"` ++ 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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED lpint-bonobo launchpad-integration"` ++ fi + # Put the nasty error message in config.log where it belongs +- echo "$WNCKLET_PKG_ERRORS" 1>&5 ++ 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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED lpint-bonobo launchpad-integration) were not met: ++ ++$WNCKLET_PKG_ERRORS + +- { { 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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met. + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively you may set the WNCKLET_CFLAGS and WNCKLET_LIBS environment variables +-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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met. ++Alternatively, you may set the environment variables WNCKLET_CFLAGS ++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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED lpint-bonobo launchpad-integration) were not met: ++ ++$WNCKLET_PKG_ERRORS ++ + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively you may set the WNCKLET_CFLAGS and WNCKLET_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details." >&2;} ++Alternatively, you may set the environment variables WNCKLET_CFLAGS ++and WNCKLET_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: 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. + +-Alternatively you may set the WNCKLET_CFLAGS and WNCKLET_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details. ++Alternatively, you may set the environment variables WNCKLET_CFLAGS ++and WNCKLET_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." >&5 +@@ -21910,9 +20898,9 @@ + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +-Alternatively you may set the WNCKLET_CFLAGS and WNCKLET_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details. ++Alternatively, you may set the environment variables WNCKLET_CFLAGS ++and WNCKLET_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +@@ -21975,6 +20963,9 @@ + echo $ECHO_N "checking for CLOCK... $ECHO_C" >&6 + + if test -n "$PKG_CONFIG"; then ++ if test -n "$CLOCK_CFLAGS"; then ++ pkg_cv_CLOCK_CFLAGS="$CLOCK_CFLAGS" ++ else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED \$LIBECAL_REQUIREMENT\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $LIBECAL_REQUIREMENT") 2>&5 +@@ -21985,10 +20976,14 @@ + else + pkg_failed=yes + fi ++ fi + else + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then ++ if test -n "$CLOCK_LIBS"; then ++ pkg_cv_CLOCK_LIBS="$CLOCK_LIBS" ++ else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED \$LIBECAL_REQUIREMENT\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $LIBECAL_REQUIREMENT") 2>&5 +@@ -21999,38 +20994,59 @@ + else + pkg_failed=yes + fi ++ fi + else + pkg_failed=untried + fi + ++ ++ + if test $pkg_failed = yes; then +- CLOCK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $LIBECAL_REQUIREMENT"` ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $LIBECAL_REQUIREMENT"` ++ else ++ CLOCK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $LIBECAL_REQUIREMENT"` ++ fi + # Put the nasty error message in config.log where it belongs +- echo "$CLOCK_PKG_ERRORS" 1>&5 ++ echo "$CLOCK_PKG_ERRORS" >&5 ++ ++ { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $LIBECAL_REQUIREMENT) were not met: ++ ++$CLOCK_PKG_ERRORS + +- { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $LIBECAL_REQUIREMENT) were not met. + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively you may set the CLOCK_CFLAGS and CLOCK_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details." >&5 +-echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $LIBECAL_REQUIREMENT) were not met. ++Alternatively, you may set the environment variables CLOCK_CFLAGS ++and CLOCK_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 (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $LIBECAL_REQUIREMENT) were not met: ++ ++$CLOCK_PKG_ERRORS ++ + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively you may set the CLOCK_CFLAGS and CLOCK_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details." >&2;} ++Alternatively, you may set the environment variables CLOCK_CFLAGS ++and CLOCK_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: 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. + +-Alternatively you may set the CLOCK_CFLAGS and CLOCK_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details. ++Alternatively, you may set the environment variables CLOCK_CFLAGS ++and CLOCK_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." >&5 +@@ -22038,9 +21054,9 @@ + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +-Alternatively you may set the CLOCK_CFLAGS and CLOCK_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details. ++Alternatively, you may set the environment variables CLOCK_CFLAGS ++and CLOCK_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +@@ -22061,6 +21077,9 @@ + echo $ECHO_N "checking for FISH... $ECHO_C" >&6 + + if test -n "$PKG_CONFIG"; then ++ if test -n "$FISH_CFLAGS"; then ++ pkg_cv_FISH_CFLAGS="$FISH_CFLAGS" ++ else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5 +@@ -22071,10 +21090,14 @@ + else + pkg_failed=yes + fi ++ fi + else + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then ++ if test -n "$FISH_LIBS"; then ++ pkg_cv_FISH_LIBS="$FISH_LIBS" ++ else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5 +@@ -22085,38 +21108,59 @@ + else + pkg_failed=yes + fi ++ fi + else + pkg_failed=untried + fi + ++ ++ + if test $pkg_failed = yes; then +- FISH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED"` ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ FISH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED"` ++ else ++ FISH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED"` ++ fi + # Put the nasty error message in config.log where it belongs +- echo "$FISH_PKG_ERRORS" 1>&5 ++ echo "$FISH_PKG_ERRORS" >&5 ++ ++ { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED) were not met: ++ ++$FISH_PKG_ERRORS + +- { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED) were not met. + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively you may set the FISH_CFLAGS and FISH_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details." >&5 +-echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED) were not met. ++Alternatively, you may set the environment variables FISH_CFLAGS ++and FISH_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 (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED) were not met: ++ ++$FISH_PKG_ERRORS ++ + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively you may set the FISH_CFLAGS and FISH_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details." >&2;} ++Alternatively, you may set the environment variables FISH_CFLAGS ++and FISH_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: 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. + +-Alternatively you may set the FISH_CFLAGS and FISH_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details. ++Alternatively, you may set the environment variables FISH_CFLAGS ++and FISH_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." >&5 +@@ -22124,9 +21168,9 @@ + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +-Alternatively you may set the FISH_CFLAGS and FISH_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details. ++Alternatively, you may set the environment variables FISH_CFLAGS ++and FISH_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +@@ -22182,8 +21226,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22255,8 +21298,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22310,8 +21352,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22382,8 +21423,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22437,8 +21477,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22517,8 +21556,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22624,8 +21662,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22678,9 +21715,12 @@ + esac + + if test $pango_omitted_x_deps = yes ; then ++ ++if test "x$ac_path_x_has_been_run" != xyes; then + echo "$as_me:$LINENO: checking for X" >&5 + echo $ECHO_N "checking for X... $ECHO_C" >&6 + ++ac_path_x_has_been_run=yes + + # Check whether --with-x or --without-x was given. + if test "${with_x+set}" = set; then +@@ -22773,7 +21813,7 @@ + /usr/openwin/share/include' + + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for a specified header file. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -22781,7 +21821,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -22808,7 +21848,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -22822,18 +21862,18 @@ + # 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 + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + int + main () + { +-XtMalloc (0) ++XrmInitialize () + ; + return 0; + } +@@ -22847,8 +21887,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22872,7 +21911,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 +@@ -22908,10 +21947,15 @@ + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$x_includes ac_x_libraries=$x_libraries" +- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 ++ # It might be that x_includes is empty (headers are found in the ++ # standard search path. Then output the corresponding message ++ ac_out_x_includes=$x_includes ++ test "x$x_includes" = x && ac_out_x_includes="in standard search path" ++ echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 ++echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 + fi + ++fi + if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + +@@ -22959,8 +22003,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23011,8 +22054,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23088,8 +22130,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23144,8 +22185,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23213,8 +22253,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23322,8 +22361,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23387,8 +22425,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23456,8 +22493,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23561,8 +22597,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23626,8 +22661,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23724,8 +22758,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23789,8 +22822,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23887,8 +22919,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23952,8 +22983,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24032,8 +23062,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24135,8 +23164,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24281,8 +23309,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24353,8 +23380,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24498,8 +23524,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24557,8 +23582,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24655,8 +23679,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24735,8 +23758,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24800,8 +23822,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24865,8 +23886,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24943,8 +23963,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25008,8 +24027,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25125,8 +24143,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25293,8 +24310,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25427,8 +24443,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25513,8 +24528,7 @@ + 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' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25793,6 +24807,9 @@ + echo $ECHO_N "checking for GDU_MODULE_VERSION_CHECK... $ECHO_C" >&6 + + if test -n "$PKG_CONFIG"; then ++ if test -n "$GDU_MODULE_VERSION_CHECK_CFLAGS"; then ++ pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS="$GDU_MODULE_VERSION_CHECK_CFLAGS" ++ else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$GDU_REQUIRED_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION") 2>&5 +@@ -25803,10 +24820,14 @@ + else + pkg_failed=yes + fi ++ fi + else + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then ++ if test -n "$GDU_MODULE_VERSION_CHECK_LIBS"; then ++ pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS="$GDU_MODULE_VERSION_CHECK_LIBS" ++ else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$GDU_REQUIRED_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION") 2>&5 +@@ -25817,38 +24838,59 @@ + else + pkg_failed=yes + fi ++ fi + else + pkg_failed=untried + fi + ++ ++ + if test $pkg_failed = yes; then +- GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"` ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"` ++ else ++ GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"` ++ fi + # Put the nasty error message in config.log where it belongs +- echo "$GDU_MODULE_VERSION_CHECK_PKG_ERRORS" 1>&5 ++ echo "$GDU_MODULE_VERSION_CHECK_PKG_ERRORS" >&5 ++ ++ { { echo "$as_me:$LINENO: error: Package requirements (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met: ++ ++$GDU_MODULE_VERSION_CHECK_PKG_ERRORS + +- { { echo "$as_me:$LINENO: error: Package requirements (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met. + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively you may set the GDU_MODULE_VERSION_CHECK_CFLAGS and GDU_MODULE_VERSION_CHECK_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details." >&5 +-echo "$as_me: error: Package requirements (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met. ++Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS ++and GDU_MODULE_VERSION_CHECK_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 (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met: ++ ++$GDU_MODULE_VERSION_CHECK_PKG_ERRORS ++ + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively you may set the GDU_MODULE_VERSION_CHECK_CFLAGS and GDU_MODULE_VERSION_CHECK_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details." >&2;} ++Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS ++and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: 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. + +-Alternatively you may set the GDU_MODULE_VERSION_CHECK_CFLAGS and GDU_MODULE_VERSION_CHECK_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details. ++Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS ++and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." >&5 +@@ -25856,9 +24898,9 @@ + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +-Alternatively you may set the GDU_MODULE_VERSION_CHECK_CFLAGS and GDU_MODULE_VERSION_CHECK_LIBS environment variables +-to avoid the need to call pkg-config. See the pkg-config man page for +-more details. ++Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS ++and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." >&2;} +@@ -26899,6 +25941,7 @@ + s,@AUTOMAKE@,$AUTOMAKE,;t t + s,@AUTOHEADER@,$AUTOHEADER,;t t + s,@MAKEINFO@,$MAKEINFO,;t t ++s,@AMTAR@,$AMTAR,;t t + s,@install_sh@,$install_sh,;t t + s,@STRIP@,$STRIP,;t t + s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t +@@ -26907,9 +25950,6 @@ + s,@AWK@,$AWK,;t t + s,@SET_MAKE@,$SET_MAKE,;t t + s,@am__leading_dot@,$am__leading_dot,;t t +-s,@AMTAR@,$AMTAR,;t t +-s,@am__tar@,$am__tar,;t t +-s,@am__untar@,$am__untar,;t t + s,@ACLOCAL_AMFLAGS@,$ACLOCAL_AMFLAGS,;t t + s,@LIB_PANEL_APPLET_LT_VERSION@,$LIB_PANEL_APPLET_LT_VERSION,;t t + s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t +@@ -27220,11 +26260,6 @@ + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + esac + +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +@@ -27263,6 +26298,12 @@ + fi;; + esac + done` || { (exit 1); exit 1; } ++ ++ if test x"$ac_file" != x-; then ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ rm -f "$ac_file" ++ fi + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub +@@ -27697,21 +26738,27 @@ + else + continue + fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. ++ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue ++ # Extract the definition of DEP_FILES 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" | \ ++ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" ++ # 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 ' ++ /^DEP_FILES = .*\\\\$/ { ++ s/^DEP_FILES = // ++ :loop ++ s/\\\\$// ++ p ++ n ++ /\\\\$/ b loop ++ p ++ } ++ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue +diff -Nur gnome-panel-2.14.1/depcomp gnome-panel-2.14.1.new/depcomp +--- gnome-panel-2.14.1/depcomp 2006-04-10 15:46:29.000000000 +0200 ++++ gnome-panel-2.14.1.new/depcomp 2006-05-07 23:41:21.000000000 +0200 +@@ -1,9 +1,9 @@ + #! /bin/sh + # depcomp - compile a program generating dependencies as side-effects + +-scriptversion=2005-07-09.11 ++scriptversion=2004-04-25.13 + +-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. ++# Copyright (C) 1999, 2000, 2003, 2004 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 +@@ -17,8 +17,8 @@ + + # 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. ++# 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 +@@ -43,18 +43,17 @@ + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. +- DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + + Report bugs to . + EOF +- exit $? ++ exit 0 + ;; + -v | --v*) + echo "depcomp $scriptversion" +- exit $? ++ exit 0 + ;; + esac + +@@ -62,10 +61,18 @@ + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 + fi ++# `libtool' can also be set to `yes' or `no'. ++ ++if test -z "$depfile"; then ++ base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` ++ dir=`echo "$object" | sed 's,/.*$,/,'` ++ if test "$dir" = "$object"; then ++ dir= ++ fi ++ # FIXME: should be _deps on DOS. ++ depfile="$dir.deps/$base" ++fi + +-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +-depfile=${depfile-`echo "$object" | +- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} + tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + + rm -f "$tmpdepfile" +@@ -287,43 +294,33 @@ + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then +- # With Tru64 cc, shared objects can also be used to make a +- # static library. This mecanism is used in libtool 1.4 series to +- # handle both shared and static libraries in a single compilation. +- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. +- # +- # With libtool 1.5 this exception was removed, and libtool now +- # generates 2 separate objects for the 2 libraries. These two +- # compilations output dependencies in in $dir.libs/$base.o.d and +- # in $dir$base.o.d. We have to check for both files, because +- # one of the two compilations can be disabled. We should prefer +- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is +- # automatically cleaned when .libs/ is deleted, while ignoring +- # the former would cause a distcleancheck panic. +- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 +- tmpdepfile2=$dir$base.o.d # libtool 1.5 +- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 +- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 ++ # Dependencies are output in .lo.d with libtool 1.4. ++ # They are output in .o.d with libtool 1.5. ++ tmpdepfile1="$dir.libs/$base.lo.d" ++ tmpdepfile2="$dir.libs/$base.o.d" ++ tmpdepfile3="$dir.libs/$base.d" + "$@" -Wc,-MD + else +- tmpdepfile1=$dir$base.o.d +- tmpdepfile2=$dir$base.d +- tmpdepfile3=$dir$base.d +- tmpdepfile4=$dir$base.d ++ tmpdepfile1="$dir$base.o.d" ++ tmpdepfile2="$dir$base.d" ++ tmpdepfile3="$dir$base.d" + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + +- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" +- do +- test -f "$tmpdepfile" && break +- done ++ if test -f "$tmpdepfile1"; then ++ tmpdepfile="$tmpdepfile1" ++ elif test -f "$tmpdepfile2"; then ++ tmpdepfile="$tmpdepfile2" ++ else ++ tmpdepfile="$tmpdepfile3" ++ fi + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. +@@ -467,8 +464,7 @@ + done + + "$@" -E | +- sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ +- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | ++ sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" +diff -Nur gnome-panel-2.14.1/doc/Makefile.in gnome-panel-2.14.1.new/doc/Makefile.in +--- gnome-panel-2.14.1/doc/Makefile.in 2006-04-10 15:46:23.000000000 +0200 ++++ gnome-panel-2.14.1.new/doc/Makefile.in 2006-05-07 23:41:16.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -33,7 +33,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = doc + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -224,8 +223,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -309,13 +306,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -327,7 +318,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -335,13 +326,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -362,7 +347,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -461,17 +446,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="../$(top_distdir)" \ ++ distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ +@@ -500,7 +483,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/doc/reference/Makefile.in gnome-panel-2.14.1.new/doc/reference/Makefile.in +--- gnome-panel-2.14.1/doc/reference/Makefile.in 2006-04-10 15:46:23.000000000 +0200 ++++ gnome-panel-2.14.1.new/doc/reference/Makefile.in 2006-05-07 23:41:16.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -33,7 +33,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = doc/reference + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -224,8 +223,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -305,13 +302,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -323,7 +314,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -331,13 +322,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -358,7 +343,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -457,17 +442,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="../$(top_distdir)" \ ++ distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ +@@ -496,7 +479,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/doc/reference/panel-applet/Makefile.in gnome-panel-2.14.1.new/doc/reference/panel-applet/Makefile.in +--- gnome-panel-2.14.1/doc/reference/panel-applet/Makefile.in 2006-04-10 15:46:23.000000000 +0200 ++++ gnome-panel-2.14.1.new/doc/reference/panel-applet/Makefile.in 2006-05-07 23:41:16.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -39,7 +39,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/gtk-doc.make ChangeLog +@@ -222,8 +221,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -444,7 +441,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -497,16 +494,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am all-local check check-am clean clean-generic \ +- clean-libtool clean-local dist-hook distclean \ +- distclean-generic distclean-libtool distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-local mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am uninstall-local ++ clean-libtool clean-local distclean distclean-generic \ ++ distclean-libtool distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am \ ++ install-data-local install-exec install-exec-am install-info \ ++ install-info-am install-man install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-local mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-info-am uninstall-local + + + @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp +diff -Nur gnome-panel-2.14.1/gnome-panel/Makefile.in gnome-panel-2.14.1.new/gnome-panel/Makefile.in +--- gnome-panel-2.14.1/gnome-panel/Makefile.in 2006-04-10 15:46:24.000000000 +0200 ++++ gnome-panel-2.14.1.new/gnome-panel/Makefile.in 2006-05-07 23:41:16.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,6 +15,8 @@ + @SET_MAKE@ + + ++SOURCES = $(gnome_desktop_item_edit_SOURCES) $(gnome_panel_SOURCES) ++ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -35,7 +37,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + bin_PROGRAMS = gnome-panel$(EXEEXT) gnome-desktop-item-edit$(EXEEXT) + subdir = gnome-panel +@@ -50,10 +51,7 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entriesdir)" \ +- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(rcdir)" \ +- "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" \ +- "$(DESTDIR)$(uidir)" ++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entriesdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)" + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) + am_gnome_desktop_item_edit_OBJECTS = \ +@@ -91,7 +89,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) $(am__objects_4) $(am__objects_1) + am__objects_6 = $(am__objects_1) $(am__objects_1) + am_gnome_panel_OBJECTS = $(am__objects_2) $(am__objects_3) \ +@@ -101,23 +101,71 @@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/GNOME_Panel-common.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/GNOME_Panel-skels.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/GNOME_Panel-stubs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/applet.Po ./$(DEPDIR)/button-widget.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/drawer.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/egg-recent-item.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/egg-recent-model.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/egg-recent-util.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/egg-recent-view-gtk.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/egg-recent-view.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/eggaccelerators.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/gnome-desktop-item-edit.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/launcher.Po ./$(DEPDIR)/main.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/menu-ditem.Po ./$(DEPDIR)/menu.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-a11y.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-action-button.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-action-protocol.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-addto-canvas.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-addto-event-box.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-addto-rounded-rect.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-addto.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-applet-frame.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-background-monitor.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-background.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-bindings.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-compatibility.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-config-global.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-context-menu.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-force-quit.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-frame.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-gconf.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-gdm.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-lockdown.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-logout.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-marshal.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-menu-bar.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-menu-button.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-menu-items.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-multiscreen.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-profile.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-properties-dialog.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-recent.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-run-dialog.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-separator.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-session.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-shell.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-stock-icons.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-struts.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-toplevel.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-typebuiltins.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-util.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-widget.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-xutils.Po ./$(DEPDIR)/panel.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/xstuff.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(gnome_desktop_item_edit_SOURCES) $(gnome_panel_SOURCES) + DIST_SOURCES = $(gnome_desktop_item_edit_SOURCES) \ + $(gnome_panel_SOURCES) +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + entriesDATA_INSTALL = $(INSTALL_DATA) + gladeDATA_INSTALL = $(INSTALL_DATA) + rcDATA_INSTALL = $(INSTALL_DATA) +@@ -294,8 +342,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,6 +475,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 \ + $(EGG_RECENT_FILES_C) \ +@@ -477,6 +526,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 \ + $(EGG_RECENT_FILES_H) \ +@@ -650,6 +703,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@ +@@ -690,21 +746,24 @@ + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -721,7 +780,7 @@ + test -z "$(entriesdir)" || $(mkdir_p) "$(DESTDIR)$(entriesdir)" + @list='$(entries_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(entriesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entriesdir)/$$f'"; \ + $(entriesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entriesdir)/$$f"; \ + done +@@ -729,7 +788,7 @@ + uninstall-entriesDATA: + @$(NORMAL_UNINSTALL) + @list='$(entries_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(entriesdir)/$$f'"; \ + rm -f "$(DESTDIR)$(entriesdir)/$$f"; \ + done +@@ -738,7 +797,7 @@ + test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)" + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ + $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ + done +@@ -746,7 +805,7 @@ + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ + rm -f "$(DESTDIR)$(gladedir)/$$f"; \ + done +@@ -755,7 +814,7 @@ + test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)" + @list='$(rc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \ + $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \ + done +@@ -763,7 +822,7 @@ + uninstall-rcDATA: + @$(NORMAL_UNINSTALL) + @list='$(rc_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \ + rm -f "$(DESTDIR)$(rcdir)/$$f"; \ + done +@@ -772,7 +831,7 @@ + test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)" + @list='$(schemas_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(schemasDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemasdir)/$$f'"; \ + $(schemasDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemasdir)/$$f"; \ + done +@@ -780,7 +839,7 @@ + uninstall-schemasDATA: + @$(NORMAL_UNINSTALL) + @list='$(schemas_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(schemasdir)/$$f'"; \ + rm -f "$(DESTDIR)$(schemasdir)/$$f"; \ + done +@@ -789,7 +848,7 @@ + test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ + $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ + done +@@ -797,7 +856,7 @@ + uninstall-serverDATA: + @$(NORMAL_UNINSTALL) + @list='$(server_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ + rm -f "$(DESTDIR)$(serverdir)/$$f"; \ + done +@@ -806,7 +865,7 @@ + test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)" + @list='$(ui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \ + $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \ + done +@@ -814,7 +873,7 @@ + uninstall-uiDATA: + @$(NORMAL_UNINSTALL) + @list='$(ui_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \ + rm -f "$(DESTDIR)$(uidir)/$$f"; \ + done +@@ -926,7 +985,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -987,13 +1046,13 @@ + uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ +- clean-generic clean-libtool ctags dist-hook distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binPROGRAMS install-data \ +- install-data-am install-data-local install-entriesDATA \ +- install-exec install-exec-am install-gladeDATA install-info \ +- install-info-am install-man install-rcDATA install-schemasDATA \ ++ clean-generic clean-libtool ctags distclean distclean-compile \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-binPROGRAMS install-data install-data-am \ ++ install-data-local install-entriesDATA install-exec \ ++ install-exec-am install-gladeDATA install-info install-info-am \ ++ install-man install-rcDATA install-schemasDATA \ + install-serverDATA install-strip install-uiDATA installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ +diff -Nur gnome-panel-2.14.1/help/clock/Makefile.in gnome-panel-2.14.1.new/help/clock/Makefile.in +--- gnome-panel-2.14.1/help/clock/Makefile.in 2006-04-10 15:46:24.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/clock/Makefile.in 2006-05-07 23:41:16.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -57,7 +57,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/gnome-doc-utils.make +@@ -240,8 +239,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -534,7 +531,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -589,16 +586,16 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distclean-local distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-local mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distclean-local distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am \ ++ install-data-local install-exec install-exec-am install-info \ ++ install-info-am install-man install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-local mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + DOC_H_FILE ?= +diff -Nur gnome-panel-2.14.1/help/de/fish/Makefile.in gnome-panel-2.14.1.new/help/de/fish/Makefile.in +--- gnome-panel-2.14.1/help/de/fish/Makefile.in 2006-04-10 15:46:24.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/de/fish/Makefile.in 2006-05-07 23:41:17.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/de/Makefile.in gnome-panel-2.14.1.new/help/de/Makefile.in +--- gnome-panel-2.14.1/help/de/Makefile.in 2006-04-10 15:46:24.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/de/Makefile.in 2006-05-07 23:41:17.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -33,7 +33,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = help/de + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -224,8 +223,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -305,13 +302,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -323,7 +314,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -331,13 +322,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -358,7 +343,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -457,17 +442,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="../$(top_distdir)" \ ++ distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ +@@ -496,7 +479,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/help/de/window-list/Makefile.in gnome-panel-2.14.1.new/help/de/window-list/Makefile.in +--- gnome-panel-2.14.1/help/de/window-list/Makefile.in 2006-04-10 15:46:25.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/de/window-list/Makefile.in 2006-05-07 23:41:17.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/de/workspace-switcher/Makefile.in gnome-panel-2.14.1.new/help/de/workspace-switcher/Makefile.in +--- gnome-panel-2.14.1/help/de/workspace-switcher/Makefile.in 2006-04-10 15:46:25.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/de/workspace-switcher/Makefile.in 2006-05-07 23:41:17.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/fish/Makefile.in gnome-panel-2.14.1.new/help/fish/Makefile.in +--- gnome-panel-2.14.1/help/fish/Makefile.in 2006-04-10 15:46:25.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/fish/Makefile.in 2006-05-07 23:41:17.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -57,7 +57,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/gnome-doc-utils.make +@@ -240,8 +239,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -534,7 +531,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -589,16 +586,16 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distclean-local distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-local mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distclean-local distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am \ ++ install-data-local install-exec install-exec-am install-info \ ++ install-info-am install-man install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-local mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + DOC_H_FILE ?= +diff -Nur gnome-panel-2.14.1/help/ja/fish/Makefile.in gnome-panel-2.14.1.new/help/ja/fish/Makefile.in +--- gnome-panel-2.14.1/help/ja/fish/Makefile.in 2006-04-10 15:46:25.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/ja/fish/Makefile.in 2006-05-07 23:41:17.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/ja/Makefile.in gnome-panel-2.14.1.new/help/ja/Makefile.in +--- gnome-panel-2.14.1/help/ja/Makefile.in 2006-04-10 15:46:25.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/ja/Makefile.in 2006-05-07 23:41:17.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -33,7 +33,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = help/ja + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -224,8 +223,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -305,13 +302,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -323,7 +314,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -331,13 +322,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -358,7 +343,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -457,17 +442,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="../$(top_distdir)" \ ++ distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ +@@ -496,7 +479,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/help/ja/window-list/Makefile.in gnome-panel-2.14.1.new/help/ja/window-list/Makefile.in +--- gnome-panel-2.14.1/help/ja/window-list/Makefile.in 2006-04-10 15:46:25.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/ja/window-list/Makefile.in 2006-05-07 23:41:18.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/ja/workspace-switcher/Makefile.in gnome-panel-2.14.1.new/help/ja/workspace-switcher/Makefile.in +--- gnome-panel-2.14.1/help/ja/workspace-switcher/Makefile.in 2006-04-10 15:46:26.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/ja/workspace-switcher/Makefile.in 2006-05-07 23:41:18.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/ko/fish/Makefile.in gnome-panel-2.14.1.new/help/ko/fish/Makefile.in +--- gnome-panel-2.14.1/help/ko/fish/Makefile.in 2006-04-10 15:46:26.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/ko/fish/Makefile.in 2006-05-07 23:41:18.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/ko/Makefile.in gnome-panel-2.14.1.new/help/ko/Makefile.in +--- gnome-panel-2.14.1/help/ko/Makefile.in 2006-04-10 15:46:26.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/ko/Makefile.in 2006-05-07 23:41:18.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -33,7 +33,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = help/ko + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -224,8 +223,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -305,13 +302,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -323,7 +314,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -331,13 +322,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -358,7 +343,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -457,17 +442,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="../$(top_distdir)" \ ++ distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ +@@ -496,7 +479,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/help/ko/window-list/Makefile.in gnome-panel-2.14.1.new/help/ko/window-list/Makefile.in +--- gnome-panel-2.14.1/help/ko/window-list/Makefile.in 2006-04-10 15:46:26.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/ko/window-list/Makefile.in 2006-05-07 23:41:18.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/ko/workspace-switcher/Makefile.in gnome-panel-2.14.1.new/help/ko/workspace-switcher/Makefile.in +--- gnome-panel-2.14.1/help/ko/workspace-switcher/Makefile.in 2006-04-10 15:46:26.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/ko/workspace-switcher/Makefile.in 2006-05-07 23:41:18.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/Makefile.in gnome-panel-2.14.1.new/help/Makefile.in +--- gnome-panel-2.14.1/help/Makefile.in 2006-04-10 15:46:24.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/Makefile.in 2006-05-07 23:41:16.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -33,7 +33,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = help + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +@@ -224,8 +223,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -305,13 +302,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -323,7 +314,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -331,13 +322,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -358,7 +343,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -457,17 +442,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="../$(top_distdir)" \ ++ distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ +@@ -496,7 +479,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/help/sv/fish/Makefile.in gnome-panel-2.14.1.new/help/sv/fish/Makefile.in +--- gnome-panel-2.14.1/help/sv/fish/Makefile.in 2006-04-10 15:46:27.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/sv/fish/Makefile.in 2006-05-07 23:41:19.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/sv/Makefile.in gnome-panel-2.14.1.new/help/sv/Makefile.in +--- gnome-panel-2.14.1/help/sv/Makefile.in 2006-04-10 15:46:26.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/sv/Makefile.in 2006-05-07 23:41:18.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -33,7 +33,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = help/sv + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -224,8 +223,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -305,13 +302,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -323,7 +314,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -331,13 +322,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -358,7 +343,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -457,17 +442,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="../$(top_distdir)" \ ++ distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ +@@ -496,7 +479,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/help/sv/window-list/Makefile.in gnome-panel-2.14.1.new/help/sv/window-list/Makefile.in +--- gnome-panel-2.14.1/help/sv/window-list/Makefile.in 2006-04-10 15:46:27.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/sv/window-list/Makefile.in 2006-05-07 23:41:19.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/sv/workspace-switcher/Makefile.in gnome-panel-2.14.1.new/help/sv/workspace-switcher/Makefile.in +--- gnome-panel-2.14.1/help/sv/workspace-switcher/Makefile.in 2006-04-10 15:46:27.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/sv/workspace-switcher/Makefile.in 2006-05-07 23:41:19.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/window-list/Makefile.in gnome-panel-2.14.1.new/help/window-list/Makefile.in +--- gnome-panel-2.14.1/help/window-list/Makefile.in 2006-04-10 15:46:27.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/window-list/Makefile.in 2006-05-07 23:41:19.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -57,7 +57,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/gnome-doc-utils.make +@@ -240,8 +239,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -534,7 +531,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -589,16 +586,16 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distclean-local distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-local mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distclean-local distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am \ ++ install-data-local install-exec install-exec-am install-info \ ++ install-info-am install-man install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-local mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + DOC_H_FILE ?= +diff -Nur gnome-panel-2.14.1/help/workspace-switcher/Makefile.in gnome-panel-2.14.1.new/help/workspace-switcher/Makefile.in +--- gnome-panel-2.14.1/help/workspace-switcher/Makefile.in 2006-04-10 15:46:27.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/workspace-switcher/Makefile.in 2006-05-07 23:41:19.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -57,7 +57,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/gnome-doc-utils.make +@@ -240,8 +239,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -534,7 +531,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -589,16 +586,16 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distclean-local distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-local mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distclean-local distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am \ ++ install-data-local install-exec install-exec-am install-info \ ++ install-info-am install-man install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-local mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + DOC_H_FILE ?= +diff -Nur gnome-panel-2.14.1/help/zh_CN/fish/Makefile.in gnome-panel-2.14.1.new/help/zh_CN/fish/Makefile.in +--- gnome-panel-2.14.1/help/zh_CN/fish/Makefile.in 2006-04-10 15:46:28.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/zh_CN/fish/Makefile.in 2006-05-07 23:41:19.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/zh_CN/Makefile.in gnome-panel-2.14.1.new/help/zh_CN/Makefile.in +--- gnome-panel-2.14.1/help/zh_CN/Makefile.in 2006-04-10 15:46:28.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/zh_CN/Makefile.in 2006-05-07 23:41:19.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -33,7 +33,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = help/zh_CN + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -224,8 +223,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -305,13 +302,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -323,7 +314,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -331,13 +322,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -358,7 +343,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -457,17 +442,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="../$(top_distdir)" \ ++ distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ +@@ -496,7 +479,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/help/zh_CN/window-list/Makefile.in gnome-panel-2.14.1.new/help/zh_CN/window-list/Makefile.in +--- gnome-panel-2.14.1/help/zh_CN/window-list/Makefile.in 2006-04-10 15:46:28.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/zh_CN/window-list/Makefile.in 2006-05-07 23:41:20.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/zh_CN/workspace-switcher/Makefile.in gnome-panel-2.14.1.new/help/zh_CN/workspace-switcher/Makefile.in +--- gnome-panel-2.14.1/help/zh_CN/workspace-switcher/Makefile.in 2006-04-10 15:46:28.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/zh_CN/workspace-switcher/Makefile.in 2006-05-07 23:41:20.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/zh_TW/fish/Makefile.in gnome-panel-2.14.1.new/help/zh_TW/fish/Makefile.in +--- gnome-panel-2.14.1/help/zh_TW/fish/Makefile.in 2006-04-10 15:46:28.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/zh_TW/fish/Makefile.in 2006-05-07 23:41:20.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/zh_TW/Makefile.in gnome-panel-2.14.1.new/help/zh_TW/Makefile.in +--- gnome-panel-2.14.1/help/zh_TW/Makefile.in 2006-04-10 15:46:28.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/zh_TW/Makefile.in 2006-05-07 23:41:20.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -33,7 +33,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = help/zh_TW + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -224,8 +223,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -305,13 +302,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -323,7 +314,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -331,13 +322,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -358,7 +343,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -457,17 +442,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="../$(top_distdir)" \ ++ distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ +@@ -496,7 +479,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/help/zh_TW/window-list/Makefile.in gnome-panel-2.14.1.new/help/zh_TW/window-list/Makefile.in +--- gnome-panel-2.14.1/help/zh_TW/window-list/Makefile.in 2006-04-10 15:46:28.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/zh_TW/window-list/Makefile.in 2006-05-07 23:41:20.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/help/zh_TW/workspace-switcher/Makefile.in gnome-panel-2.14.1.new/help/zh_TW/workspace-switcher/Makefile.in +--- gnome-panel-2.14.1/help/zh_TW/workspace-switcher/Makefile.in 2006-04-10 15:46:29.000000000 +0200 ++++ gnome-panel-2.14.1.new/help/zh_TW/workspace-switcher/Makefile.in 2006-05-07 23:41:20.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -95,7 +95,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make +@@ -278,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -429,7 +426,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -483,15 +480,15 @@ + uninstall-am: uninstall-info-am uninstall-local + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-data-local \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-info-am \ ++ uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.14.1/icons/Makefile.in gnome-panel-2.14.1.new/icons/Makefile.in +--- gnome-panel-2.14.1/icons/Makefile.in 2006-04-10 15:46:29.000000000 +0200 ++++ gnome-panel-2.14.1.new/icons/Makefile.in 2006-05-07 23:41:20.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -34,7 +34,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = icons + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -50,12 +49,6 @@ + CONFIG_CLEAN_FILES = + SOURCES = + DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + am__installdirs = "$(DESTDIR)$(gegldir)" "$(DESTDIR)$(icondir)" + geglDATA_INSTALL = $(INSTALL_DATA) + iconDATA_INSTALL = $(INSTALL_DATA) +@@ -226,8 +219,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -319,7 +310,7 @@ + test -z "$(gegldir)" || $(mkdir_p) "$(DESTDIR)$(gegldir)" + @list='$(gegl_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(geglDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gegldir)/$$f'"; \ + $(geglDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gegldir)/$$f"; \ + done +@@ -327,7 +318,7 @@ + uninstall-geglDATA: + @$(NORMAL_UNINSTALL) + @list='$(gegl_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(gegldir)/$$f'"; \ + rm -f "$(DESTDIR)$(gegldir)/$$f"; \ + done +@@ -336,7 +327,7 @@ + test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)" + @list='$(icon_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \ + $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \ + done +@@ -344,7 +335,7 @@ + uninstall-iconDATA: + @$(NORMAL_UNINSTALL) + @list='$(icon_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \ + rm -f "$(DESTDIR)$(icondir)/$$f"; \ + done +@@ -408,7 +399,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/idl/Makefile.in gnome-panel-2.14.1.new/idl/Makefile.in +--- gnome-panel-2.14.1/idl/Makefile.in 2006-04-10 15:46:29.000000000 +0200 ++++ gnome-panel-2.14.1.new/idl/Makefile.in 2006-05-07 23:41:20.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -34,7 +34,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = idl + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +@@ -50,12 +49,6 @@ + CONFIG_CLEAN_FILES = + SOURCES = + DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + am__installdirs = "$(DESTDIR)$(idldir)" + idlDATA_INSTALL = $(INSTALL_DATA) + DATA = $(idl_DATA) +@@ -225,8 +218,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -305,7 +296,7 @@ + test -z "$(idldir)" || $(mkdir_p) "$(DESTDIR)$(idldir)" + @list='$(idl_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(idlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(idldir)/$$f'"; \ + $(idlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(idldir)/$$f"; \ + done +@@ -313,7 +304,7 @@ + uninstall-idlDATA: + @$(NORMAL_UNINSTALL) + @list='$(idl_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(idldir)/$$f'"; \ + rm -f "$(DESTDIR)$(idldir)/$$f"; \ + done +@@ -377,7 +368,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/install-sh gnome-panel-2.14.1.new/install-sh +--- gnome-panel-2.14.1/install-sh 2006-04-10 15:46:22.000000000 +0200 ++++ gnome-panel-2.14.1.new/install-sh 2006-05-07 23:41:14.000000000 +0200 +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2005-05-14.22 ++scriptversion=2004-04-01.17 + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -58,6 +58,9 @@ + rmprog="${RMPROG-rm}" + mkdirprog="${MKDIRPROG-mkdir}" + ++transformbasename= ++transform_arg= ++instcmd="$mvprog" + chmodcmd="$chmodprog 0755" + chowncmd= + chgrpcmd= +@@ -67,27 +70,23 @@ + src= + dst= + dir_arg= +-dstarg= +-no_target_directory= + +-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++usage="Usage: $0 [OPTION]... SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY +- or: $0 [OPTION]... -t DIRECTORY SRCFILES... +- or: $0 [OPTION]... -d DIRECTORIES... ++ or: $0 -d DIRECTORIES... + +-In the 1st form, copy SRCFILE to DSTFILE. +-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +-In the 4th, create DIRECTORIES. ++In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default. ++In the second, create the directory path DIR. + + Options: +--c (ignored) ++-b=TRANSFORMBASENAME ++-c copy source (using $cpprog) instead of moving (using $mvprog). + -d create directories instead of installing files. +--g GROUP $chgrpprog installed files to GROUP. +--m MODE $chmodprog installed files to MODE. +--o USER $chownprog installed files to USER. +--s $stripprog installed files. +--t DIRECTORY install into DIRECTORY. +--T report an error if DSTFILE is a directory. ++-g GROUP $chgrp installed files to GROUP. ++-m MODE $chmod installed files to MODE. ++-o USER $chown installed files to USER. ++-s strip installed files (using $stripprog). ++-t=TRANSFORM + --help display this help and exit. + --version display version info and exit. + +@@ -97,7 +96,12 @@ + + while test -n "$1"; do + case $1 in +- -c) shift ++ -b=*) transformbasename=`echo $1 | sed 's/-b=//'` ++ shift ++ continue;; ++ ++ -c) instcmd=$cpprog ++ shift + continue;; + + -d) dir_arg=true +@@ -109,7 +113,7 @@ + shift + continue;; + +- --help) echo "$usage"; exit $?;; ++ --help) echo "$usage"; exit 0;; + + -m) chmodcmd="$chmodprog $2" + shift +@@ -125,20 +129,14 @@ + shift + continue;; + +- -t) dstarg=$2 +- shift +- shift +- continue;; +- +- -T) no_target_directory=true +- shift +- continue;; ++ -t=*) transformarg=`echo $1 | sed 's/-t=//'` ++ shift ++ continue;; + +- --version) echo "$0 $scriptversion"; exit $?;; ++ --version) echo "$0 $scriptversion"; exit 0;; + + *) # When -d is used, all remaining arguments are directories to create. +- # When -t is used, the destination is already specified. +- test -n "$dir_arg$dstarg" && break ++ test -n "$dir_arg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do +@@ -176,13 +174,13 @@ + src= + + if test -d "$dst"; then +- mkdircmd=: ++ instcmd=: + chmodcmd= + else +- mkdircmd=$mkdirprog ++ instcmd=$mkdirprog + fi + else +- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ++ # Waiting for this to be detected by the "$instcmd $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then +@@ -204,16 +202,12 @@ + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then +- if test -n "$no_target_directory"; then +- echo "$0: $dstarg: Is a directory" >&2 +- exit 1 +- fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. +- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` ++ dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + +@@ -226,8 +220,7 @@ + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' +- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` +- shift ++ set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + IFS=$oIFS + + pathcomp= +@@ -236,42 +229,51 @@ + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then +- $mkdirprog "$pathcomp" ++ $mkdirprog "$pathcomp" || lasterr=$? + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. +- test -d "$pathcomp" || exit ++ test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; } + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then +- $doit $mkdircmd "$dst" \ ++ $doit $instcmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else +- dstfile=`basename "$dst"` ++ # If we're going to rename the final executable, determine the name now. ++ if test -z "$transformarg"; then ++ dstfile=`basename "$dst"` ++ else ++ dstfile=`basename "$dst" $transformbasename \ ++ | sed $transformarg`$transformbasename ++ fi ++ ++ # don't allow the sed command to completely eliminate the filename. ++ test -z "$dstfile" && dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. +- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ++ trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 + trap '(exit $?); exit' 1 2 13 15 + +- # Copy the file name to the temp name. +- $doit $cpprog "$src" "$dsttmp" && ++ # Move or copy the file name to the temp name ++ $doit $instcmd "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore +- # errors from the above "$doit $cpprog $src $dsttmp" command. ++ # errors from the above "$doit $instcmd $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ +@@ -296,7 +298,7 @@ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 +- (exit 1); exit 1 ++ (exit 1); exit + } + else + : +@@ -307,12 +309,12 @@ + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } +- fi || { (exit 1); exit 1; } ++ fi || { (exit 1); exit; } + done + + # The final little trick to "correctly" pass the exit status to the exit trap. + { +- (exit 0); exit 0 ++ (exit 0); exit + } + + # Local variables: +diff -Nur gnome-panel-2.14.1/intltool-extract.in gnome-panel-2.14.1.new/intltool-extract.in +--- gnome-panel-2.14.1/intltool-extract.in 2006-04-10 15:46:08.000000000 +0200 ++++ gnome-panel-2.14.1.new/intltool-extract.in 2006-05-07 23:41:04.000000000 +0200 +@@ -32,7 +32,7 @@ + ## Release information + my $PROGRAM = "intltool-extract"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.34.1"; ++my $VERSION = "0.34.2"; + + ## Loaded modules + use strict; +diff -Nur gnome-panel-2.14.1/intltool-merge.in gnome-panel-2.14.1.new/intltool-merge.in +--- gnome-panel-2.14.1/intltool-merge.in 2006-04-10 15:46:08.000000000 +0200 ++++ gnome-panel-2.14.1.new/intltool-merge.in 2006-05-07 23:41:04.000000000 +0200 +@@ -35,7 +35,7 @@ + ## Release information + my $PROGRAM = "intltool-merge"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.34.1"; ++my $VERSION = "0.34.2"; + + ## Loaded modules + use strict; +diff -Nur gnome-panel-2.14.1/intltool-update.in gnome-panel-2.14.1.new/intltool-update.in +--- gnome-panel-2.14.1/intltool-update.in 2006-04-10 15:46:08.000000000 +0200 ++++ gnome-panel-2.14.1.new/intltool-update.in 2006-05-07 23:41:04.000000000 +0200 +@@ -30,7 +30,7 @@ + + ## Release information + my $PROGRAM = "intltool-update"; +-my $VERSION = "0.34.1"; ++my $VERSION = "0.34.2"; + my $PACKAGE = "intltool"; + + ## Loaded modules +diff -Nur gnome-panel-2.14.1/libpanel-applet/Makefile.in gnome-panel-2.14.1.new/libpanel-applet/Makefile.in +--- gnome-panel-2.14.1/libpanel-applet/Makefile.in 2006-04-10 15:46:29.000000000 +0200 ++++ gnome-panel-2.14.1.new/libpanel-applet/Makefile.in 2006-05-07 23:41:21.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,6 +17,8 @@ + + + ++SOURCES = $(libpanel_applet_2_la_SOURCES) panel-test-applets.c test-bonobo-applet.c ++ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -37,7 +39,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + noinst_PROGRAMS = test-bonobo-applet$(EXEEXT) + bin_PROGRAMS = panel-test-applets$(EXEEXT) +@@ -57,15 +58,7 @@ + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = libpanelapplet-2.0.pc \ + libpanelapplet-2.0-uninstalled.pc +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ +- "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(pkgconfigdir)" \ +- "$(DESTDIR)$(libpanel_appletincludedir)" ++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libpanel_appletincludedir)" + libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = +@@ -89,13 +82,23 @@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/GNOME_Panel-common.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/GNOME_Panel-skels.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/GNOME_Panel-stubs.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-applet-enums.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-applet-gconf.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-applet-marshal.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-applet-shell.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-applet.Plo \ ++@AMDEP_TRUE@ ./$(DEPDIR)/panel-test-applets.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/test-bonobo-applet.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(libpanel_applet_2_la_SOURCES) panel-test-applets.c \ + test-bonobo-applet.c +@@ -274,8 +277,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -421,7 +422,7 @@ + test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ +@@ -429,8 +430,8 @@ + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done +@@ -508,21 +509,24 @@ + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -539,7 +543,7 @@ + test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)" + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ + $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ + done +@@ -547,7 +551,7 @@ + uninstall-gladeDATA: + @$(NORMAL_UNINSTALL) + @list='$(glade_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ + rm -f "$(DESTDIR)$(gladedir)/$$f"; \ + done +@@ -556,7 +560,7 @@ + test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done +@@ -564,7 +568,7 @@ + uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done +@@ -573,7 +577,7 @@ + test -z "$(libpanel_appletincludedir)" || $(mkdir_p) "$(DESTDIR)$(libpanel_appletincludedir)" + @list='$(libpanel_appletinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(libpanel_appletincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libpanel_appletincludedir)/$$f'"; \ + $(libpanel_appletincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libpanel_appletincludedir)/$$f"; \ + done +@@ -581,7 +585,7 @@ + uninstall-libpanel_appletincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libpanel_appletinclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(libpanel_appletincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(libpanel_appletincludedir)/$$f"; \ + done +@@ -695,7 +699,7 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -758,14 +762,13 @@ + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libLTLIBRARIES clean-libtool \ +- clean-noinstPROGRAMS ctags dist-hook distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binPROGRAMS install-data \ +- install-data-am install-exec install-exec-am install-gladeDATA \ +- install-info install-info-am install-libLTLIBRARIES \ +- install-libpanel_appletincludeHEADERS install-man \ +- install-pkgconfigDATA install-strip installcheck \ ++ clean-noinstPROGRAMS ctags distclean distclean-compile \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-binPROGRAMS install-data install-data-am install-exec \ ++ install-exec-am install-gladeDATA install-info install-info-am \ ++ install-libLTLIBRARIES install-libpanel_appletincludeHEADERS \ ++ install-man install-pkgconfigDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +diff -Nur gnome-panel-2.14.1/ltmain.sh gnome-panel-2.14.1.new/ltmain.sh +--- gnome-panel-2.14.1/ltmain.sh 2005-09-18 19:14:19.000000000 +0200 ++++ gnome-panel-2.14.1.new/ltmain.sh 2006-01-10 16:23:50.000000000 +0100 +@@ -43,8 +43,8 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION=1.5.18 +-TIMESTAMP=" (1.1220.2.245 2005/05/16 08:55:27)" ++VERSION="1.5.22 Debian 1.5.22-2" ++TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" + + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. +@@ -88,14 +88,15 @@ + Xsed="${SED}"' -e 1s/^X//' + sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' + # test EBCDIC or ASCII +-case `echo A|tr A '\301'` in +- A) # EBCDIC based system +- SP2NL="tr '\100' '\n'" +- NL2SP="tr '\r\n' '\100\100'" ++case `echo X|tr X '\101'` in ++ A) # ASCII based system ++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr ++ SP2NL='tr \040 \012' ++ NL2SP='tr \015\012 \040\040' + ;; +- *) # Assume ASCII based system +- SP2NL="tr '\040' '\012'" +- NL2SP="tr '\015\012' '\040\040'" ++ *) # EBCDIC based system ++ SP2NL='tr \100 \n' ++ NL2SP='tr \r\n \100\100' + ;; + esac + +@@ -131,14 +132,52 @@ + show="$echo" + show_help= + execute_dlfiles= ++duplicate_deps=no ++preserve_args= + lo2o="s/\\.lo\$/.${objext}/" + o2lo="s/\\.${objext}\$/.lo/" +-quote_scanset='[[~#^*{};<>?'"'"' ]' + + ##################################### + # Shell function definitions: + # This seems to be the best place for them + ++# func_mktempdir [string] ++# Make a temporary directory that won't clash with other running ++# libtool processes, and avoids race conditions if possible. If ++# given, STRING is the basename for that directory. ++func_mktempdir () ++{ ++ my_template="${TMPDIR-/tmp}/${1-$progname}" ++ ++ if test "$run" = ":"; then ++ # Return a directory name, but don't create it in dry-run mode ++ my_tmpdir="${my_template}-$$" ++ else ++ ++ # If mktemp works, use that first and foremost ++ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` ++ ++ if test ! -d "$my_tmpdir"; then ++ # Failing that, at least try and use $RANDOM to avoid a race ++ my_tmpdir="${my_template}-${RANDOM-0}$$" ++ ++ save_mktempdir_umask=`umask` ++ umask 0077 ++ $mkdir "$my_tmpdir" ++ umask $save_mktempdir_umask ++ fi ++ ++ # If we're not in dry-run mode, bomb out on failure ++ test -d "$my_tmpdir" || { ++ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 ++ exit $EXIT_FAILURE ++ } ++ fi ++ ++ $echo "X$my_tmpdir" | $Xsed ++} ++ ++ + # func_win32_libid arg + # return the library type of file 'arg' + # +@@ -157,12 +196,11 @@ + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ + $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | \ +- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` +- if test "X$win32_nmres" = "Ximport" ; then +- win32_libid_type="x86 archive import" +- else +- win32_libid_type="x86 archive static" +- fi ++ $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` ++ case $win32_nmres in ++ import*) win32_libid_type="x86 archive import";; ++ *) win32_libid_type="x86 archive static";; ++ esac + fi + ;; + *DLL*) +@@ -192,7 +230,7 @@ + CC_quoted= + for arg in $CC; do + case $arg in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -213,7 +251,7 @@ + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + case $arg in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -295,9 +333,9 @@ + $run ${rm}r "$my_xdir" + $show "$mkdir $my_xdir" + $run $mkdir "$my_xdir" +- status=$? +- if test "$status" -ne 0 && test ! -d "$my_xdir"; then +- exit $status ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then ++ exit $exit_status + fi + case $host in + *-darwin*) +@@ -337,7 +375,7 @@ + func_extract_an_archive "$my_xdir" "$my_xabs" + fi # $darwin_arches + fi # $run +- ;; ++ ;; + *) + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; +@@ -352,6 +390,8 @@ + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + ++disable_libs=no ++ + # Parse our command line options once, thoroughly. + while test "$#" -gt 0 + do +@@ -468,7 +508,11 @@ + preserve_args="$preserve_args $arg" + ;; + +- --tag) prevopt="--tag" prev=tag ;; ++ --tag) ++ prevopt="--tag" ++ prev=tag ++ preserve_args="$preserve_args --tag" ++ ;; + --tag=*) + set tag "$optarg" ${1+"$@"} + shift +@@ -500,6 +544,18 @@ + exit $EXIT_FAILURE + fi + ++case $disable_libs in ++no) ++ ;; ++shared) ++ build_libtool_libs=no ++ build_old_libs=yes ++ ;; ++static) ++ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` ++ ;; ++esac ++ + # If this variable is set in any of the actions, the command in it + # will be execed at the end. This prevents here-documents from being + # left over by shells. +@@ -576,7 +632,7 @@ + + for arg + do +- case "$arg_mode" in ++ case $arg_mode in + arg ) + # do not "continue". Instead, add this to base_compile + lastarg="$arg" +@@ -627,7 +683,7 @@ + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + case $arg in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -662,7 +718,7 @@ + # in scan sets (worked around with variable expansion), + # and furthermore cannot handle '|' '&' '(' ')' in scan sets + # at all, so we specify them separately. +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + lastarg="\"$lastarg\"" + ;; + esac +@@ -737,13 +793,12 @@ + + qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` + case $qlibobj in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + qlibobj="\"$qlibobj\"" ;; + esac +- if test "X$libobj" != "X$qlibobj"; then +- $echo "$modename: libobj name \`$libobj' may not contain shell special characters." +- exit $EXIT_FAILURE +- fi ++ test "X$libobj" != "X$qlibobj" \ ++ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ ++ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." + objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` + xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$obj"; then +@@ -824,7 +879,7 @@ + fi + qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` + case $qsrcfile in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + qsrcfile="\"$qsrcfile\"" ;; + esac + +@@ -857,9 +912,9 @@ + if test ! -d "${xdir}$objdir"; then + $show "$mkdir ${xdir}$objdir" + $run $mkdir ${xdir}$objdir +- status=$? +- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then +- exit $status ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then ++ exit $exit_status + fi + fi + +@@ -1062,6 +1117,7 @@ + no_install=no + objs= + non_pic_objects= ++ notinst_path= # paths that contain not-installed libtool libraries + precious_files_regex= + prefer_static_libs=no + preload=no +@@ -1090,14 +1146,15 @@ + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi ++ prefer_static_libs=yes + else + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi ++ prefer_static_libs=built + fi + build_libtool_libs=no + build_old_libs=yes +- prefer_static_libs=yes + break + ;; + esac +@@ -1111,7 +1168,7 @@ + arg="$1" + shift + case $arg in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test + ;; + *) qarg=$arg ;; +@@ -1272,6 +1329,11 @@ + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ non_pic_objects="$non_pic_objects $non_pic_object" + fi + else + # Only an error if not doing a dry-run. +@@ -1355,8 +1417,8 @@ + prev= + continue + ;; +- darwin_framework) +- compiler_flags="$compiler_flags $arg" ++ darwin_framework|darwin_framework_skip) ++ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + prev= +@@ -1420,13 +1482,17 @@ + continue + ;; + +- -framework) +- prev=darwin_framework +- compiler_flags="$compiler_flags $arg" ++ -framework|-arch|-isysroot) ++ case " $CC " in ++ *" ${arg} ${1} "* | *" ${arg} ${1} "*) ++ prev=darwin_framework_skip ;; ++ *) compiler_flags="$compiler_flags $arg" ++ prev=darwin_framework ;; ++ esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- continue +- ;; ++ continue ++ ;; + + -inst-prefix-dir) + prev=inst_prefix +@@ -1454,7 +1520,8 @@ + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 +- exit $EXIT_FAILURE ++ absdir="$dir" ++ notinst_path="$notinst_path $dir" + fi + dir="$absdir" + ;; +@@ -1468,10 +1535,15 @@ + esac + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; + *) dllsearchpath="$dllsearchpath:$dir";; + esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac + ;; + esac + continue +@@ -1480,11 +1552,11 @@ + -l*) + if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + case $host in +- *-*-cygwin* | *-*-pw32* | *-*-beos*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) + # These systems don't actually have a C or math library (as such) + continue + ;; +- *-*-mingw* | *-*-os2*) ++ *-*-os2*) + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; +@@ -1496,6 +1568,15 @@ + # Rhapsody C and math libraries are in the System framework + deplibs="$deplibs -framework System" + continue ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work ++ test "X$arg" = "X-lc" && continue ++ ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +@@ -1537,21 +1618,24 @@ + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m* pass through architecture-specific compiler args for GCC +- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) ++ # -m*, -t[45]*, -txscale* pass through architecture-specific ++ # compiler args for GCC ++ # -pg pass through profiling flag for GCC ++ # @file GCC response files ++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ ++ -t[45]*|-txscale*|@*) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then +- compiler_flags="$compiler_flags $arg" +- fi ++ compiler_flags="$compiler_flags $arg" + continue + ;; + +@@ -1659,7 +1743,7 @@ + for flag in $args; do + IFS="$save_ifs" + case $flag in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + flag="\"$flag\"" + ;; + esac +@@ -1677,7 +1761,7 @@ + for flag in $args; do + IFS="$save_ifs" + case $flag in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + flag="\"$flag\"" + ;; + esac +@@ -1710,7 +1794,7 @@ + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -1789,6 +1873,11 @@ + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ non_pic_objects="$non_pic_objects $non_pic_object" + fi + else + # Only an error if not doing a dry-run. +@@ -1844,7 +1933,7 @@ + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -1894,9 +1983,9 @@ + if test ! -d "$output_objdir"; then + $show "$mkdir $output_objdir" + $run $mkdir $output_objdir +- status=$? +- if test "$status" -ne 0 && test ! -d "$output_objdir"; then +- exit $status ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then ++ exit $exit_status + fi + fi + +@@ -1959,7 +2048,6 @@ + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries +- notinst_path= # paths that contain not-installed libtool libraries + case $linkmode in + lib) + passes="conv link" +@@ -1994,7 +2082,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$pass" = dlopen; then +@@ -2195,7 +2286,7 @@ + esac # case $deplib + if test "$found" = yes || test -f "$lib"; then : + else +- $echo "$modename: cannot find the library \`$lib'" 1>&2 ++ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 + exit $EXIT_FAILURE + fi + +@@ -2409,7 +2500,7 @@ + case "$temp_rpath " in + *" $dir "*) ;; + *" $absdir "*) ;; +- *) temp_rpath="$temp_rpath $dir" ;; ++ *) temp_rpath="$temp_rpath $absdir" ;; + esac + fi + +@@ -2446,8 +2537,12 @@ + fi + + link_static=no # Whether the deplib will be linked statically ++ use_static_libs=$prefer_static_libs ++ if test "$use_static_libs" = built && test "$installed" = yes ; then ++ use_static_libs=no ++ fi + if test -n "$library_names" && +- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then ++ { test "$use_static_libs" = no || test -z "$old_library"; }; then + if test "$installed" = no; then + notinst_deplibs="$notinst_deplibs $lib" + need_relink=yes +@@ -2560,11 +2655,15 @@ + if test "$hardcode_direct" = no; then + add="$dir/$linklib" + case $host in +- *-*-sco3.2v5* ) add_dir="-L$dir" ;; ++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; ++ *-*-sysv4*uw2*) add_dir="-L$dir" ;; ++ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ ++ *-*-unixware7*) add_dir="-L$dir" ;; + *-*-darwin* ) + # if the lib is a module then we can not link against + # it, someone is ignoring the new warnings I added +- if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then ++ if /usr/bin/file -L $add 2> /dev/null | ++ $EGREP ": [^:]* bundle" >/dev/null ; then + $echo "** Warning, lib $linklib is a module, not a shared library" + if test -z "$old_library" ; then + $echo +@@ -2595,7 +2694,7 @@ + add_dir="-L$dir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then +- case "$libdir" in ++ case $libdir in + [\\/]*) + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; +@@ -2668,7 +2767,7 @@ + add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then +- case "$libdir" in ++ case $libdir in + [\\/]*) + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; +@@ -2729,8 +2828,6 @@ + fi + fi + else +- convenience="$convenience $dir/$old_library" +- old_convenience="$old_convenience $dir/$old_library" + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi +@@ -3107,6 +3204,11 @@ + age="$number_minor" + revision="$number_minor" + ;; ++ *) ++ $echo "$modename: unknown library version type \`$version_type'" 1>&2 ++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ++ exit $EXIT_FAILURE ++ ;; + esac + ;; + no) +@@ -3317,9 +3419,9 @@ + + # Eliminate all temporary directories. + for path in $notinst_path; do +- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` +- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` +- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` ++ lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` ++ deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` ++ dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` + done + + if test -n "$xrpath"; then +@@ -3372,7 +3474,12 @@ + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. +- test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work + ;; + *) + # Add libc to deplibs on all other systems if necessary. +@@ -3416,11 +3523,11 @@ + int main() { return 0; } + EOF + $rm conftest +- $LTCC -o conftest conftest.c $deplibs ++ $LTCC $LTCFLAGS -o conftest conftest.c $deplibs + if test "$?" -eq 0 ; then + ldd_output=`ldd conftest` + for i in $deplibs; do +- name="`expr $i : '-l\(.*\)'`" ++ name=`expr $i : '-l\(.*\)'` + # If $name is empty we are operating on a -L argument. + if test "$name" != "" && test "$name" -ne "0"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +@@ -3457,11 +3564,11 @@ + # Error occurred in the first compile. Let's try to salvage + # the situation: Compile a separate program for each library. + for i in $deplibs; do +- name="`expr $i : '-l\(.*\)'`" ++ name=`expr $i : '-l\(.*\)'` + # If $name is empty we are operating on a -L argument. + if test "$name" != "" && test "$name" != "0"; then + $rm conftest +- $LTCC -o conftest conftest.c $i ++ $LTCC $LTCFLAGS -o conftest conftest.c $i + # Did it work? + if test "$?" -eq 0 ; then + ldd_output=`ldd conftest` +@@ -3509,7 +3616,7 @@ + set dummy $deplibs_check_method + file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` + for a_deplib in $deplibs; do +- name="`expr $a_deplib : '-l\(.*\)'`" ++ name=`expr $a_deplib : '-l\(.*\)'` + # If $name is empty we are operating on a -L argument. + if test "$name" != "" && test "$name" != "0"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +@@ -3578,7 +3685,7 @@ + set dummy $deplibs_check_method + match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` + for a_deplib in $deplibs; do +- name="`expr $a_deplib : '-l\(.*\)'`" ++ name=`expr $a_deplib : '-l\(.*\)'` + # If $name is empty we are operating on a -L argument. + if test -n "$name" && test "$name" != "0"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +@@ -3708,6 +3815,35 @@ + deplibs=$newdeplibs + fi + ++ ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac ++ ;; ++ esac ++ done ++ for deplib in $deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ deplibs="$new_libs" ++ ++ + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= +@@ -3791,6 +3927,7 @@ + fi + + lib="$output_objdir/$realname" ++ linknames= + for link + do + linknames="$linknames $link" +@@ -3819,6 +3956,9 @@ + # The command line is too long to execute in one step. + $show "using reloadable object file for export list..." + skipped_export=: ++ # Break out early, otherwise skipped_export may be ++ # set to false by a later but shorter cmd. ++ break + fi + done + IFS="$save_ifs" +@@ -3888,7 +4028,8 @@ + fi + fi + +- if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && ++ if test "X$skipped_export" != "X:" && ++ len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else +@@ -3923,7 +4064,7 @@ + do + eval test_cmds=\"$reload_cmds $objlist $last_robj\" + if test "X$objlist" = X || +- { len=`expr "X$test_cmds" : ".*"` && ++ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + test "$len" -le "$max_cmd_len"; }; then + objlist="$objlist $obj" + else +@@ -4013,13 +4154,30 @@ + IFS="$save_ifs" + eval cmd=\"$cmd\" + $show "$cmd" +- $run eval "$cmd" || exit $? ++ $run eval "$cmd" || { ++ lt_exit=$? ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' ++ fi ++ ++ exit $lt_exit ++ } + done + IFS="$save_ifs" + + # Restore the uninstalled library and exit + if test "$mode" = relink; then + $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? ++ ++ if test -n "$convenience"; then ++ if test -z "$whole_archive_flag_spec"; then ++ $show "${rm}r $gentop" ++ $run ${rm}r "$gentop" ++ fi ++ fi ++ + exit $EXIT_SUCCESS + fi + +@@ -4201,6 +4359,35 @@ + ;; + esac + ++ ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $compile_deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac ++ ;; ++ esac ++ done ++ for deplib in $compile_deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ compile_deplibs="$new_libs" ++ ++ + compile_command="$compile_command $compile_deplibs" + finalize_command="$finalize_command $finalize_deplibs" + +@@ -4245,10 +4432,15 @@ + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + *) dllsearchpath="$dllsearchpath:$libdir";; + esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac + ;; + esac + done +@@ -4364,11 +4556,23 @@ + if test -z "$export_symbols"; then + export_symbols="$output_objdir/$outputname.exp" + $run $rm $export_symbols +- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' ++ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' ++ case $host in ++ *cygwin* | *mingw* ) ++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac + else +- $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + $run eval 'mv "$nlist"T "$nlist"' ++ case $host in ++ *cygwin* | *mingw* ) ++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac + fi + fi + +@@ -4485,16 +4689,29 @@ + esac + + # Now compile the dynamic symbol file. +- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" +- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? ++ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" ++ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + + # Clean up the generated files. + $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" + $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" + + # Transform the symbol file into the correct name. +- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` +- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ++ case $host in ++ *cygwin* | *mingw* ) ++ if test -f "$output_objdir/${outputname}.def" ; then ++ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` ++ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` ++ else ++ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ++ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ++ fi ++ ;; ++ * ) ++ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ++ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ++ ;; ++ esac + ;; + *) + $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 +@@ -4519,7 +4736,7 @@ + # We have no uninstalled library dependencies, so finalize right now. + $show "$link_command" + $run eval "$link_command" +- status=$? ++ exit_status=$? + + # Delete the generated files. + if test -n "$dlsyms"; then +@@ -4527,7 +4744,7 @@ + $run $rm "$output_objdir/${outputname}S.${objext}" + fi + +- exit $status ++ exit $exit_status + fi + + if test -n "$shlibpath_var"; then +@@ -4667,10 +4884,12 @@ + esac + case $host in + *cygwin* | *mingw* ) +- cwrappersource=`$echo ${objdir}/lt-${outputname}.c` +- cwrapper=`$echo ${output}.exe` +- $rm $cwrappersource $cwrapper +- trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 ++ output_name=`basename $output` ++ output_path=`dirname $output` ++ cwrappersource="$output_path/$objdir/lt-$output_name.c" ++ cwrapper="$output_path/$output_name.exe" ++ $rm $cwrappersource $cwrapper ++ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + cat > $cwrappersource < + #include + #include ++#include ++#include ++#include + + #if defined(PATH_MAX) + # define LT_PATHMAX PATH_MAX +@@ -4705,15 +4927,19 @@ + #endif + + #ifndef DIR_SEPARATOR +-#define DIR_SEPARATOR '/' ++# define DIR_SEPARATOR '/' ++# define PATH_SEPARATOR ':' + #endif + + #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +-#define HAVE_DOS_BASED_FILE_SYSTEM +-#ifndef DIR_SEPARATOR_2 +-#define DIR_SEPARATOR_2 '\\' +-#endif ++# define HAVE_DOS_BASED_FILE_SYSTEM ++# ifndef DIR_SEPARATOR_2 ++# define DIR_SEPARATOR_2 '\\' ++# endif ++# ifndef PATH_SEPARATOR_2 ++# define PATH_SEPARATOR_2 ';' ++# endif + #endif + + #ifndef DIR_SEPARATOR_2 +@@ -4723,17 +4949,32 @@ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) + #endif /* DIR_SEPARATOR_2 */ + ++#ifndef PATH_SEPARATOR_2 ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) ++#else /* PATH_SEPARATOR_2 */ ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) ++#endif /* PATH_SEPARATOR_2 */ ++ + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) + #define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ + } while (0) + ++/* -DDEBUG is fairly common in CFLAGS. */ ++#undef DEBUG ++#if defined DEBUGWRAPPER ++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) ++#else ++# define DEBUG(format, ...) ++#endif ++ + const char *program_name = NULL; + + void * xmalloc (size_t num); + char * xstrdup (const char *string); +-char * basename (const char *name); +-char * fnqualify(const char *path); ++const char * base_name (const char *name); ++char * find_executable(const char *wrapper); ++int check_executable(const char *path); + char * strendzap(char *str, const char *pat); + void lt_fatal (const char *message, ...); + +@@ -4743,29 +4984,51 @@ + char **newargz; + int i; + +- program_name = (char *) xstrdup ((char *) basename (argv[0])); ++ program_name = (char *) xstrdup (base_name (argv[0])); ++ DEBUG("(main) argv[0] : %s\n",argv[0]); ++ DEBUG("(main) program_name : %s\n",program_name); + newargz = XMALLOC(char *, argc+2); + EOF + +- cat >> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" +- newargz[1] = fnqualify(argv[0]); ++ cat >> $cwrappersource <<"EOF" ++ newargz[1] = find_executable(argv[0]); ++ if (newargz[1] == NULL) ++ lt_fatal("Couldn't find %s", argv[0]); ++ DEBUG("(main) found exe at : %s\n",newargz[1]); + /* we know the script has the same name, without the .exe */ + /* so make sure newargz[1] doesn't end in .exe */ + strendzap(newargz[1],".exe"); + for (i = 1; i < argc; i++) + newargz[i+1] = xstrdup(argv[i]); + newargz[argc+1] = NULL; ++ ++ for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" ++ cat >> $cwrappersource <<"EOF" ++ return 127; + } + + void * +@@ -4785,48 +5048,148 @@ + ; + } + +-char * +-basename (const char *name) ++const char * ++base_name (const char *name) + { + const char *base; + + #if defined (HAVE_DOS_BASED_FILE_SYSTEM) + /* Skip over the disk name in MSDOS pathnames. */ +- if (isalpha (name[0]) && name[1] == ':') ++ if (isalpha ((unsigned char)name[0]) && name[1] == ':') + name += 2; + #endif + + for (base = name; *name; name++) + if (IS_DIR_SEPARATOR (*name)) + base = name + 1; +- return (char *) base; ++ return base; + } + ++int ++check_executable(const char * path) ++{ ++ struct stat st; ++ ++ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); ++ if ((!path) || (!*path)) ++ return 0; ++ ++ if ((stat (path, &st) >= 0) && ++ ( ++ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ ++#if defined (S_IXOTH) ++ ((st.st_mode & S_IXOTH) == S_IXOTH) || ++#endif ++#if defined (S_IXGRP) ++ ((st.st_mode & S_IXGRP) == S_IXGRP) || ++#endif ++ ((st.st_mode & S_IXUSR) == S_IXUSR)) ++ ) ++ return 1; ++ else ++ return 0; ++} ++ ++/* Searches for the full path of the wrapper. Returns ++ newly allocated full path name if found, NULL otherwise */ + char * +-fnqualify(const char *path) ++find_executable (const char* wrapper) + { +- size_t size; +- char *p; ++ int has_slash = 0; ++ const char* p; ++ const char* p_next; ++ /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; ++ int tmp_len; ++ char* concat_name; ++ ++ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + +- assert(path != NULL); ++ if ((wrapper == NULL) || (*wrapper == '\0')) ++ return NULL; + +- /* Is it qualified already? */ ++ /* Absolute path? */ ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ } ++ else ++ { ++#endif ++ if (IS_DIR_SEPARATOR (wrapper[0])) ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ } + #if defined (HAVE_DOS_BASED_FILE_SYSTEM) +- if (isalpha (path[0]) && path[1] == ':') +- return xstrdup (path); ++ } + #endif +- if (IS_DIR_SEPARATOR (path[0])) +- return xstrdup (path); + +- /* prepend the current directory */ +- /* doesn't handle '~' */ ++ for (p = wrapper; *p; p++) ++ if (*p == '/') ++ { ++ has_slash = 1; ++ break; ++ } ++ if (!has_slash) ++ { ++ /* no slashes; search PATH */ ++ const char* path = getenv ("PATH"); ++ if (path != NULL) ++ { ++ for (p = path; *p; p = p_next) ++ { ++ const char* q; ++ size_t p_len; ++ for (q = p; *q; q++) ++ if (IS_PATH_SEPARATOR(*q)) ++ break; ++ p_len = q - p; ++ p_next = (*q == '\0' ? q : q + 1); ++ if (p_len == 0) ++ { ++ /* empty path: current directory */ ++ if (getcwd (tmp, LT_PATHMAX) == NULL) ++ lt_fatal ("getcwd failed"); ++ tmp_len = strlen(tmp); ++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ } ++ else ++ { ++ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); ++ memcpy (concat_name, p, p_len); ++ concat_name[p_len] = '/'; ++ strcpy (concat_name + p_len + 1, wrapper); ++ } ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ } ++ } ++ /* not found in PATH; assume curdir */ ++ } ++ /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); +- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ +- p = XMALLOC(char, size); +- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); +- return p; ++ tmp_len = strlen(tmp); ++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ return NULL; + } + + char * +@@ -4870,16 +5233,16 @@ + va_end (ap); + } + EOF +- # we should really use a build-platform specific compiler +- # here, but OTOH, the wrappers (shell script and this C one) +- # are only useful if you want to execute the "real" binary. +- # Since the "real" binary is built for $host, then this +- # wrapper might as well be built for $host, too. +- $run $LTCC -s -o $cwrapper $cwrappersource +- ;; +- esac +- $rm $output +- trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 ++ # we should really use a build-platform specific compiler ++ # here, but OTOH, the wrappers (shell script and this C one) ++ # are only useful if you want to execute the "real" binary. ++ # Since the "real" binary is built for $host, then this ++ # wrapper might as well be built for $host, too. ++ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource ++ ;; ++ esac ++ $rm $output ++ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 + + $echo > $output "\ + #! $SHELL +@@ -5029,13 +5392,13 @@ + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2*) + $echo >> $output "\ +- exec \$progdir\\\\\$program \${1+\"\$@\"} ++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} + " + ;; + + *) + $echo >> $output "\ +- exec \$progdir/\$program \${1+\"\$@\"} ++ exec \"\$progdir/\$program\" \${1+\"\$@\"} + " + ;; + esac +@@ -5045,7 +5408,7 @@ + fi + else + # The program doesn't exist. +- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 ++ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$echo \"This script is just a wrapper for \$program.\" 1>&2 + $echo \"See the $PACKAGE documentation for more information.\" 1>&2 + exit $EXIT_FAILURE +@@ -5109,9 +5472,9 @@ + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" +- status=$? +- if test "$status" -ne 0 && test ! -d "$gentop"; then +- exit $status ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then ++ exit $exit_status + fi + fi + +@@ -5168,7 +5531,7 @@ + oldobjs="$objlist $obj" + objlist="$objlist $obj" + eval test_cmds=\"$old_archive_cmds\" +- if len=`expr "X$test_cmds" : ".*"` && ++ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + test "$len" -le "$max_cmd_len"; then + : + else +@@ -5365,11 +5728,11 @@ + # install_prog (especially on Windows NT). + if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + # Allow the use of GNU shtool's install command. +- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then ++ $echo "X$nonopt" | grep shtool > /dev/null; then + # Aesthetically quote it. + arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -5378,14 +5741,14 @@ + shift + else + install_prog= +- arg="$nonopt" ++ arg=$nonopt + fi + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -5403,28 +5766,31 @@ + do + if test -n "$dest"; then + files="$files $dest" +- dest="$arg" ++ dest=$arg + continue + fi + + case $arg in + -d) isdir=yes ;; +- -f) prev="-f" ;; +- -g) prev="-g" ;; +- -m) prev="-m" ;; +- -o) prev="-o" ;; ++ -f) ++ case " $install_prog " in ++ *[\\\ /]cp\ *) ;; ++ *) prev=$arg ;; ++ esac ++ ;; ++ -g | -m | -o) prev=$arg ;; + -s) + stripme=" -s" + continue + ;; +- -*) ;; +- ++ -*) ++ ;; + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then + prev= + else +- dest="$arg" ++ dest=$arg + continue + fi + ;; +@@ -5433,7 +5799,7 @@ + # Aesthetically quote the argument. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -5602,11 +5968,14 @@ + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. ++ # Try `ln -sf' first, because the `ln' binary might depend on ++ # the symlink we replace! Solaris /bin/ln does not understand -f, ++ # so we also need to try rm && ln -s. + for linkname + do + if test "$linkname" != "$realname"; then +- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" +- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" ++ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" ++ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" + fi + done + fi +@@ -5619,7 +5988,16 @@ + IFS="$save_ifs" + eval cmd=\"$cmd\" + $show "$cmd" +- $run eval "$cmd" || exit $? ++ $run eval "$cmd" || { ++ lt_exit=$? ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' ++ fi ++ ++ exit $lt_exit ++ } + done + IFS="$save_ifs" + fi +@@ -5713,17 +6091,15 @@ + notinst_deplibs= + relink_command= + +- # To insure that "foo" is sourced, and not "foo.exe", +- # finese the cygwin/MSYS system by explicitly sourcing "foo." +- # which disallows the automatic-append-.exe behavior. +- case $build in +- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; +- *) wrapperdot=${wrapper} ;; +- esac ++ # Note that it is not necessary on cygwin/mingw to append a dot to ++ # foo even if both foo and FILE.exe exist: automatic-append-.exe ++ # behavior happens only for exec(3), not for open(2)! Also, sourcing ++ # `FILE.' does not work on cygwin managed mounts. ++ # + # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . ${wrapperdot} ;; +- *) . ./${wrapperdot} ;; ++ case $wrapper in ++ */* | *\\*) . ${wrapper} ;; ++ *) . ./${wrapper} ;; + esac + + # Check the variables that should have been set. +@@ -5751,34 +6127,21 @@ + done + + relink_command= +- # To insure that "foo" is sourced, and not "foo.exe", +- # finese the cygwin/MSYS system by explicitly sourcing "foo." +- # which disallows the automatic-append-.exe behavior. +- case $build in +- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; +- *) wrapperdot=${wrapper} ;; +- esac ++ # Note that it is not necessary on cygwin/mingw to append a dot to ++ # foo even if both foo and FILE.exe exist: automatic-append-.exe ++ # behavior happens only for exec(3), not for open(2)! Also, sourcing ++ # `FILE.' does not work on cygwin managed mounts. ++ # + # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . ${wrapperdot} ;; +- *) . ./${wrapperdot} ;; ++ case $wrapper in ++ */* | *\\*) . ${wrapper} ;; ++ *) . ./${wrapper} ;; + esac + + outputname= + if test "$fast_install" = no && test -n "$relink_command"; then + if test "$finalize" = yes && test -z "$run"; then +- tmpdir="/tmp" +- test -n "$TMPDIR" && tmpdir="$TMPDIR" +- tmpdir="$tmpdir/libtool-$$" +- save_umask=`umask` +- umask 0077 +- if $mkdir "$tmpdir"; then +- umask $save_umask +- else +- umask $save_umask +- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 +- continue +- fi ++ tmpdir=`func_mktempdir` + file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` + outputname="$tmpdir/$file" + # Replace the output file specification. +@@ -5802,7 +6165,7 @@ + fi + + # remove .exe since cygwin /usr/bin/install will append another +- # one anyways ++ # one anyway + case $install_prog,$host in + */usr/bin/install*,*cygwin*) + case $file:$destfile in +@@ -5902,7 +6265,7 @@ + # Exit here if they wanted silent mode. + test "$show" = : && exit $EXIT_SUCCESS + +- $echo "----------------------------------------------------------------------" ++ $echo "X----------------------------------------------------------------------" | $Xsed + $echo "Libraries have been installed in:" + for libdir in $libdirs; do + $echo " $libdir" +@@ -5935,7 +6298,7 @@ + $echo + $echo "See any operating system documentation about shared libraries for" + $echo "more information, such as the ld(1) and ld.so(8) manual pages." +- $echo "----------------------------------------------------------------------" ++ $echo "X----------------------------------------------------------------------" | $Xsed + exit $EXIT_SUCCESS + ;; + +@@ -6152,9 +6515,17 @@ + rmfiles="$rmfiles $objdir/$n" + done + test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" +- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + +- if test "$mode" = uninstall; then ++ case "$mode" in ++ clean) ++ case " $library_names " in ++ # " " in the beginning catches empty $dlname ++ *" $dlname "*) ;; ++ *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ esac ++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ ;; ++ uninstall) + if test -n "$library_names"; then + # Do each command in the postuninstall commands. + cmds=$postuninstall_cmds +@@ -6187,7 +6558,8 @@ + IFS="$save_ifs" + fi + # FIXME: should reinstall the best remaining shared library. +- fi ++ ;; ++ esac + fi + ;; + +@@ -6486,12 +6858,11 @@ + # configuration. But we'll never go from static-only to shared-only. + + # ### BEGIN LIBTOOL TAG CONFIG: disable-shared +-build_libtool_libs=no +-build_old_libs=yes ++disable_libs=shared + # ### END LIBTOOL TAG CONFIG: disable-shared + + # ### BEGIN LIBTOOL TAG CONFIG: disable-static +-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` ++disable_libs=static + # ### END LIBTOOL TAG CONFIG: disable-static + + # Local Variables: +diff -Nur gnome-panel-2.14.1/Makefile.in gnome-panel-2.14.1.new/Makefile.in +--- gnome-panel-2.14.1/Makefile.in 2006-04-10 15:46:30.000000000 +0200 ++++ gnome-panel-2.14.1.new/Makefile.in 2006-05-07 23:41:15.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -33,7 +33,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ +@@ -239,8 +238,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -369,13 +366,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -387,7 +378,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -395,13 +386,7 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -422,7 +407,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -524,17 +509,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="../$(top_distdir)" \ ++ distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ +@@ -545,15 +528,15 @@ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + dist-gzip: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + + dist-bzip2: distdir +- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ++ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + + dist-tarZ: distdir +- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z ++ $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + + dist-shar: distdir +@@ -566,7 +549,7 @@ + $(am__remove_distdir) + + dist dist-all: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + + # This target untars the dist file and tries a VPATH configuration. Then +@@ -575,11 +558,11 @@ + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ + *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ ++ uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ +@@ -651,7 +634,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +diff -Nur gnome-panel-2.14.1/man/Makefile.in gnome-panel-2.14.1.new/man/Makefile.in +--- gnome-panel-2.14.1/man/Makefile.in 2006-04-10 15:46:29.000000000 +0200 ++++ gnome-panel-2.14.1.new/man/Makefile.in 2006-05-07 23:41:21.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.8.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -33,7 +33,6 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ + subdir = man + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -219,8 +218,6 @@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -400,7 +397,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +diff -Nur gnome-panel-2.14.1/missing gnome-panel-2.14.1.new/missing +--- gnome-panel-2.14.1/missing 2006-04-10 15:46:22.000000000 +0200 ++++ gnome-panel-2.14.1.new/missing 2006-05-07 23:41:14.000000000 +0200 +@@ -1,9 +1,9 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. + +-scriptversion=2005-06-08.21 ++scriptversion=2003-09-02.23 + +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 + # Free Software Foundation, Inc. + # Originally by Fran,cois Pinard , 1996. + +@@ -19,8 +19,8 @@ + + # 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. ++# 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 +@@ -60,6 +60,11 @@ + msg="probably too old" + fi + ;; ++esac ++ ++# If it does not exist, or fails to run (possibly an outdated version), ++# try to emulate it. ++case "$1" in + + -h|--h|--he|--hel|--help) + echo "\ +@@ -87,12 +92,10 @@ + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + + Send bug reports to ." +- exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" +- exit $? + ;; + + -*) +@@ -101,42 +104,12 @@ + exit 1 + ;; + +-esac +- +-# Now exit if we have it, but it failed. Also exit now if we +-# don't have it and --version was passed (most likely to detect +-# the program). +-case "$1" in +- lex|yacc) +- # Not GNU programs, they don't have --version. +- ;; +- +- tar) +- if test -n "$run"; then +- echo 1>&2 "ERROR: \`tar' requires --run" +- exit 1 +- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then +- exit 1 +- fi +- ;; +- +- *) ++ aclocal*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 +- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then +- # Could not run --version or --help. This is probably someone +- # running `$TOOL --version' or `$TOOL --help' to check whether +- # $TOOL exists and not knowing $TOOL uses missing. +- exit 1 + fi +- ;; +-esac + +-# If it does not exist, or fails to run (possibly an outdated version), +-# try to emulate it. +-case "$1" in +- aclocal*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want +@@ -146,6 +119,11 @@ + ;; + + autoconf) ++ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ++ # We have it, but it failed. ++ exit 1 ++ fi ++ + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the +@@ -155,6 +133,11 @@ + ;; + + autoheader) ++ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ++ # We have it, but it failed. ++ exit 1 ++ fi ++ + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want +@@ -174,6 +157,11 @@ + ;; + + automake*) ++ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ++ # We have it, but it failed. ++ exit 1 ++ fi ++ + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. +@@ -185,6 +173,11 @@ + ;; + + autom4te) ++ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ++ # We have it, but it failed. ++ exit 1 ++ fi ++ + echo 1>&2 "\ + WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the +@@ -261,6 +254,11 @@ + ;; + + help2man) ++ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ++ # We have it, but it failed. ++ exit 1 ++ fi ++ + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the +@@ -281,6 +279,11 @@ + ;; + + makeinfo) ++ if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then ++ # We have makeinfo, but it failed. ++ exit 1 ++ fi ++ + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file +@@ -288,23 +291,20 @@ + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." +- # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then +- # ... or it is the one specified with @setfilename ... +- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` +- # ... or it is derived from the source name (dir/f.texi becomes f.info) +- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info +- fi +- # If the file does not exist, the user really needs makeinfo; +- # let's fail without touching anything. +- test -f $file || exit 1 ++ file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ++ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` ++ fi + touch $file + ;; + + tar) + shift ++ if test -n "$run"; then ++ echo 1>&2 "ERROR: \`tar' requires --run" ++ exit 1 ++ fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error +diff -Nur gnome-panel-2.14.1/mkinstalldirs gnome-panel-2.14.1.new/mkinstalldirs +--- gnome-panel-2.14.1/mkinstalldirs 2006-04-10 15:46:30.000000000 +0200 ++++ gnome-panel-2.14.1.new/mkinstalldirs 2006-05-07 23:41:21.000000000 +0200 +@@ -1,7 +1,7 @@ + #! /bin/sh + # mkinstalldirs --- make directory hierarchy + +-scriptversion=2005-06-29.22 ++scriptversion=2004-02-15.20 + + # Original author: Noah Friedman + # Created: 1993-05-16 +@@ -12,7 +12,7 @@ + # . + + errstatus=0 +-dirmode= ++dirmode="" + + usage="\ + Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... +@@ -27,7 +27,7 @@ + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" +- exit $? ++ exit 0 + ;; + -m) # -m PERM arg + shift +@@ -37,7 +37,7 @@ + ;; + --version) + echo "$0 $scriptversion" +- exit $? ++ exit 0 + ;; + --) # stop option processing + shift +@@ -103,21 +103,13 @@ + + for file + do +- case $file in +- /*) pathcomp=/ ;; +- *) pathcomp= ;; +- esac +- oIFS=$IFS +- IFS=/ +- set fnord $file ++ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + shift +- IFS=$oIFS + ++ pathcomp= + for d + do +- test "x$d" = x && continue +- +- pathcomp=$pathcomp$d ++ pathcomp="$pathcomp$d" + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac +@@ -132,7 +124,7 @@ + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" +- lasterr= ++ lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then +@@ -142,7 +134,7 @@ + fi + fi + +- pathcomp=$pathcomp/ ++ pathcomp="$pathcomp/" + done + done + --- gnome-panel-2.14.1.orig/debian/patches/01_distrologo.patch +++ gnome-panel-2.14.1/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.14.1.orig/debian/patches/04_default_panel_config.patch +++ gnome-panel-2.14.1/debian/patches/04_default_panel_config.patch @@ -0,0 +1,269 @@ +diff -Nur gnome-panel-2.13.91/gnome-panel/panel-default-setup.entries gnome-panel-2.13.91.new/gnome-panel/panel-default-setup.entries +--- gnome-panel-2.13.91/gnome-panel/panel-default-setup.entries 2006-01-22 12:34:03.000000000 +0100 ++++ gnome-panel-2.13.91.new/gnome-panel/panel-default-setup.entries 2006-02-16 16:22:10.000000000 +0100 +@@ -35,6 +35,9 @@ + + email_launcher + ++ ++ session_dialog ++ + + + +@@ -47,9 +50,6 @@ + + + +- window_menu +- +- + mixer + + +@@ -67,6 +67,9 @@ + + workspace_switcher + ++ ++ trashapplet ++ + + + +@@ -252,7 +255,7 @@ + objects/browser_launcher/launcher_location + /schemas/apps/panel/objects/launcher_location + +- epiphany.desktop ++ firefox.desktop + + + +@@ -306,7 +309,7 @@ + objects/email_launcher/launcher_location + /schemas/apps/panel/objects/launcher_location + +- evolution.desktop ++ evolution-mail.desktop + + + +@@ -319,61 +322,7 @@ + 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 +- /schemas/apps/panel/objects/object_type +- +- bonobo-applet +- +- +- +- applets/window_menu/toplevel_id +- /schemas/apps/panel/objects/toplevel_id +- +- top_panel +- +- +- +- applets/window_menu/position +- /schemas/apps/panel/objects/position +- +- 0 +- +- +- +- applets/window_menu/panel_right_stick +- /schemas/apps/panel/objects/panel_right_stick +- +- true +- +- +- +- applets/window_menu/locked +- /schemas/apps/panel/objects/locked +- +- true +- +- +- +- applets/window_menu/bonobo_iid +- /schemas/apps/panel/objects/bonobo_iid +- +- OAFIID:GNOME_WindowMenuApplet +- +- +- +- 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 +- +- ++ + + + applets/mixer/object_type +@@ -393,7 +342,7 @@ + applets/mixer/position + /schemas/apps/panel/objects/position + +- 1 ++ 2 + + + +@@ -447,7 +396,7 @@ + applets/clock/position + /schemas/apps/panel/objects/position + +- 2 ++ 1 + + + +@@ -589,6 +538,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 +673,7 @@ + applets/workspace_switcher/position + /schemas/apps/panel/objects/position + +- 0 ++ 1 + + + +@@ -697,6 +707,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.14.1.orig/debian/patches/01_layout.patch +++ gnome-panel-2.14.1/debian/patches/01_layout.patch @@ -0,0 +1,52 @@ +=== modified file 'gnome-panel/panel-menu-items.c' +--- gnome-panel/panel-menu-items.c ++++ gnome-panel/panel-menu-items.c +@@ -521,6 +521,7 @@ + GtkWidget *places_menu; + GtkWidget *item; + char *gconf_name; ++ char *path; + + places_menu = panel_create_menu (); + +@@ -532,6 +533,16 @@ + gconf_name); + 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, +@@ -666,6 +677,10 @@ + panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL); + 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 (parent->priv->append_lock_logout) + panel_menu_items_append_lock_logout (menu); + } +@@ -932,10 +947,7 @@ + + menuitem = g_object_new (PANEL_TYPE_DESKTOP_MENU_ITEM, NULL); + +- /* Translators: Desktop is used here as in "Desktop Environment" (this +- * is not the Desktop folder). Do not keep "Desktop Environment|" in +- * the translation. */ +- accel_label = gtk_accel_label_new (Q_("Desktop Environment|Desktop")); ++ accel_label = gtk_accel_label_new (_("System")); + gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5); + + gtk_container_add (GTK_CONTAINER (menuitem), accel_label); + --- gnome-panel-2.14.1.orig/debian/patches/09_lpi_src.patch +++ gnome-panel-2.14.1/debian/patches/09_lpi_src.patch @@ -0,0 +1,181 @@ +diff -Nur gnome-panel-2.13.3.orig/applets/notification_area/GNOME_NotificationAreaApplet.xml gnome-panel-2.13.3/applets/notification_area/GNOME_NotificationAreaApplet.xml +--- gnome-panel-2.13.3.orig/applets/notification_area/GNOME_NotificationAreaApplet.xml 2004-06-11 12:53:16.000000000 +0200 ++++ gnome-panel-2.13.3/applets/notification_area/GNOME_NotificationAreaApplet.xml 2005-12-13 12:24:31.000000000 +0100 +@@ -3,6 +3,9 @@ + + ++ ++ ++ + + +diff -Nur gnome-panel-2.13.3.orig/applets/notification_area/main.c gnome-panel-2.13.3/applets/notification_area/main.c +--- gnome-panel-2.13.3.orig/applets/notification_area/main.c 2005-02-26 15:42:49.000000000 +0100 ++++ gnome-panel-2.13.3/applets/notification_area/main.c 2005-12-13 12:24:31.000000000 +0100 +@@ -43,6 +43,7 @@ + #ifndef N_ + #define N_(x) x + #endif ++#include + + static EggTrayManager *tray_manager = NULL; + static GSList *all_trays = NULL; +@@ -304,6 +305,7 @@ + { + SystemTray *tray; + AtkObject *atko; ++ BonoboUIComponent* popup_component; + + if (!(strcmp (iid, "OAFIID:GNOME_NotificationAreaApplet") == 0 || + strcmp (iid, "OAFIID:GNOME_SystemTrayApplet") == 0)) +@@ -393,6 +395,10 @@ + NULL, + menu_verbs, + tray); ++ ++ 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.13.3.orig/applets/wncklet/GNOME_ShowDesktopApplet.xml gnome-panel-2.13.3/applets/wncklet/GNOME_ShowDesktopApplet.xml +--- gnome-panel-2.13.3.orig/applets/wncklet/GNOME_ShowDesktopApplet.xml 2004-06-11 12:53:17.000000000 +0200 ++++ gnome-panel-2.13.3/applets/wncklet/GNOME_ShowDesktopApplet.xml 2005-12-13 12:24:31.000000000 +0100 +@@ -3,6 +3,9 @@ + + ++ ++ ++ + + +diff -Nur gnome-panel-2.13.3.orig/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml gnome-panel-2.13.3/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml +--- gnome-panel-2.13.3.orig/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml 2004-06-11 12:53:17.000000000 +0200 ++++ gnome-panel-2.13.3/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml 2005-12-13 12:24:31.000000000 +0100 +@@ -5,6 +5,9 @@ + pixtype="stock" pixname="gtk-properties"/> + ++ ++ ++ + + +diff -Nur gnome-panel-2.13.3.orig/applets/wncklet/showdesktop.c gnome-panel-2.13.3/applets/wncklet/showdesktop.c +--- gnome-panel-2.13.3.orig/applets/wncklet/showdesktop.c 2005-02-02 21:23:53.000000000 +0100 ++++ gnome-panel-2.13.3/applets/wncklet/showdesktop.c 2005-12-13 12:24:31.000000000 +0100 +@@ -43,6 +43,7 @@ + #include + + #define TIMEOUT_ACTIVATE 1000 ++#include + + + typedef struct { +@@ -398,6 +399,7 @@ + { + ShowDesktopData *sdd; + AtkObject *atk_obj; ++ BonoboUIComponent* popup_component; + + panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR); + +@@ -478,6 +480,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.13.3.orig/applets/wncklet/workspace-switcher.c gnome-panel-2.13.3/applets/wncklet/workspace-switcher.c +--- gnome-panel-2.13.3.orig/applets/wncklet/workspace-switcher.c 2005-02-21 09:21:03.000000000 +0100 ++++ gnome-panel-2.13.3/applets/wncklet/workspace-switcher.c 2005-12-13 12:24:31.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; +@@ -412,6 +413,7 @@ + PagerData *pager; + GError *error; + gboolean display_names; ++ BonoboUIComponent* popup_component; + + panel_applet_add_preferences (applet, "/schemas/apps/workspace_switcher_applet/prefs", NULL); + +@@ -524,6 +526,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.13.3.orig/configure.in gnome-panel-2.13.3/configure.in +--- gnome-panel-2.13.3.orig/configure.in 2005-12-12 19:28:20.000000000 +0100 ++++ gnome-panel-2.13.3/configure.in 2005-12-13 12:25:12.000000000 +0100 +@@ -61,7 +61,7 @@ + + dnl pkg-config dependency checks + +-PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_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) ++PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_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 lpint-bonobo launchpad-integration) + AC_SUBST(PANEL_CFLAGS) + AC_SUBST(PANEL_LIBS) + +@@ -69,7 +69,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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) ++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 gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED lpint-bonobo launchpad-integration) + AC_SUBST(WNCKLET_CFLAGS) + AC_SUBST(WNCKLET_LIBS) + +diff -Nur gnome-panel-2.13.3.orig/gnome-panel/panel-context-menu.c gnome-panel-2.13.3/gnome-panel/panel-context-menu.c +--- gnome-panel-2.13.3.orig/gnome-panel/panel-context-menu.c 2005-10-22 09:06:03.000000000 +0200 ++++ gnome-panel-2.13.3/gnome-panel/panel-context-menu.c 2005-12-13 12:24:31.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, +@@ -218,7 +219,7 @@ + _("_Delete This Panel")); + } + +-static void ++static void + make_panel_submenu (PanelWidget *panel_widget, + GtkWidget *menu) + { +@@ -284,6 +285,9 @@ + panel_profile_id_lists_are_writable ()); + + add_menu_separator (menu); ++ ++ launchpad_integration_add_items (menu,-1,TRUE,FALSE); ++ + } + + GtkWidget * --- gnome-panel-2.14.1.orig/debian/patches/05_submenus.patch +++ gnome-panel-2.14.1/debian/patches/05_submenus.patch @@ -0,0 +1,142 @@ +diff -Nur gnome-panel-2.11.3.orig/gnome-panel/menu.c gnome-panel-2.11.3/gnome-panel/menu.c +--- gnome-panel-2.11.3.orig/gnome-panel/menu.c 2005-06-06 21:54:00.000000000 +0200 ++++ gnome-panel-2.11.3/gnome-panel/menu.c 2005-06-27 15:21:40.770711424 +0200 +@@ -1386,7 +1386,7 @@ + return menuitem; + } + +-static void ++void + create_submenu (GtkWidget *menu, + GMenuTreeDirectory *directory, + GMenuTreeDirectory *alias_directory) +diff -Nur gnome-panel-2.11.3.orig/gnome-panel/menu.h gnome-panel-2.11.3/gnome-panel/menu.h +--- gnome-panel-2.11.3.orig/gnome-panel/menu.h 2005-04-11 16:58:41.000000000 +0200 ++++ gnome-panel-2.11.3/gnome-panel/menu.h 2005-06-27 15:21:40.770711424 +0200 +@@ -67,6 +67,9 @@ + gboolean menu_dummy_button_press_event (GtkWidget *menuitem, + GdkEventButton *event); + ++void create_submenu (GtkWidget *menu, ++ GMenuTreeDirectory *directory, ++ GMenuTreeDirectory *alias_directory); + + G_END_DECLS + +diff -Nur gnome-panel-2.11.3.orig/gnome-panel/panel-menu-items.c gnome-panel-2.11.3/gnome-panel/panel-menu-items.c +--- gnome-panel-2.11.3.orig/gnome-panel/panel-menu-items.c 2005-06-06 23:51:27.000000000 +0200 ++++ gnome-panel-2.11.3/gnome-panel/panel-menu-items.c 2005-06-27 15:25:37.614705664 +0200 +@@ -75,6 +75,8 @@ + GtkWidget *menu; + PanelWidget *panel; + ++ GMenuTree *tree; ++ + guint use_image : 1; + guint append_lock_logout : 1; + }; +@@ -84,6 +86,8 @@ + + static GnomeVFSVolumeMonitor *volume_monitor = NULL; + ++static void panel_desktop_menu_item_recreate_menu (PanelDesktopMenuItem *desktop_item); ++ + static void + activate_uri (GtkWidget *menuitem, + char *path) +@@ -607,16 +611,63 @@ + panel_menu_items_append_lock_logout (menu); + } + ++static void ++handle_menu_tree_changed (GMenuTree *tree, ++ PanelDesktopMenuItem *desktop_item) ++{ ++ panel_desktop_menu_item_recreate_menu (desktop_item); ++} ++ + static GtkWidget * + panel_desktop_menu_item_create_menu (PanelDesktopMenuItem *desktop_item) + { + GtkWidget *desktop_menu; ++ GMenuTreeDirectory *directory; ++ ++ desktop_menu = create_empty_menu (); ++ ++ /* ++ g_object_set_data_full (G_OBJECT (desktop_menu), ++ "panel-menu-tree-filename", ++ g_strdup ("settings.menu"), ++ (GDestroyNotify) g_free); ++ ++ g_object_set_data_full (G_OBJECT (desktop_menu), ++ "panel-menu-tree", ++ menu_tree_ref (tree), ++ (GDestroyNotify) menu_tree_unref); ++ ++ g_object_set_data_full (G_OBJECT (desktop_menu), ++ "panel-menu-tree-path", ++ g_strdup ("/"), ++ (GDestroyNotify) g_free); ++ ++ g_object_set_data (G_OBJECT (desktop_menu), ++ "panel-menu-needs-loading", ++ GUINT_TO_POINTER (TRUE)); ++ */ + +- desktop_menu = create_applications_menu ("settings.menu", NULL); ++ g_object_set_data (G_OBJECT (desktop_menu), ++ "panel-menu-needs-appending", ++ GUINT_TO_POINTER (TRUE)); + +- g_signal_connect (desktop_menu, "show", +- G_CALLBACK (panel_desktop_menu_item_append_menu), +- desktop_item); ++ directory = gmenu_tree_get_directory_from_path (desktop_item->priv->tree, ++ "/Preferences"); ++ ++ if (directory) { ++ create_submenu (desktop_menu, directory, NULL); ++ gmenu_tree_item_unref (directory); ++ } ++ ++ directory = gmenu_tree_get_directory_from_path (desktop_item->priv->tree, ++ "/Administration"); ++ ++ if (directory) { ++ create_submenu (desktop_menu, directory, NULL); ++ gmenu_tree_item_unref (directory); ++ } ++ ++ panel_desktop_menu_item_append_menu (desktop_menu, desktop_item); + + return desktop_menu; + } +@@ -674,6 +725,14 @@ + panel_lockdown_notify_remove (G_CALLBACK (panel_desktop_menu_item_recreate_menu), + menuitem); + desktop_parent_class->finalize (object); ++ ++ if (menuitem->priv->tree) { ++ gmenu_tree_remove_monitor (menuitem->priv->tree, ++ (GMenuTreeChangedFunc) handle_menu_tree_changed, ++ menuitem); ++ gmenu_tree_unref (menuitem->priv->tree); ++ } ++ menuitem->priv->tree = NULL; + } + + static void +@@ -736,6 +795,12 @@ + PanelDesktopMenuItemClass *klass) + { + menuitem->priv = PANEL_DESKTOP_MENU_ITEM_GET_PRIVATE (menuitem); ++ ++ menuitem->priv->tree = gmenu_tree_lookup ("settings.menu", GMENU_TREE_FLAGS_NONE); ++ ++ gmenu_tree_add_monitor (menuitem->priv->tree, ++ (GMenuTreeChangedFunc) handle_menu_tree_changed, ++ menuitem); + } + + static void --- gnome-panel-2.14.1.orig/debian/patches/05_missing_includes.patch +++ gnome-panel-2.14.1/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.14.1.orig/debian/patches/07_time_cmd.patch +++ gnome-panel-2.14.1/debian/patches/07_time_cmd.patch @@ -0,0 +1,12 @@ +diff -Nur gnome-panel-2.11.90.orig/applets/clock/clock.c gnome-panel-2.11.90/applets/clock/clock.c +--- gnome-panel-2.11.90.orig/applets/clock/clock.c 2005-07-21 11:05:49.000000000 +0200 ++++ gnome-panel-2.11.90/applets/clock/clock.c 2005-07-26 13:14:08.000000000 +0200 +@@ -83,7 +83,7 @@ + "system-config-date", + "redhat-config-date", + "/sbin/yast2 timezone", +- "time-admin", ++ "/usr/bin/gksudo time-admin", + }; + + /* Needs to match the indices in the combo */ --- gnome-panel-2.14.1.orig/debian/patches/06_applets_category.patch +++ gnome-panel-2.14.1/debian/patches/06_applets_category.patch @@ -0,0 +1,68 @@ +diff -Nur gnome-panel-2.11.92.orig/applets/clock/GNOME_ClockApplet_Factory.server.in.in gnome-panel-2.11.92/applets/clock/GNOME_ClockApplet_Factory.server.in.in +--- gnome-panel-2.11.92.orig/applets/clock/GNOME_ClockApplet_Factory.server.in.in 2004-11-11 09:16:43.000000000 +0100 ++++ gnome-panel-2.11.92/applets/clock/GNOME_ClockApplet_Factory.server.in.in 2005-08-27 00:09:58.000000000 +0200 +@@ -24,6 +24,7 @@ + + + ++ + + + +diff -Nur gnome-panel-2.11.92.orig/applets/fish/GNOME_FishApplet_Factory.server.in.in gnome-panel-2.11.92/applets/fish/GNOME_FishApplet_Factory.server.in.in +--- gnome-panel-2.11.92.orig/applets/fish/GNOME_FishApplet_Factory.server.in.in 2004-08-09 14:28:10.000000000 +0200 ++++ gnome-panel-2.11.92/applets/fish/GNOME_FishApplet_Factory.server.in.in 2005-08-27 00:10:10.000000000 +0200 +@@ -24,6 +24,7 @@ + + + ++ + + + +diff -Nur gnome-panel-2.11.92.orig/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in gnome-panel-2.11.92/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in +--- gnome-panel-2.11.92.orig/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in 2004-08-09 14:28:10.000000000 +0200 ++++ gnome-panel-2.11.92/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in 2005-08-27 00:09:58.000000000 +0200 +@@ -24,6 +24,7 @@ + + + ++ + + + +diff -Nur gnome-panel-2.11.92.orig/applets/wncklet/GNOME_Wncklet_Factory.server.in.in gnome-panel-2.11.92/applets/wncklet/GNOME_Wncklet_Factory.server.in.in +--- gnome-panel-2.11.92.orig/applets/wncklet/GNOME_Wncklet_Factory.server.in.in 2005-06-07 00:23:19.000000000 +0200 ++++ gnome-panel-2.11.92/applets/wncklet/GNOME_Wncklet_Factory.server.in.in 2005-08-27 00:10:10.000000000 +0200 +@@ -25,6 +25,7 @@ + + + ++ + + + +@@ -62,6 +63,7 @@ + + + ++ + + + +@@ -98,6 +100,7 @@ + + + ++ + + + +@@ -117,6 +120,7 @@ + + + ++ + + + --- gnome-panel-2.14.1.orig/debian/patches/09_default_icons.patch +++ gnome-panel-2.14.1/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.14.1.orig/debian/patches/10_defaulteditor.patch +++ gnome-panel-2.14.1/debian/patches/10_defaulteditor.patch @@ -0,0 +1,54 @@ +diff -Nur gnome-panel-2.14.1/gnome-panel/panel-menu-bar.c gnome-panel-2.14.1.new/gnome-panel/panel-menu-bar.c +--- gnome-panel-2.14.1/gnome-panel/panel-menu-bar.c 2006-04-14 15:31:19.000000000 +0200 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-menu-bar.c 2006-04-14 15:31:20.000000000 +0200 +@@ -469,10 +469,19 @@ + } else if (!strcmp (callback_name, "edit")) { + GError *error = NULL; + +- panel_launch_desktop_file ("gmenu-simple-editor.desktop", +- "gmenu-simple-editor", +- screen, +- &error); ++ if (panel_is_program_in_path ("alacarte")) { ++ panel_launch_desktop_file ("alacarte.desktop", ++ "alacarte", ++ screen, ++ &error); ++ } ++ else { ++ panel_launch_desktop_file ("gmenu-simple-editor.desktop", ++ "gmenu-simple-editor", ++ screen, ++ &error); ++ } ++ + if (error) { + panel_error_dialog (screen, + "cannot_exec_gmenu-simple-editor", TRUE, +diff -Nur gnome-panel-2.14.1/gnome-panel/panel-menu-button.c gnome-panel-2.14.1.new/gnome-panel/panel-menu-button.c +--- gnome-panel-2.14.1/gnome-panel/panel-menu-button.c 2006-04-14 15:31:19.000000000 +0200 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-menu-button.c 2006-04-14 15:31:20.000000000 +0200 +@@ -1004,10 +1004,19 @@ + } else if (!strcmp (callback_name, "edit")) { + GError *error = NULL; + +- panel_launch_desktop_file ("gmenu-simple-editor.desktop", +- "gmenu-simple-editor", +- screen, +- &error); ++ if (panel_is_program_in_path ("alacarte")) { ++ panel_launch_desktop_file ("alacarte.desktop", ++ "alacarte", ++ screen, ++ &error); ++ } ++ else { ++ panel_launch_desktop_file ("gmenu-simple-editor.desktop", ++ "gmenu-simple-editor", ++ screen, ++ &error); ++ } ++ + if (error) { + panel_error_dialog (screen, + "cannot_exec_gmenu-simple-editor", TRUE, --- gnome-panel-2.14.1.orig/debian/patches/11_panel_addto_dialog.patch +++ gnome-panel-2.14.1/debian/patches/11_panel_addto_dialog.patch @@ -0,0 +1,7916 @@ +diff -Nur gnome-panel-2.14.1/gnome-panel/Makefile.am gnome-panel-2.14.1.new/gnome-panel/Makefile.am +--- gnome-panel-2.14.1/gnome-panel/Makefile.am 2006-02-12 20:07:03.000000000 +0100 ++++ gnome-panel-2.14.1.new/gnome-panel/Makefile.am 2006-05-05 01:37:04.000000000 +0200 +@@ -114,6 +114,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 \ + $(EGG_RECENT_FILES_C) \ +@@ -162,6 +165,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 \ + $(EGG_RECENT_FILES_H) \ +diff -Nur gnome-panel-2.14.1/gnome-panel/panel-action-button.c gnome-panel-2.14.1.new/gnome-panel/panel-action-button.c +--- gnome-panel-2.14.1/gnome-panel/panel-action-button.c 2006-05-05 01:37:04.000000000 +0200 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-action-button.c 2006-05-05 01:37:04.000000000 +0200 +@@ -274,6 +274,8 @@ + PanelActionButtonType type; + char *icon_name; + char *text; ++ char *category; ++ char *english_category; + char *tooltip; + char *help_index; + char *drag_id; +@@ -296,6 +298,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", +@@ -311,6 +315,8 @@ + * update the ones in panel-menu-items.c (look for + * panel:showusername|1) */ + N_("Log Out..."), ++ N_("Desktop & Windows"), ++ "Desktop & Windows", + N_("Log out of this session to log in as a different user"), + "gospanel-20", + "ACTION:logout:NEW", +@@ -321,6 +327,8 @@ + PANEL_ACTION_RUN, + PANEL_RUN_ICON, + N_("Run Application..."), ++ N_("Utilities"), ++ "Utilities", + N_("Run an Application by entering a command"), + "gospanel-555", + "ACTION:run:NEW", +@@ -331,6 +339,8 @@ + PANEL_ACTION_SEARCH, + "gnome-searchtool", + N_("Search for Files..."), ++ N_("Utilities"), ++ "Utilities", + N_("Find files, folders, and documents on your computer"), + "gospanel-554", + "ACTION:search:NEW", +@@ -340,6 +350,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", +@@ -350,6 +362,8 @@ + PANEL_ACTION_CONNECT_SERVER, + "gnome-globe", //FIXME icon + N_("Connect to Server..."), ++ N_("Utilities"), ++ "Utilities", + N_("Connect to a remote server"), //FIXME + "gospanel-563", //FIXME + "ACTION:connect-server:NEW", +@@ -359,6 +373,8 @@ + PANEL_ACTION_SHUTDOWN, + "gnome-shutdown", + N_("Shut Down..."), ++ N_("Utilities"), ++ "Utilities", + N_("Shut down the computer"), + "gospanel-20", + "ACTION:shutdown:NEW", +@@ -422,6 +438,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.14.1/gnome-panel/panel-action-button.h gnome-panel-2.14.1.new/gnome-panel/panel-action-button.h +--- gnome-panel-2.14.1/gnome-panel/panel-action-button.h 2005-01-29 21:39:01.000000000 +0100 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-action-button.h 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/gnome-panel/panel-addto.c gnome-panel-2.14.1.new/gnome-panel/panel-addto.c +--- gnome-panel-2.14.1/gnome-panel/panel-addto.c 2006-05-05 01:37:03.000000000 +0200 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-addto.c 2006-05-05 01:38:58.000000000 +0200 +@@ -26,117 +26,52 @@ + #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" + #include "panel-addto.h" ++#include "panel-addto-canvas.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; +- +- guint name_notify; +- +- 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"), +- "launcher-program", +- PANEL_ACTION_NONE, +- NULL, +- NULL, +- NULL, +- "LAUNCHER:ASK", +- TRUE }, +- +- { PANEL_ADDTO_LAUNCHER_MENU, +- N_("Application Launcher..."), +- N_("Copy a launcher from the applications menu"), +- "launcher-program", +- 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_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 +79,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 +92,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 +105,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 +143,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 +162,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 +185,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 +223,7 @@ + } + + #define ICON_SIZE 32 ++#define LAUNCHER_ICON_SIZE 20 + + static GdkPixbuf * + panel_addto_make_pixbuf (const char *filename) +@@ -292,8 +235,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 +259,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 +283,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 +295,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 +314,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 +365,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 +398,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,34 +457,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); +- } +- +- 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); +@@ -550,21 +477,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, +@@ -722,16 +642,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, +@@ -773,20 +690,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, +@@ -800,6 +716,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, +@@ -832,18 +749,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: +@@ -852,28 +772,43 @@ + 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); ++ gtk_widget_set_sensitive (dialog->custom_launcher_button, TRUE); + break; + + case GTK_RESPONSE_CLOSE: +@@ -886,6 +821,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) + { +@@ -895,45 +864,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); ++ ++ gtk_widget_set_sensitive (dialog->launcher_button, FALSE); ++ gtk_widget_set_sensitive (dialog->custom_launcher_button, FALSE); ++ ++ 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); + +- if (dialog->applet_search_text) +- g_free (dialog->applet_search_text); ++ 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); + +- 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), ""); ++ 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 +@@ -994,8 +1186,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 (); + +@@ -1003,18 +1197,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; + +@@ -1028,19 +1218,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; +@@ -1062,17 +1266,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); +@@ -1106,199 +1311,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, +@@ -1306,14 +1336,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), +@@ -1341,104 +1371,100 @@ + 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)); +- +- renderer = g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF, +- "xpad", 4, +- "ypad", 4, +- NULL); ++ 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); + +- 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 (top_hbox), GTK_WIDGET (dialog->search_entry), ++ TRUE, TRUE, 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); ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), top_hbox, ++ 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); +- ++ /* 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); + +- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); +- gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); ++ /* 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); + +- 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, +@@ -1447,6 +1473,7 @@ + PanelAddtoDialog *dialog; + PanelToplevel *toplevel; + PanelData *pd; ++ GtkAdjustment *sw_adjustment = NULL; + GdkScreen *screen; + gint screen_height; + gint height; +@@ -1467,12 +1494,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.14.1/gnome-panel/panel-addto-canvas.c gnome-panel-2.14.1.new/gnome-panel/panel-addto-canvas.c +--- gnome-panel-2.14.1/gnome-panel/panel-addto-canvas.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-addto-canvas.c 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/gnome-panel/panel-addto-canvas.h gnome-panel-2.14.1.new/gnome-panel/panel-addto-canvas.h +--- gnome-panel-2.14.1/gnome-panel/panel-addto-canvas.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-addto-canvas.h 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/gnome-panel/panel-addto-event-box.c gnome-panel-2.14.1.new/gnome-panel/panel-addto-event-box.c +--- gnome-panel-2.14.1/gnome-panel/panel-addto-event-box.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-addto-event-box.c 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/gnome-panel/panel-addto-event-box.h gnome-panel-2.14.1.new/gnome-panel/panel-addto-event-box.h +--- gnome-panel-2.14.1/gnome-panel/panel-addto-event-box.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-addto-event-box.h 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/gnome-panel/panel-addto.h gnome-panel-2.14.1.new/gnome-panel/panel-addto.h +--- gnome-panel-2.14.1/gnome-panel/panel-addto.h 2004-06-23 00:21:51.000000000 +0200 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-addto.h 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/gnome-panel/panel-addto-rounded-rect.c gnome-panel-2.14.1.new/gnome-panel/panel-addto-rounded-rect.c +--- gnome-panel-2.14.1/gnome-panel/panel-addto-rounded-rect.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-addto-rounded-rect.c 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/gnome-panel/panel-addto-rounded-rect.h gnome-panel-2.14.1.new/gnome-panel/panel-addto-rounded-rect.h +--- gnome-panel-2.14.1/gnome-panel/panel-addto-rounded-rect.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-addto-rounded-rect.h 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/gnome-panel/panel-addto-rounded-rect-pixbuf.h gnome-panel-2.14.1.new/gnome-panel/panel-addto-rounded-rect-pixbuf.h +--- gnome-panel-2.14.1/gnome-panel/panel-addto-rounded-rect-pixbuf.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/gnome-panel/panel-addto-rounded-rect-pixbuf.h 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/panel-addto-canvas.c gnome-panel-2.14.1.new/panel-addto-canvas.c +--- gnome-panel-2.14.1/panel-addto-canvas.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/panel-addto-canvas.c 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/panel-addto-canvas.h gnome-panel-2.14.1.new/panel-addto-canvas.h +--- gnome-panel-2.14.1/panel-addto-canvas.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/panel-addto-canvas.h 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/panel-addto-event-box.c gnome-panel-2.14.1.new/panel-addto-event-box.c +--- gnome-panel-2.14.1/panel-addto-event-box.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/panel-addto-event-box.c 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/panel-addto-event-box.h gnome-panel-2.14.1.new/panel-addto-event-box.h +--- gnome-panel-2.14.1/panel-addto-event-box.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/panel-addto-event-box.h 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/panel-addto-rounded-rect.c gnome-panel-2.14.1.new/panel-addto-rounded-rect.c +--- gnome-panel-2.14.1/panel-addto-rounded-rect.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/panel-addto-rounded-rect.c 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/panel-addto-rounded-rect.h gnome-panel-2.14.1.new/panel-addto-rounded-rect.h +--- gnome-panel-2.14.1/panel-addto-rounded-rect.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/panel-addto-rounded-rect.h 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1/panel-addto-rounded-rect-pixbuf.h gnome-panel-2.14.1.new/panel-addto-rounded-rect-pixbuf.h +--- gnome-panel-2.14.1/panel-addto-rounded-rect-pixbuf.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.14.1.new/panel-addto-rounded-rect-pixbuf.h 2006-05-05 01:37:04.000000000 +0200 +@@ -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.14.1.orig/debian/maintfiles/09_open_drawers_on_right_screen.patch.NOTWORKING +++ gnome-panel-2.14.1/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.14.1.orig/debian/maintfiles/clock_applet_evo_open.patch +++ gnome-panel-2.14.1/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.14.1.orig/debian/maintfiles/changelog_unreleased +++ gnome-panel-2.14.1/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.14.1.orig/debian/maintfiles/improved_open_recent_doc_in_term.patch.NEEDTESTING +++ gnome-panel-2.14.1/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.14.1.orig/debian/changelog +++ gnome-panel-2.14.1/debian/changelog @@ -0,0 +1,2290 @@ +gnome-panel (2.14.1-0ubuntu12) dapper; urgency=low + + * debian/patches/09_help_submenu.patch: + - updated, new layout is the one that will be used for dapper, + thanks to Jane Silber for the items description (Ubuntu: #31775) + - the "Ubuntu Book Excerpt" item points to the firefox startup page + for now, that's not a bug, it'll be updated before dapper + + -- Sebastien Bacher Tue, 16 May 2006 16:47:36 +0200 + +gnome-panel (2.14.1-0ubuntu11) dapper; urgency=low + + * debian/patches/11_applet_use_session_dialog.patch: + - don't list the lock menu item with ubuntu session mode + + -- Sebastien Bacher Mon, 15 May 2006 11:31:25 +0200 + +gnome-panel (2.14.1-0ubuntu10) dapper; urgency=low + + * debian/gnome-panel.install: + - list new .so built instead of the binaries to the new patch + * debian/patches/10_some_applets_in_proc.patch: + - patch by Ben Maurer + - change some applets to be in-proc for best memory usage on the desktop + (Ubuntu: #39155) + * debian/patches/12_autoconf.patch: + - updated + * debian/patches/99_about-ubuntu-translation.patch: + - updated + + -- Sebastien Bacher Sun, 7 May 2006 23:26:23 +0200 + +gnome-panel (2.14.1-0ubuntu9) dapper; urgency=low + + * debian/patches/11_panel_addto_dialog.patch: + - fix some mnemonics usage (Ubuntu: #42037) + + -- Sebastien Bacher Fri, 5 May 2006 01:27:40 +0200 + +gnome-panel (2.14.1-0ubuntu8) dapper; urgency=low + + * debian/patches/11_applet_use_session_dialog.patch: + - mention than the panel needs to be restarted if the session dialog to use + is changed (Ubuntu: #42533) + + -- Sebastien Bacher Tue, 2 May 2006 18:17:15 +0200 + +gnome-panel (2.14.1-0ubuntu7) dapper; urgency=low + + * debian/patches/13_notification_area_transparency.patch: + - patch from bugzilla to make transparency work with the notification area, + applications need to be patched too (GNOME: #100600, Ubuntu: #32173) + + -- Sebastien Bacher Mon, 1 May 2006 15:08:56 +0200 + +gnome-panel (2.14.1-0ubuntu6) dapper; urgency=low + + * debian/ubuntu-about.desktop, debian/ubuntu-about.desktop.in: + - don't force the icon path nor format (Ubuntu: #41465) + + -- Sebastien Bacher Wed, 26 Apr 2006 18:52:29 +0200 + +gnome-panel (2.14.1-0ubuntu5) dapper; urgency=low + + * debian/gnome-panel-data.postinst, + debian/panel-default-setup-laptop.entries, debian/rules: + - laptop profile is useful for wireless applet, modify the profile + to not use battstat since it's not required + + -- Sebastien Bacher Wed, 19 Apr 2006 10:51:06 +0200 + +gnome-panel (2.14.1-0ubuntu4) dapper; urgency=low + + * debian/gnome-panel-data.postinst, + debian/panel-default-setup-laptop.entries, debian/rules: + - drop the laptop profile, it was to use battstat which is not required now + (Ubuntu: #32348) + + -- Sebastien Bacher Wed, 19 Apr 2006 10:06:15 +0200 + +gnome-panel (2.14.1-0ubuntu3) dapper; urgency=low + + * debian/patches/11_panel_addto_dialog.patch: + - cleanup, marked strings as translatable (Ubuntu: #39790) + + -- Sebastien Bacher Sun, 16 Apr 2006 22:04:19 +0200 + +gnome-panel (2.14.1-0ubuntu2) dapper; urgency=low + + * debian/patches/09_help_submenu.patch: + - fix string not marked for translation + * debian/patches/11_applet_use_session_dialog.patch: + - define a "/apps/panel/global/upstream_session" gconf key to use the + upstream sessions dialogs instead of the Ubuntu one + - only the upstream mode has a shutdown applet (Ubuntu: #37179) + + -- Sebastien Bacher Fri, 14 Apr 2006 14:32:00 +0200 + +gnome-panel (2.14.1-0ubuntu1) dapper; urgency=low + + * New upstream version: + Panel: + - Don't show an empty label for local URI that are not file: URI in + the bookmarks (Ubuntu: #31956, #36775) + - Plug leaks + - Always canonicalize URIs in launchers before showing them + - Cleanups + libpanel-applet: + - Plug GnomeProgram leak + Clock Applet: + - Remove GnomeProgram leak + - Fix potential crash + - Fix potential crash with unknown event types + - Launch evolution on the clicked day + - Plug leak of a GError + Show Desktop Applet: + - Use less padding for the focus so the icon doesn't get trimmed + Misc: + - Use po/LINGUAS to list languages + Docs Translators: + - Maxim Dziumanenko (uk) + Translators: + - Vital Khilko (be) + - Jérémy Le Floc'h (br) + - Pema Geyleg (dz) + - Ivar Smolin (et) + - Benoît Dejean (fr) + - Ignacio Casal Quinteiro (gl) + - Yuval Tanny (he) + - Luca Ferretti (it) + - Takeshi AIHANA (ja) + - Vladimer Sichinava (ka) + - Wouter Bolsterlee (nl) + - Gora Mohanty (or) + - Dan Damian (ro) + * debian/patches/07_clock_applet_spawn_evo_right_day.patch: + - fixed with the new version + * debian/patches/07_use_beagle.patch: + - use beagle for the places menu search item if available (Ubuntu: #38986) + + -- Sebastien Bacher Mon, 10 Apr 2006 17:08:16 +0200 + +gnome-panel (2.14.0-0ubuntu2) dapper; urgency=low + + * debian/patches/07_clock_applet_spawn_evo_right_day.patch: + - make double clicking on a day from the panel calendar open the + evolution calendar on the same day, patch by Tollef (Ubuntu :#35167) + + -- Sebastien Bacher Mon, 20 Mar 2006 10:42:28 +0100 + +gnome-panel (2.14.0-0ubuntu1) dapper; urgency=low + + * New upstream release: + - Panel: + - Remove the Suspend button on the logout dialog (this is not a + regression wrt 2.12) + - Ignore unknown options passed to the panel + - Fix orientation of handles + - Fix help link for the menubar + - Fix underscores not being visible in menu items + - Workspace Switcher Applet: + - Fix crash when scrolling right on the last workspace + - Misc: + - Update manpage + - Translations: be, bg, bn, cs, cy, da, de, el, es, et, eu, fi, hu, it, + ja, ka, ku, lt, nb, nl, nn, no, pl, pt_BR, ru, sq, sr, sv, th, uk, vi, + zh_CN, zh_HK, zh_TW. + * debian/ubuntu-about.desktop{,.in}: + - added .in file, added Lithuanian translation (Malone: #34711), added + Catalan translation (thanks Jordi Mallach). + * debian/patches/99_about-ubuntu-translation.patch: + - added debian/ubuntu-about.desktop to POTFILES.in, reran + intltool-update -p. + + -- Daniel Holbach Mon, 13 Mar 2006 22:16:31 +0100 + +gnome-panel (2.13.91-0ubuntu6) dapper; urgency=low + + * debian/patches/09_help_submenu.patch: + - make a "help" submenu for support (Ubuntu: #31775) + + -- Sebastien Bacher Thu, 2 Mar 2006 23:49:01 +0100 + +gnome-panel (2.13.91-0ubuntu5) dapper; urgency=low + + * debian/control.in: + - Build-Depends on libpng12 instead of libpng3 (Ubuntu: #32590) + * debian/patches/08_default_clock_setting.patch: + - display the date with the panel clock by default + + -- Sebastien Bacher Thu, 2 Mar 2006 18:59:41 +0100 + +gnome-panel (2.13.91-0ubuntu4) dapper; urgency=low + + * debian/patches/11_applet_use_session_dialog.patch: + - patch update, use one item for the panel menu and make it open the + session dialog + + -- Sebastien Bacher Sat, 25 Feb 2006 00:00:00 +0100 + +gnome-panel (2.13.91-0ubuntu3) dapper; urgency=low + + * debian/patches/04_default_panel_config.patch: + - default browser is firefox not epiphany + + -- Sebastien Bacher Thu, 16 Feb 2006 16:26:39 +0100 + +gnome-panel (2.13.91-0ubuntu2) dapper; urgency=low + + * debian/ubuntu-about.desktop: + - use the distributor-logo as icon (Ubuntu: #10322) + + -- Sebastien Bacher Thu, 16 Feb 2006 15:30:25 +0100 + +gnome-panel (2.13.91-0ubuntu1) dapper; urgency=low + + * New upstream release: + - Panel: + - Use Restart instead of Reboot + - Remove the Shut Down reference in the tooltip of the Log Out item + (Malone: #30293) + - Don't reboot/shutdown immediately if other users are connected + - Don't display the Shut Down item if GDM is not running + - Use a softer countdown for the 30 first seconds in the log out dialogs + - Fix critical warning in the run dialog when the program list is + disabled + - Add "..." at the end of the Log Out and Shut Down items + - Make invisible mnemonics in menu work again + - Add accelerator for items in the context menu of launchers + - Use GOption instead of popt + - Fish Applet: + - Use gender-neutral wording in about dialog + - Window Menu Applet: + - Update help link + - Misc: + - Use GOption instead of popt in the test applet program + - Fix build when /usr/lib/X11R6 is a link to /usr + - Docs Translators: Luca Ferretti (it) + - Translators: Runa Bhattacharjee (bn), Jordi Mallach (ca), Miloslav + Trmac (cs), Ole Laursen (da), Ivar Smolin (et), Ignacio Casal Quinteiro + (gl), Luca Ferretti (it), Øivind Hoel (nb), Evandro Fernandes Giovanini + (pt_BR), Слободан Д. Средојевић (sr), Theppitak Karoonboonyanan (th) + * debian/patches/11_panel_addto_dialog.patch, + debian/patches/12_autoconf.patch: + - updated. + + -- Daniel Holbach Mon, 13 Feb 2006 22:33:00 +0100 + +gnome-panel (2.13.90-0ubuntu2) dapper; urgency=low + + * debian/rules: + - build a .pot + + -- Sebastien Bacher Mon, 6 Feb 2006 22:33:54 +0100 + +gnome-panel (2.13.90-0ubuntu1) dapper; urgency=low + + * New upstream release: + - Panel: + - Fix timeout label in the logout dialogs + - Don't make it possible to have two logout dialogs at the same time + - Put logout dialogs above all windows and on all workspaces + - Show the logout dialog on the correct screen + - Fix crash with logout dialogs when esd and sound events are enabled + - Simplify the logout dialogs questions + - Partial fix for Vincent's stupidity :-) + - Fix search of application launchers in "Add to panel" dialog + - Fix potential crash when there's an error loading an applet + - Update libegg code + - Fix crash when logout dialogs are closed by the window manager + - Remove gnome-screenshot item from the Desktop menu + - Look in the XDG data dirs when loading a .desktop file, so we don't + need the whole path + - Update default panel config to just use basenames for .desktop files + - Remove the screenshot action button and migrates the existing config + to use gnome-screenshot.desktop (Malone: #19090). + - Change accelerator for "Lock To Panel" + - Add username to the Logout menu item + - Fix crash happening with remote bookmarks in the Places menu + - Use an icon for the network places submenu + - Update the launcher item description in the "Add to panel" dialog + - Simplify and add context for some strings + - Fix warnings + - Don't show useless separators in context menus of panel objects when + the panel is locked down + - Fix theoretical breakage if gconf config is broken + - Clock Applet: + - Fix incoherency in the use of two lines format + - Don't offer the 12-hour format to the user if his locale don't + support it + - Misc: + - Add context in some strings of the test applet program + - Docs Translators + - Vincent Untz (fr) + - Translators: Vital Khilko (be), Vladimir Petkov (bg), Hendrik + Brandt (de), Kostas Papadimas (el), Adam Weinberger (en_CA), Francisco + Javier F. Serrador (es), Ilkka Tuohela (fi), Ignacio Casal Quinteiro + (gl), Ankit Patel (gu), Luca Ferretti (it), Takeshi AIHANA (ja), + Žygimantas BeruÄka (lt), Øivind Hoel (nb), Reinout van Schouwen (nl), + Øivind Hoel (no), Evandro Fernandes Giovanini (pt_BR), Слободан Д. + Средојевић (sr), Theppitak Karoonboonyanan (th), Clytie Siddall (vi), + Funda Wang (zh_CN) + * Other bugs fixed: + - Malone: #28958: "Alt+F2 "Run Dialog" box appears and hides behind" + * debian/ubuntu-about.desktop: + - dropped, DocPath line, thanks Thierry Moisan . + (Malone: #4899) + * debian/patches/04_default_panel_config.patch, + debian/patches/11_panel_addto_dialog.patch, + debian/patches/12_autoconf.patch + - updated. + * debian/patches/08_cvs_fixes_session.patch, + debian/patches/13_fix-bookmarks-crash.patch: + - dropped, Fix released. + + -- Daniel Holbach Sat, 28 Jan 2006 15:47:24 +0100 + +gnome-panel (2.13.5-0ubuntu4) dapper; urgency=low + + * debian/patches/13_fix-bookmarks-crash.patch: + + Fix the crash caused by memory corruption when viewing the Locations + menu. Patch from CVS + + -- Sebastian Dröge Mon, 23 Jan 2006 22:20:17 +0100 + +gnome-panel (2.13.5-0ubuntu3) dapper; urgency=low + + * debian/patches/11_applet_use_session_dialog.patch: + - use the session dialog, instead of the new panel one, when clicking on + the applet, thanks to Vincent Untz for the patch! + + -- Sebastien Bacher Thu, 19 Jan 2006 17:41:04 +0100 + +gnome-panel (2.13.5-0ubuntu2) dapper; urgency=low + + * debian/patches/08_cvs_fixes_session.patch: + - patch from the CVS, fixes different issues with the session dialog + - fixes the crash due to sound events of the session dialog + (Ubuntu: #28917) + + -- Sebastien Bacher Wed, 18 Jan 2006 22:50:22 +0100 + +gnome-panel (2.13.5-0ubuntu1) dapper; urgency=low + + * debian/patches/11_panel_addto_dialog.patch: + - patch updated for the upstream code changes + * debian/patches/12_autotools.patch: + - updated + + [ Daniel Holbach ] + + * New upstream release: + - Panel: + - Remove useless screensaver actions in context menu of the button + (William Jon McCann) + - Fix tiling for image backgrounds (Vincent) + - Update background when size changes (Vincent) + - Make image with transparency backgrounds work (Vincent) + - Fix critical warnings (Vincent) + - Add CD recording item to the Places menu (Sébastien Bacher) (Malone: + #18213) + - Add separator internal applet (Carlos Garcia Campos, Manu Cornet, + Vincent) + - Add a search entry to the "add to panel" dialog (Vincent) + - Re-cache the applications menu when reloading it after there has been + some fam/gamin/inotify events (Vincent) + - Add new logout/shutdown dialogs (Vincent) + - Fix display of remote bookmarks in Places menu (Bastien Nocera, + Vincent) + - Small fixes (Vincent) + - libpanel-applet: + - Fix tiling for image backgrounds (Vincent) + - Avoid crashes with image backgrounds (Vincent) + - Wnck Applets: + - tell libwnck that the applets are pagers (Elijah Newren) + - Documentation: + - Update for clock and fish applets (Joachim Noreiko) + - Misc: + - Depend on libwnck 2.13.5 (Vincent) + - Docs Translators: + - Christophe Bliard (fr) + - Translators: Vladimir Petkov (bg), Jordi Mallach (ca), Hendrik Richter + (de), Adam Weinberger (en_CA), Ilkka Tuohela (fi), Ignacio Casal + Quinteiro (gl), Gabor Kelemen (hu), Takeshi AIHANA (ja), Reinout van + Schouwen (nl), Слободан Д. Средојевић (sr), Theppitak Karoonboonyanan + (th), Clytie Siddall (vi), Woodman Tuen (zh_HK), Woodman Tuen (zh_TW) + * debian/control.in: + - bumped Build-Depends on libwnck. + * debian/patches/11_panel_addto_dialog.patch: + - dropped momentarily. + * debian/changes/12_autotools.patch: + - updated. + * Resynchronized with Debian; changes towards the Debian package are: + - debian/application-default-icon.png.uue, + debian/rules, + debian/patches/01_distrologo.patch + - Distro Icon. + - debian/control.in, + debian/rules: + - additional gnome-panel-dbg package. + - debian/control.in, + debian/patches/09_lpi_src.patch, + debian/patches/12_autotools.patch: + - Launchpad Integration. + - debian/control.in: + - different Recommends, Suggests (alacarte, gnome-sytem-tools). + - different name for libpanel-applet2-0-dbg. + - debian/gnome-panel-data.postinst, + debian/panel-default-setup-laptop.entries: + - additional laptop detect changes. + - debian/watch, + debian/control.in: + - Newer version. + + -- Sebastien Bacher Wed, 18 Jan 2006 01:38:34 +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.13.4-0ubuntu3) dapper; urgency=low + + * debian/patches/11_panel_addto_dialog.patch: + - patch update by Manu Cornet + - changes according to dapper-desktop-plan + - move the menu items to the utilities category + - use buttons for the special launchers actions + + -- Sebastien Bacher Thu, 12 Jan 2006 22:41:23 +0100 + +gnome-panel (2.13.4-0ubuntu2) dapper; urgency=low + + * debian/panel-default-setup-laptop.entries, + debian/patches/04_default_panel_config.patch: + - update for dapper-desktop-plan + - don't put yelp on the default panel + - put the session button to the top right corner + + -- Sebastien Bacher Mon, 9 Jan 2006 21:54:49 +0100 + +gnome-panel (2.13.4-0ubuntu1) dapper; urgency=low + + * New upstream version: + Panel: + - Don't crash when an applet can't be loaded + - Fix critical warnings + - Remove useless warning + - Add a preview widget in the image background chooser + - Don't crash with some themes + - Fix sensitivity of "Remove panel" menu item + - Reword error dialogs + - Update the known applications list while typing and only show the + items that match + - Make the "add to panel" dialog a bit nicer + - Use a close button instead of the cancel one in the "add to panel" + dialog + - Add tooltips for the menu bar + - Update from libegg + - Don't do something on double/triple clicks for buttons + - Make applet handles handle transparency + - Fix crash when a toplevel is destroyed + - Fix crash when quitting with "add to dialog" open + - Fix auto-hide panel not autohiding after the "Delete dialog" has been + opened + - Minor fixes + - Code cleanups + libpanel-applet: + - Add new API to automatically update the background of a widget + - Emits the background-changed signal when the allocated size changes + - Fix criticla warning + Clock Applet: + - Make task activation work correctly + - Sort tasks by due date if priorities are the same + - Don't show the date by default + Fish Applet: + - Fix path to cairo.h + - Fix critical warning when choosing a new image + Notification Area Applet: + - Update from libegg. Should fix some icons not showing + Window List Applet: + - Fix critical warning and icon not showing during startup notification + All Applets: + - use new libpanel-applet API for the background + Documentation: + - Update for clock and fish applets + Misc: + - change button order and use Execute button for the test applet program + - don't crash when an applet can't be loaded in the test applet program + - Build fixes + * debian/patches/02_incorrect_applet_loading_crash_fix.patch: + - fixed with the new version + * debian/patches/10_defaulteditor.patch, + debian/patches/11_panel_addto_dialog.patch, + debian/patches/12_autotools.patch: + - updated + * debian/patches/08_tray_icons.patch: + - fixed with the new version + + -- Sebastien Bacher Mon, 2 Jan 2006 22:49:50 +0100 + +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.13.3-0ubuntu3) dapper; urgency=low + + * debian/patches/02_incorrect_applet_loading_crash_fix.patch: + - fix a crasher when a bugged applet is configured (Ubuntu: #20912) + + -- Sebastien Bacher Tue, 20 Dec 2005 15:36:53 +0100 + +gnome-panel (2.13.3-0ubuntu2) dapper; urgency=low + + * debian/control.in: + - build with the current evolution-data-server package + + -- Sebastien Bacher Tue, 13 Dec 2005 21:58:32 +0100 + +gnome-panel (2.13.3-0ubuntu1) dapper; urgency=low + + * New upstream version: + Panel: + - Code cleanups + - Synchronize the way remote bookmarks are displayed with nautilus + - Remove deprecated calls + - Update libegg code + Clock Applet: + - Really fix the orientation change + Misc: + - Remove the .spec file + - Build fixes + * debian/patches/02_calendar.patch: + - fixed with the new version. + * debian/patches/09_lpi_src.patch, + debian/patches/12_autotools.patch: + - updated + + -- Sebastien Bacher Tue, 13 Dec 2005 12:14:02 +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.13.2-0ubuntu3) dapper; urgency=low + + * debian/control.in, + debian/patches/10_defaulteditor.patch: + - update for the menu editor name change ("alacarte" now). + + -- Sebastien Bacher Tue, 22 Nov 2005 14:50:48 +0100 + +gnome-panel (2.13.2-0ubuntu2) dapper; urgency=low + + * debian/patches/02_calendar.patch: + - fix the calendar for the clock applet (Ubuntu: #19819). + + -- Sebastien Bacher Sat, 19 Nov 2005 14:10:37 +0100 + +gnome-panel (2.13.2-0ubuntu1) dapper; urgency=low + + * Sync with Debian. + * New upstream version: + Panel + - Don't display error when an url show is canceled + - Handle glade errors + - Revert orientation change + - Update libegg code + Clock Applet + - Updates for the orientation change + Fish Applet + - Updates for the orientation change + * debian/application-default-icon.png.uue: + - default icon for the menu entries. + * debian/control.in: + - Build-Depends on cairo/lpi. + - Depends on libnspr4. + - updated the libpanel dbg package name, list a gnome-panel-dbg package. + - Recommends smeg. + * debian/gnome-panel-data.install: + - install the "About Ubuntu" menu item. + * debian/gnome-panel-data.postinst: + - use laptop-detect to determine the default configuration. + * 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/02_panel-menu-items.c.patch: + - fixed with the current version. + * debian/patches/04_menus_rename.patch: + - no name change for the menu files. + * 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_time_cmd.patch: + - use gksudo to set the clock. + * debian/patches/08_tray_icons.patch: + - fix some bugs with the systray. + * debian/patches/09_default_icons.patch: + - shows an icon if the .desktop hasn't one. + * debian/patches/10_defaulteditor.patch: + - change the default editor to smeg. + * debian/patches/11_panel_addto_dialog.patch: + - new 'add to panel' dialog. + * debian/patches/12_autotools.patch: + - update the build files. + * debian/patches/99_reautogenization.patch: + - the previous patch does this job. + * debian/rules: + - install the default menu icon. + - updated for ubuntu dbg packages. + * debian/ubuntu-about.desktop: + - "About Ubuntu" menu item. + * debian/watch: + - updated. + + -- Sebastien Bacher Mon, 14 Nov 2005 12:28:01 +0100 + +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.14.1.orig/debian/gnome-panel.install +++ gnome-panel-2.14.1/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/libfish-applet-2.so +debian/tmp/usr/lib/libfish-applet-2.so.0.* +debian/tmp/usr/lib/libnotification-area-applet.so +debian/tmp/usr/lib/libnotification-area-applet.so.0.* +debian/tmp/usr/lib/libwnck-applet.so +debian/tmp/usr/lib/libwnck-applet.so.0.* --- gnome-panel-2.14.1.orig/debian/control +++ gnome-panel-2.14.1/debian/control @@ -0,0 +1,82 @@ +Source: gnome-panel +Section: gnome +Priority: optional +Maintainer: Guilherme de S. Pastore +Uploaders: Sebastien Bacher , Arnaud Patard , Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Clément Stenac , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , OndÅ™ej Surý , Rob Bradford , Robert McQueen , Ross Burton , Sebastien Bacher , Sjoerd Simons , Takuo KITAME +Standards-Version: 3.6.2.1 +Build-Depends: cdbs (>= 0.4.23-1.1), build-essential, autotools-dev, debhelper (>= 4.1.0), patchutils (>= 0.2.25), debhelper (>= 5.0.7ubuntu4), liborbit2-dev (>= 1:2.12.1-1), intltool, gnome-pkg-tools, libgtk2.0-dev (>= 2.7.1), libglade2-dev (>= 1:2.5.1), libwnck-dev (>= 2.13.5), scrollkeeper (>= 0.3.14-9.1), libgnome2-dev (>= 2.13.0), libgnome-desktop-dev (>= 2.11.1), libpng12-dev, libbonobo2-dev (>= 2.8.1-2), libxmu-dev, libedata-cal1.2-dev (>= 1.2.1-1) [!hurd-i386], libgnome-menu-dev (>= 2.11.1-1), libgnomevfs2-dev (>= 2.10.0-1), libnspr-dev, libxres-dev, sharutils, gnome-doc-utils, libedataserverui1.2-dev (>= 1.5.3), liblpint-bonobo-dev, liblaunchpad-integration-dev, libcairo2-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.10.1-1), gnome-session, menu-xdg (>= 0.2), alacarte +Suggests: yelp, gnome2-user-guide, gnome-terminal | x-terminal-emulator, gnome-system-tools, nautilus +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: gnome-panel-dbg +Architecture: any +Depends: gnome-panel (= ${Source-Version}) +Description: Launch and/or dock GNOME 2 applications + This package contains a toolbar (the "panel") that you can attach to the + edge of your X desktop. You can install "applets" on it. Several applets + are supplied: an application menu, a clock, a mail checker, a network + monitor, etc. You can customize the location, and the "autohide" + animations. + . + This development package contains unstripped binaries compiled with + debugging symbols needed by gdb. + +Package: libpanel-applet2-0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: library for GNOME 2 panel applets + This library is used by GNOME 2 panel applets. + +Package: libpanel-applet2-0-dbg +Section: libdevel +Architecture: any +Depends: libpanel-applet2-0 (= ${Source-Version}) +Conflicts: libpanel-applet2-dbg +Provides: libpanel-applet2-dbg +Replaces: libpanel-applet2-dbg +Description: library for GNOME 2 panel applets - library with debugging symbols + This library is used by GNOME 2 panel applets. + . + This package contains unstripped shared libraries. It is provided primarily + to provide a backtrace with names in a debugger, this makes it somewhat + easier to interpret core dumps. The libraries are installed in + /usr/lib/debug and can be used by placing that directory in + LD_LIBRARY_PATH. + Most people will not need this package. + +Package: libpanel-applet2-dev +Section: libdevel +Architecture: any +Depends: libpanel-applet2-0 (= ${Source-Version}), libgnomeui-dev (>= 2.10.0-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 +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), ${misc:Depends} +Recommends: gnome-panel (= ${Source-Version}) +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.14.1.orig/debian/control.in +++ gnome-panel-2.14.1/debian/control.in @@ -0,0 +1,82 @@ +Source: gnome-panel +Section: gnome +Priority: optional +Maintainer: Guilherme de S. Pastore +Uploaders: Sebastien Bacher , Arnaud Patard , @GNOME_TEAM@ +Standards-Version: 3.6.2.1 +Build-Depends: @cdbs@, liborbit2-dev (>= 1:2.12.1-1), intltool, gnome-pkg-tools, libgtk2.0-dev (>= 2.7.1), libglade2-dev (>= 1:2.5.1), libwnck-dev (>= 2.13.5), scrollkeeper (>= 0.3.14-9.1), libgnome2-dev (>= 2.13.0), libgnome-desktop-dev (>= 2.11.1), libpng12-dev, libbonobo2-dev (>= 2.8.1-2), libxmu-dev, libedata-cal1.2-dev (>= 1.2.1-1) [!hurd-i386], libgnome-menu-dev (>= 2.11.1-1), libgnomevfs2-dev (>= 2.10.0-1), libnspr-dev, libxres-dev, sharutils, gnome-doc-utils, libedataserverui1.2-dev (>= 1.5.3), liblpint-bonobo-dev, liblaunchpad-integration-dev, libcairo2-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.10.1-1), gnome-session, menu-xdg (>= 0.2), alacarte +Suggests: yelp, gnome2-user-guide, gnome-terminal | x-terminal-emulator, gnome-system-tools, nautilus +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: gnome-panel-dbg +Architecture: any +Depends: gnome-panel (= ${Source-Version}) +Description: Launch and/or dock GNOME 2 applications + This package contains a toolbar (the "panel") that you can attach to the + edge of your X desktop. You can install "applets" on it. Several applets + are supplied: an application menu, a clock, a mail checker, a network + monitor, etc. You can customize the location, and the "autohide" + animations. + . + This development package contains unstripped binaries compiled with + debugging symbols needed by gdb. + +Package: libpanel-applet2-0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: library for GNOME 2 panel applets + This library is used by GNOME 2 panel applets. + +Package: libpanel-applet2-0-dbg +Section: libdevel +Architecture: any +Depends: libpanel-applet2-0 (= ${Source-Version}) +Conflicts: libpanel-applet2-dbg +Provides: libpanel-applet2-dbg +Replaces: libpanel-applet2-dbg +Description: library for GNOME 2 panel applets - library with debugging symbols + This library is used by GNOME 2 panel applets. + . + This package contains unstripped shared libraries. It is provided primarily + to provide a backtrace with names in a debugger, this makes it somewhat + easier to interpret core dumps. The libraries are installed in + /usr/lib/debug and can be used by placing that directory in + LD_LIBRARY_PATH. + Most people will not need this package. + +Package: libpanel-applet2-dev +Section: libdevel +Architecture: any +Depends: libpanel-applet2-0 (= ${Source-Version}), libgnomeui-dev (>= 2.10.0-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 +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), ${misc:Depends} +Recommends: gnome-panel (= ${Source-Version}) +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.14.1.orig/debian/ubuntu-about.desktop +++ gnome-panel-2.14.1/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.14.1.orig/debian/rules +++ gnome-panel-2.14.1/debian/rules @@ -0,0 +1,53 @@ +#!/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_BUILDDIR = $(CURDIR)/debian/build +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed" +DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper +ifneq ($(DEB_BUILD_GNU_SYSTEM),gnu) + DEB_CONFIGURE_EXTRA_FLAGS += --enable-eds +endif + +# debug lib +DEB_DH_STRIP_ARGS := --dbg-package=libpanel-applet2-0 --dbg-package=gnome-panel + +# tight versioning +DEB_NOREVISION_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -f 1 -d '-') +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 + +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 -rf $(DEB_BUILDDIR) + -rm -f debian/application-default-icon.png --- gnome-panel-2.14.1.orig/debian/ubuntu-about.desktop.in +++ gnome-panel-2.14.1/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.14.1.orig/debian/gnome-vfolder-user +++ gnome-panel-2.14.1/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.14.1.orig/debian/application-default-icon.png.uue +++ gnome-panel-2.14.1/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.14.1.orig/debian/panel-test-applets.1 +++ gnome-panel-2.14.1/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 décembre 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.14.1.orig/debian/compat +++ gnome-panel-2.14.1/debian/compat @@ -0,0 +1 @@ +4 --- gnome-panel-2.14.1.orig/debian/panel-default-setup-laptop.entries +++ gnome-panel-2.14.1/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 + + + session_dialog + + + + + + + + + general/applet_id_list + /schemas/apps/panel/general/applet_id_list + + + + notificationarea + + + wireless + + + 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 + + + + + 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/wireless/object_type + /schemas/apps/panel/objects/object_type + + bonobo-applet + + + + applets/wireless/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + + applets/wireless/position + /schemas/apps/panel/objects/position + + 3 + + + + applets/wireless/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + true + + + + applets/wireless/locked + /schemas/apps/panel/objects/locked + + true + + + + applets/wireless/bonobo_iid + /schemas/apps/panel/objects/bonobo_iid + + OAFIID:GNOME_Panel_WirelessApplet + + + + applets/wireless/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id + applets/wireless/tooltip/schemas/apps/panel/objects/tooltip + applets/wireless/use_custom_icon/schemas/apps/panel/objects/use_custom_icon + applets/wireless/custom_icon/schemas/apps/panel/objects/custom_icon + applets/wireless/use_menu_path/schemas/apps/panel/objects/use_menu_path + applets/wireless/menu_path/schemas/apps/panel/objects/menu_path + applets/wireless/launcher_location/schemas/apps/panel/objects/launcher_location + applets/wireless/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.14.1.orig/debian/gnome-panel-data.install +++ gnome-panel-2.14.1/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.14.1.orig/debian/panel-test-applets.sgml +++ gnome-panel-2.14.1/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). + + + + + --- gnome-panel-2.14.1.orig/debian/watch +++ gnome-panel-2.14.1/debian/watch @@ -0,0 +1,3 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.13/gnome-panel-(.*)\.tar\.gz \ + debian uupdate --- gnome-panel-2.14.1.orig/debian/gnome-panel-data.menu-method.experimental +++ gnome-panel-2.14.1/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.14.1.orig/debian/gnome-panel-data.menu-method +++ gnome-panel-2.14.1/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.14.1.orig/debian/gnome-desktop-item-edit.1 +++ gnome-panel-2.14.1/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 décembre 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.14.1.orig/debian/libpanel-applet2-dbg.install +++ gnome-panel-2.14.1/debian/libpanel-applet2-dbg.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpanel-applet-2.so.* usr/lib/debug/ --- gnome-panel-2.14.1.orig/debian/gnome-panel-data.postinst +++ gnome-panel-2.14.1/debian/gnome-panel-data.postinst @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" = "configure" ]; then + SCHEMA_LOCATION=/usr/share/gconf/schemas + GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + if [ -x /usr/sbin/laptop-detect ] && /usr/sbin/laptop-detect; then + echo "laptop configuration" + HOME=/root \ + gconftool-2 --direct --config-source=${GCONF_CONFIG_SOURCE} --load ${SCHEMA_LOCATION}/panel-default-setup-laptop.entries + else + echo "desktop configuration" + HOME=/root \ + gconftool-2 --direct --config-source=${GCONF_CONFIG_SOURCE} --load ${SCHEMA_LOCATION}/panel-default-setup.entries + fi +fi --- gnome-panel-2.14.1.orig/debian/gnome-panel.manpages +++ gnome-panel-2.14.1/debian/gnome-panel.manpages @@ -0,0 +1,2 @@ +man/*.1 +debian/*.1 --- gnome-panel-2.14.1.orig/debian/gnome-panel-data.postrm +++ gnome-panel-2.14.1/debian/gnome-panel-data.postrm @@ -0,0 +1,9 @@ +#!/bin/sh -e + +if [ "$1" = "purge" ]; then + rm -rf /var/lib/gnome +fi + +#DEBHELPER# + +exit 0 --- gnome-panel-2.14.1.orig/debian/gnome-desktop-item-edit.sgml +++ gnome-panel-2.14.1/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.14.1.orig/debian/libpanel-applet2-0.install +++ gnome-panel-2.14.1/debian/libpanel-applet2-0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpanel-applet-2.so.* usr/lib/ --- gnome-panel-2.14.1.orig/debian/applications.template +++ gnome-panel-2.14.1/debian/applications.template @@ -0,0 +1,9 @@ + + + + Root + applications-all-users:/// + +include-menu-defs + + --- gnome-panel-2.14.1.orig/debian/libpanel-applet2-doc.install +++ gnome-panel-2.14.1/debian/libpanel-applet2-doc.install @@ -0,0 +1 @@ +doc/reference/panel-applet/html usr/share/doc/libpanel-applet2-doc/ --- gnome-panel-2.14.1.orig/debian/copyright +++ gnome-panel-2.14.1/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.14.1.orig/debian/libpanel-applet2-doc.doc-base +++ gnome-panel-2.14.1/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.14.1.orig/debian/libpanel-applet2-dev.install +++ gnome-panel-2.14.1/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.14.1.orig/debian/libpanel-applet2-doc.links +++ gnome-panel-2.14.1/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.14.1.orig/debian/README.Debian +++ gnome-panel-2.14.1/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.14.1.orig/13_inproc.patch +++ gnome-panel-2.14.1/13_inproc.patch @@ -0,0 +1,202 @@ +--- gnome-panel-2.14.0/applets/fish/GNOME_FishApplet_Factory.server.in.in ++++ gnome-panel-2.14.0/applets/fish/GNOME_FishApplet_Factory.server.in.in +@@ -1,8 +1,8 @@ + + + ++ type="shlib" ++ location="@LIBDIR@/libfish-applet-2.so"> + + + +--- gnome-panel-2.14.0/applets/fish/Makefile.am ++++ gnome-panel-2.14.0/applets/fish/Makefile.am +@@ -9,11 +9,11 @@ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(FISH_CFLAGS) + +-libexec_PROGRAMS = fish-applet-2 ++lib_LTLIBRARIES = libfish-applet-2.la + +-fish_applet_2_SOURCES = fish.c ++libfish_applet_2_la_SOURCES = fish.c + +-fish_applet_2_LDADD = \ ++libfish_applet_2_la_LIBADD = \ + ../../libpanel-applet/libpanel-applet-2.la \ + $(FISH_LIBS) + +@@ -48,7 +48,7 @@ + server_DATA = $(server_in_files:.server.in=.server) + + $(server_in_files): $(server_in_files).in +- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ ++ sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@ + + CLEANFILES = $(server_DATA) $(server_DATA).in $(schemas_DATA) + +--- gnome-panel-2.14.0/applets/fish/fish.c ++++ gnome-panel-2.14.0/applets/fish/fish.c +@@ -1842,7 +1842,6 @@ + NULL); + } + +- gtk_window_set_default_icon_name ("gnome-fish"); + setup_fish_widget (fish); + + return TRUE; +@@ -2026,9 +2025,8 @@ + return type; + } + +-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FishApplet_Factory", ++PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_FishApplet_Factory", + fish_applet_get_type (), + "That-stupid-fish", +- "0", + fishy_factory, + NULL) +--- gnome-panel-2.14.0/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in ++++ gnome-panel-2.14.0/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in +@@ -1,8 +1,8 @@ + + + ++ type="shlib" ++ location="@LIBDIR@/libnotification-area-applet.so"> + + + +--- gnome-panel-2.14.0/applets/notification_area/Makefile.am ++++ gnome-panel-2.14.0/applets/notification_area/Makefile.am +@@ -14,13 +14,13 @@ + -DDATADIR=\"$(datadir)\" \ + -DLIBDIR=\"$(libdir)\" + +-libexec_PROGRAMS = notification-area-applet ++lib_LTLIBRARIES = libnotification-area-applet.la + + EGGFILES= \ + eggtraymanager.h \ + eggtraymanager.c + +-notification_area_applet_SOURCES = \ ++libnotification_area_applet_la_SOURCES = \ + fixedtip.h \ + fixedtip.c \ + main.c \ +@@ -30,7 +30,7 @@ + eggmarshalers.h \ + eggmarshalers.c + +-notification_area_applet_LDADD = \ ++libnotification_area_applet_la_LIBADD = \ + ../../libpanel-applet/libpanel-applet-2.la \ + $(X_LIBS) \ + $(PANEL_LIBS) +@@ -40,7 +40,7 @@ + server_DATA = GNOME_NotificationAreaApplet.server + + GNOME_NotificationAreaApplet.server.in: $(srcdir)/GNOME_NotificationAreaApplet.server.in.in +- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ ++ sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@ + + @INTLTOOL_SERVER_RULE@ + +--- gnome-panel-2.14.0/applets/notification_area/main.c ++++ gnome-panel-2.14.0/applets/notification_area/main.c +@@ -384,7 +384,6 @@ + + gtk_container_add (GTK_CONTAINER (tray->applet), tray->frame); + +- gtk_window_set_default_icon_name ("panel-notification-area"); + gtk_widget_show_all (GTK_WIDGET (tray->applet)); + + panel_applet_setup_menu_from_file (PANEL_APPLET (applet), +@@ -397,18 +396,8 @@ + return TRUE; + } + +-#if 1 +-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_NotificationAreaApplet_Factory", +- PANEL_TYPE_APPLET, +- "NotificationArea", +- "0", +- applet_factory, +- NULL) +- +-#else + + PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_NotificationAreaApplet_Factory", + PANEL_TYPE_APPLET, + "NotificationArea", + applet_factory, NULL); +-#endif +--- gnome-panel-2.14.0/applets/wncklet/GNOME_Wncklet_Factory.server.in.in ++++ gnome-panel-2.14.0/applets/wncklet/GNOME_Wncklet_Factory.server.in.in +@@ -1,8 +1,8 @@ + + + ++ type="shlib" ++ location="@LIBDIR@/libwnck-applet.so"> + + + +--- gnome-panel-2.14.0/applets/wncklet/Makefile.am ++++ gnome-panel-2.14.0/applets/wncklet/Makefile.am +@@ -1,4 +1,4 @@ +-libexec_PROGRAMS = wnck-applet ++lib_LTLIBRARIES = libwnck-applet.la + + INCLUDES = \ + -I$(top_builddir) \ +@@ -16,7 +16,7 @@ + -DDATADIR=\"$(datadir)\" \ + -DLIBDIR=\"$(libdir)\" + +-wnck_applet_SOURCES = \ ++libwnck_applet_la_SOURCES = \ + wncklet.c \ + wncklet.h \ + window-menu.c \ +@@ -28,9 +28,9 @@ + showdesktop.c \ + showdesktop.h + +-$(wnck_applet_OBJECTS): $(BUILT_SOURCES) ++$(libwnck_applet_la_OBJECTS): $(BUILT_SOURCES) + +-wnck_applet_LDADD = \ ++libwnck_applet_la_LIBADD = \ + ../../libpanel-applet/libpanel-applet-2.la \ + $(WNCKLET_LIBS) + +@@ -45,7 +45,7 @@ + server_DATA = $(server_in_files:.server.in=.server) + + $(server_in_files): $(server_in_files).in +- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ ++ sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@ + + @INTLTOOL_SERVER_RULE@ + +--- gnome-panel-2.14.0/applets/wncklet/wncklet.c ++++ gnome-panel-2.14.0/applets/wncklet/wncklet.c +@@ -222,9 +222,8 @@ + } + + +-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_Wncklet_Factory", ++PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_Wncklet_Factory", + PANEL_TYPE_APPLET, + "WindowNavigationApplets", +- "0", + wncklet_factory, + NULL);