--- gnome-panel-2.27.92.orig/debian/add-indicator-applet.py +++ gnome-panel-2.27.92/debian/add-indicator-applet.py @@ -0,0 +1,107 @@ +#!/usr/bin/python + +import os.path +import sys +import time +import gconf + +def msg(type, primary, secondary=""): + sys.stderr.write("[%s] %s: %s\n" % (os.path.basename(sys.argv[0]), + type, primary)) + if secondary: + sys.stderr.write("%s\n\n" % secondary) + +def error(primary, secondary=""): + msg("ERROR", primary, secondary) + +def info(primary, secondary=""): + msg("INFO", primary, secondary) + +def log_excepthook(exc_type, exc_obj, exc_tb): + import traceback + l = traceback.format_exception(exc_type, exc_obj, exc_tb) + error("exception","".join(l)) + +def associate_schemas_in_dir(client, engine, profile_dir, schema_dir): + """ + helper that takes a gconf schema dir and creates a new profile dir + based on the schema, useful for e.g. adding a applet to the panel + """ + for e in client.all_entries(schema_dir): + schema_key = os.path.basename(e.get_key()) + key = os.path.join(profile_dir, schema_key) + engine.associate_schema(key, e.get_key()) + client.suggest_sync() + +if __name__ == "__main__": + sys.excepthook = log_excepthook + info("started") + + if not os.path.exists("/usr/lib/indicator-applet/indicator-applet"): + info("no indicator applet binary installed, exiting") + sys.exit(0) + + engine = gconf.engine_get_default() + client = gconf.client_get_for_engine(engine) + #info("engine",engine) + #info("client",client) + + # make sure this is auto-run only once + client.set_bool("/apps/panel/need_add_indicator_applet", False) + #info("set /apps/panel/need_add_indicator_applet to false") + + # search for the notification area applet + applets = client.all_dirs("/apps/panel/applets") + notification_pos = None + notification_panel = None + notification_right_stick = False + for d in applets: + #info("looking at: %s" % d) + if (client.get_string(os.path.join(d,"bonobo_iid")) == "OAFIID:GNOME_IndicatorApplet"): + info("Already has a indicator applet", + "Your panel already has a indicator applet") + sys.exit(0) + if (client.get_string(os.path.join(d,"bonobo_iid")) == "OAFIID:GNOME_NotificationAreaApplet"): + notification_pos = client.get_int(os.path.join(d,"position")) + notification_panel = client.get_string(os.path.join(d,"toplevel_id")) + notification_right_stick = client.get_bool(os.path.join(d,"panel_right_stick")) + # check if we found the notification area + if (notification_pos is None or + notification_pos == 0 or + notification_panel is None): + error("Could not find notification area", + "Please add the indicator applet manually") + sys.exit(1) + + info("New post: ", notification_pos) + info("New panel: ", notification_panel) + + # create a new indicator applet + applet_name = "applet_indicator_auto_added" + new_applet_name = os.path.join("/apps/panel/applets/",applet_name) + associate_schemas_in_dir(client, engine, new_applet_name, + "/schemas/apps/panel/objects") + client.set_string(os.path.join(new_applet_name, "bonobo_iid"), + "OAFIID:GNOME_IndicatorApplet") + client.set_string(os.path.join(new_applet_name, "toplevel_id"), + notification_panel) + client.set_string(os.path.join(new_applet_name, "object_type"), + "bonobo-applet") + client.set_bool(os.path.join(new_applet_name, "panel_right_stick"), + notification_right_stick) + # position depends on if tray_applet is right stick or not + if notification_right_stick: + notification_pos += 1 + else: + notification_pos -= 1 + client.set_int(os.path.join(new_applet_name, "position"), + notification_pos) + l=client.get_list("/apps/panel/general/applet_id_list", gconf.VALUE_STRING) + l.append(applet_name) + client.set_list("/apps/panel/general/applet_id_list", gconf.VALUE_STRING, l) + client.suggest_sync() + + # show nice information + info("Configuration updated", + "Your panel configuration is updated. ") + --- gnome-panel-2.27.92.orig/debian/gnome-desktop-item-edit.1 +++ gnome-panel-2.27.92/debian/gnome-desktop-item-edit.1 @@ -0,0 +1,22 @@ +.TH "gnome-desktop-item-edit" "1" +.SH "NAME" +gnome-desktop-item-edit \(em tool to edit .desktop file +.SH "SYNOPSIS" +.PP +\fBgnome-desktop-item-edit\fR [\fB\-\-create-new \fP] [\fB\-\-help \fP] +.SH "DESCRIPTION" +.PP +\fBgnome-desktop-item-edit\fR allows you to edit .desktop file. +.SH "OPTIONS" +.IP "\fB\-\-create-new\fP" 10 +Create new file in the given directory. +.IP "\fB\-\-help\fP" 10 +Display help +.SH "SEE ALSO" +.PP +gnome-options(7) +.SH "AUTHOR" +.PP +This manual page was written by Christian Marillat marillat@debian.org for +the \fBDebian GNU/Linux\fP system (but may be used by others). +.\" created by instant / docbook-to-man, Sun 03 Dec 2006, 23:24 --- gnome-panel-2.27.92.orig/debian/gnome-panel.manpages +++ gnome-panel-2.27.92/debian/gnome-panel.manpages @@ -0,0 +1 @@ +debian/*.1 --- gnome-panel-2.27.92.orig/debian/ubuntu-about.desktop +++ gnome-panel-2.27.92/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.27.92.orig/debian/indicator-applet.desktop +++ gnome-panel-2.27.92/debian/indicator-applet.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Indicator applet +Exec=sh -c "sleep 60 && python /usr/share/gnome-panel/add-indicator-applet.py" +OnlyShowIn=GNOME; +AutostartCondition=GNOME /apps/panel/need_add_indicator_applet --- gnome-panel-2.27.92.orig/debian/copyright +++ gnome-panel-2.27.92/debian/copyright @@ -0,0 +1,64 @@ +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 http://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 for the panel: + + 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. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + + +License for the library: + + This 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. + + This 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 this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. + +On Debian systems, the complete text of the GNU Library General +Public License can be found in `/usr/share/common-licenses/LGPL-2'. + + +License for the documentation: + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation + License (GFDL), Version 1.1 or any later version published + by the Free Software Foundation with no Invariant Sections, + no Front-Cover Texts, and no Back-Cover Texts. + +On Debian systems, the complete text of the GNU Free Documentation +License can be found in `/usr/share/common-licenses/GFDL-1.2'. --- gnome-panel-2.27.92.orig/debian/panel-test-applets.sgml +++ gnome-panel-2.27.92/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.27.92.orig/debian/migrate-fusa-config.py +++ gnome-panel-2.27.92/debian/migrate-fusa-config.py @@ -0,0 +1,108 @@ +#!/usr/bin/python + +import gconf +import os.path +import sys + +from gettext import gettext as _ +import gettext + +#FIXME: add checks here and run without UI if that fails to import +import pygtk +pygtk.require('2.0') +import gtk + +def error(primary, secondary): + d = gtk.MessageDialog(type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_OK) + d.set_markup("%s" % primary) + d.format_secondary_text(secondary) + d.run() + d.destroy() + +def info(primary, secondary): + d = gtk.MessageDialog(type=gtk.MESSAGE_INFO, buttons=gtk.BUTTONS_OK) + d.set_markup("%s" % primary) + d.format_secondary_text(secondary) + d.run() + d.destroy() + +def associate_schemas_in_dir(client, engine, profile_dir, schema_dir): + """ + helper that takes a gconf schema dir and creates a new profile dir + based on the schema, useful for e.g. adding a applet to the panel + """ + for e in client.all_entries(schema_dir): + schema_key = os.path.basename(e.get_key()) + key = os.path.join(profile_dir, schema_key) + engine.associate_schema(key, e.get_key()) + client.suggest_sync() + +if __name__ == "__main__": + gettext.bindtextdomain("gnome-panel") + + engine = gconf.engine_get_default() + client = gconf.client_get_for_engine(engine) + objects = client.all_dirs("/apps/panel/objects") + + logout=None + logout_panel=None + for d in objects: + if client.get_string(os.path.join(d,"action_type")) == "logout": + logout=os.path.basename(d) + logout_panel=client.get_string(os.path.join(d,"toplevel_id")) + break + + # we do not have a logout object or in a non-standard location, fail + if not logout: + error(_("No logout button found"), + _("The logout button can not be found or it is not in " + "the standard location. Please update the panel " + "configuration manually.")) + sys.exit(1) + + if not os.path.exists("/usr/lib/fast-user-switch-applet/fast-user-switch-applet"): + error(_("No fast-user-switching applet found"), + _("The fusa applet can not be found or it is not in " + "the standard location. Please update the panel " + "configuration manually.")) + sys.exit(1) + + # search for the fusa applet + applets = client.all_dirs("/apps/panel/applets") + for d in applets: + # move the fusa applet to new location + if (client.get_string(os.path.join(d,"bonobo_iid")) == "OAFIID:GNOME_FastUserSwitchApplet"): + client.set_int(os.path.join(d,"position"),0) + client.set_bool(os.path.join(d,"panel_right_stick"), True) + break + else: + # create a new one + applet_name = "applet_fusa_auto_migrated" + new_applet_name = os.path.join("/apps/panel/applets/",applet_name) + associate_schemas_in_dir(client, engine, new_applet_name, + "/schemas/apps/panel/objects") + client.set_string(os.path.join(new_applet_name, "bonobo_iid"), + "OAFIID:GNOME_FastUserSwitchApplet") + client.set_string(os.path.join(new_applet_name, "toplevel_id"), + logout_panel) + client.set_string(os.path.join(new_applet_name, "object_type"), + "bonobo-applet") + client.set_bool(os.path.join(new_applet_name, "panel_right_stick"), True) + l=client.get_list("/apps/panel/general/applet_id_list", gconf.VALUE_STRING) + l.append(applet_name) + client.set_list("/apps/panel/general/applet_id_list", gconf.VALUE_STRING, l) + + # remove the logout button (if its in the object_id_list) + l=client.get_list("/apps/panel/general/object_id_list", gconf.VALUE_STRING) + try: + l.remove(logout) + client.set_list("/apps/panel/general/object_id_list", gconf.VALUE_STRING, l) + except ValueError, e: + # print out message here so that it gets captured in .xsession-errors + sys.stderr.write("ignoring logout object '%s' (not in object_id_list: %s)" % (logout, e)) + + # show nice information + info(_("Configuration updated"), + _("Your panel configuration is updated. Please logout " + "to complete the update.")) + --- gnome-panel-2.27.92.orig/debian/watch +++ gnome-panel-2.27.92/debian/watch @@ -0,0 +1,3 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/([\d\.]+)[024678]/gnome-panel-(.*)\.tar\.gz \ + debian uupdate --- gnome-panel-2.27.92.orig/debian/gnome-panel-data.install +++ gnome-panel-2.27.92/debian/gnome-panel-data.install @@ -0,0 +1,14 @@ +debian/tmp/etc/gconf/ usr/share/ +debian/tmp/etc/dbus-1 +debian/tmp/usr/lib/bonobo +debian/tmp/usr/share/applications +debian/tmp/usr/share/dbus-1 +debian/tmp/usr/share/gnome-panelrc usr/share/gnome/ +debian/tmp/usr/share/gnome-panel +debian/tmp/usr/share/gnome +debian/tmp/usr/share/gnome-2.0 +debian/tmp/usr/share/icons +debian/tmp/usr/share/locale +debian/tmp/usr/share/omf +debian/tmp/usr/share/polkit-1 +debian/ubuntu-about.desktop usr/share/applications/ --- gnome-panel-2.27.92.orig/debian/libpanel-applet2-doc.doc-base +++ gnome-panel-2.27.92/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: 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.27.92.orig/debian/fusa-applet.note.in +++ gnome-panel-2.27.92/debian/fusa-applet.note.in @@ -0,0 +1,14 @@ +Terminal: False +Command: python /usr/share/gnome-panel/migrate-fusa-config.py +GettextDomain: gnome-panel +OnlyAdminUsers: False +DisplayIf: pgrep -U $(id -u) gnome-panel && (gconftool -R /apps/panel/objects|grep -q 'action_type = logout') +_ButtonText: Update +_Description: + There is now a combined status menu for + instant messaging status, switching user accounts, and + exiting Ubuntu. + . + This menu will replace the current Quit button. If you + click on the "Update" button below your Quit button + will be replaced with the new status menu. --- gnome-panel-2.27.92.orig/debian/control +++ gnome-panel-2.27.92/debian/control @@ -0,0 +1,130 @@ +Source: gnome-panel +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Guilherme de S. Pastore +Uploaders: Debian GNOME Maintainers +Standards-Version: 3.8.1 +Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-panel/ubuntu +Build-Depends: cdbs (>= 0.4.41), + debhelper (>= 5), + quilt, + intltool (>= 0.40.0), + gnome-pkg-tools (>= 0.14), + dpkg-dev (>= 1.13.19), + gnome-doc-utils, + libx11-dev, + libxau-dev, + libgtk2.0-dev (>= 2.15.1), + libgnomeui-dev (>= 2.16.0-2), + libgnome-desktop-dev (>= 2.26), + libgnome2-dev (>= 2.13.0), + libbonoboui2-dev (>= 2.1.1), + liborbit2-dev (>= 1:2.12.1), + libwnck-dev (>= 2.19.5), + libgconf2-dev (>= 2.6.1), + libecal1.2-dev (>= 1.6.0) [!hurd-i386], + libedataserverui1.2-dev (>= 1.11.2) [!hurd-i386], + libcairo2-dev (>= 1.0.0), + gtk-doc-tools (>= 1.0), + libgnome-menu-dev (>= 2.27.92), + libpango1.0-dev (>= 1.15.4), + libedataserver1.2-dev (>= 1.2.0), + libglib2.0-dev (>= 2.18.0), + evolution-data-server-dev [!hurd-i386], + libgweather-dev (>= 2.27.90), + librsvg2-dev, + libdbus-glib-1-dev (>= 0.71), + libdbus-1-dev (>= 1.1.2), + network-manager-dev (>= 0.6), + libnm-util-dev (>= 0.6), + libpolkit-gobject-1-dev (>= 0.91), + sharutils +Build-Depends-Indep: libglib2.0-dev, libgtk2.0-dev + +Package: gnome-panel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-panel-data (>= ${gnome:Version}), + gnome-panel-data (<< ${gnome:NextVersion}), + gnome-desktop-data (>= 2.10.0-1), + gnome-control-center (>= 1:2.8.2-3), + gnome-menus (>= 2.16.1), + gnome-about (>= 2.10.0-1) +Recommends: gnome-applets (>= 2.12.1-1), + gnome-session, + evolution-data-server, + gnome-icon-theme (>= 2.24), + alacarte, + gvfs, + indicator-applet +Suggests: yelp, + gnome2-user-guide, + gnome-terminal | x-terminal-emulator, + gnome-system-tools, + nautilus, + evolution, + epiphany-browser, + gnome-session (>= 2.23.6) | gdm, + menu-xdg (>= 0.2) +Description: launcher and docking facility for GNOME + The GNOME Panel is an essential part of the GNOME Desktop, providing + toolbar-like “panels” which can be attached to the sides of your desktop. + They are used to launch applications and embed a number of other + functions, such as quick launch icons, the clock, the notification area, + volume controls and the battery charge indicator, and utilities ranging + from weather forecast to system monitoring. + +Package: libpanel-applet2-0 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: library for GNOME Panel applets + This library is used by GNOME Panel applets. + +Package: gnome-panel-dbg +Section: debug +Priority: extra +Architecture: any +Depends: ${misc:Depends}, + gnome-panel (= ${binary:Version}), + libpanel-applet2-0 (= ${binary:Version}) +Description: GNOME Panel and library for panel applets - debugging symbols + This package contains debugging symbols for gnome-panel and the + libpanel-applet library. It is provided to help debugging problem in + the panel itself or in the library. The debugging symbols are installed + in /usr/lib/debug and will automatically be used by gdb. + +Package: libpanel-applet2-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libpanel-applet2-0 (= ${binary:Version}), + libgconf2-dev (>= 2.6.1), + libgtk2.0-dev (>= 2.13.1), + libgnomeui-dev (>= 2.5.4), + libbonoboui2-dev (>= 2.1.1) +Description: library for GNOME Panel applets - development files + This packages provides the include files and static library for the GNOME + Panel applet library functions. + +Package: libpanel-applet2-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: doc-base +Description: library for GNOME Panel applets - documentation files + This packages provides the documentation files for the GNOME Panel applet + library functions. + +Package: gnome-panel-data +Section: gnome +Architecture: all +Depends: ${misc:Depends}, + gconf2 (>= 2.14.0-2) +Recommends: gnome-panel +Description: common files for the GNOME Panel + This package includes some files that are needed by the GNOME Panel + (Pixmaps, .desktop files and internationalization files). --- gnome-panel-2.27.92.orig/debian/libpanel-applet2-0.install +++ gnome-panel-2.27.92/debian/libpanel-applet2-0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpanel-applet-2.so.* usr/lib/ --- gnome-panel-2.27.92.orig/debian/panel-test-applets.1 +++ gnome-panel-2.27.92/debian/panel-test-applets.1 @@ -0,0 +1,21 @@ +.TH "panel-test-applets" "1" +.SH "NAME" +panel-test-applets \(em display installed applets +.SH "SYNOPSIS" +.PP +\fBpanel-test-applets\fR [\fB\-\-help \fP] +.SH "DESCRIPTION" +.PP +\fBpanel-test-applets\fR display installed applets in a +dialog box and does nothing else. +.SH "OPTIONS" +.IP "\fB\-\-help\fP" 10 +Display help +.SH "SEE ALSO" +.PP +gnome-options(7) +.SH "AUTHOR" +.PP +This manual page was written by Christian Marillat marillat@debian.org for +the \fBDebian GNU/Linux\fP system (but may be used by others). +.\" created by instant / docbook-to-man, Sun 03 Dec 2006, 23:24 --- gnome-panel-2.27.92.orig/debian/application-default-icon.png.uue +++ gnome-panel-2.27.92/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.27.92.orig/debian/rules +++ gnome-panel-2.27.92/debian/rules @@ -0,0 +1,47 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk +#include /usr/share/gnome-pkg-tools/1/rules/patch-translations.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --disable-scrollkeeper \ + --with-in-process-applets=all \ + --disable-initial-animation +ifneq ($(DEB_BUILD_GNU_SYSTEM),gnu) + DEB_CONFIGURE_EXTRA_FLAGS += --enable-eds +endif + +DEB_DH_MAKESHLIBS_ARGS_libpanel-applet2-0 += -V"libpanel-applet2-0 (>= 2.26.0)" +DEB_DH_MAKESHLIBS_ARGS_gnome-panel += --no-act + +build/gnome-panel:: + intltool-merge -r po debian/fusa-applet.note.in debian/fusa-applet.note + +binary-install/gnome-panel:: + chmod a+x debian/gnome-panel/usr/lib/gnome-panel/* + cd po; intltool-update -p --verbose + +binary-install/gnome-panel-data:: + find debian/gnome-panel-data/usr/share -type f -exec chmod -R a-x {} \; + cd debian/gnome-panel-data/usr/share/gconf && \ + mkdir defaults && \ + mv schemas/panel-default-setup.entries \ + defaults/05_panel-default-setup.entries + 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:: + -rm -f debian/application-default-icon.png --- gnome-panel-2.27.92.orig/debian/libpanel-applet2-dev.install +++ gnome-panel-2.27.92/debian/libpanel-applet2-dev.install @@ -0,0 +1,6 @@ +debian/tmp/usr/include/ usr/ +debian/tmp/usr/lib/pkgconfig usr/lib/ +debian/tmp/usr/lib/libpanel-applet-2.a usr/lib/ +debian/tmp/usr/lib/libpanel-applet-2.la usr/lib/ +debian/tmp/usr/lib/libpanel-applet-2.so usr/lib/ +debian/tmp/usr/share/idl/ usr/share/ --- gnome-panel-2.27.92.orig/debian/changelog +++ gnome-panel-2.27.92/debian/changelog @@ -0,0 +1,2529 @@ +gnome-panel (1:2.27.92-0ubuntu4) karmic; urgency=low + + * debian/patches/01_layout.patch: + - don't list software-store (lp: #431882) + + -- Sebastien Bacher Fri, 18 Sep 2009 16:01:26 +0200 + +gnome-panel (1:2.27.92-0ubuntu3) karmic; urgency=low + + * debian/patches/04_default_panel_config.patch: + - don't set an evolution launcher on the default configuration since there + is one in the message indicator now + + -- Sebastien Bacher Tue, 15 Sep 2009 15:46:37 +0200 + +gnome-panel (1:2.27.92-0ubuntu2) karmic; urgency=low + + * debian/patches/01_layout.patch: + - cleaned and updated to list software-store when it's installed + (lp: #426209) + * patches/04_default_panel_config.patch: + - updated to not add a vertical bar next to the fusa applet + * debian/patches/27_handle_overlapping_monitors.patch, + debian/patches/28_prefer_lvds_monitor.patch: + - clean those changes which were commented and have been applied in the new + upstream version now + + -- Sebastien Bacher Thu, 10 Sep 2009 13:33:18 +0200 + +gnome-panel (1:2.27.92-0ubuntu1) karmic; urgency=low + + * New upstream version: + Panel + - Add shebang to gnome-panel-add script + - Use display name instead of name for menu items + This implies we now support the X-GNOME-FullName key. + - Make the desktop item editor not emit signals on startup + - Support X-GNOME-FullName in the desktop item editor + - Always show icons for categories in the applications menu + Clock Applet + - Update the time when the user clicks to open calendar + Wnck Applets + - Fix spin buttons not working in workspace switcher preferences + Misc + - Require gnome-menus 2.27.92 + - Ship the desktop.in files in tarball, not pre-build .desktop + * debian/control.in: + - updated gnome-menus requirement + * debian/patches/16_compiz_workspace_switcher.patch: + - updated spin adjustments in the workspace switcher to work correctly + (lp: #423493) + + -- Sebastien Bacher Wed, 09 Sep 2009 12:24:44 +0200 + +gnome-panel (1:2.27.91-0ubuntu2) karmic; urgency=low + + * debian/patches/25_dynamic_fusa_detection.patch: + - reactivate this change since fusa has been updated now + * debian/patches/70_relibtoolize.patch: updated + + -- Sebastien Bacher Tue, 01 Sep 2009 10:47:58 +0200 + +gnome-panel (1:2.27.91-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #418975) + Panel + - Drop dead code (Vincent) + - Don't show icons icons for actions and categories (William Jon + McCann, Matthias Clasen, Vincent) + - Remove use of GnomeEntry in run dialog (Diego Escalante Urrelo, + Vincent) + - Port to GtkBuilder (Vincent) + - Make the run button icon respect the desktop-wide setting (Vincent) + - Add gnome-panel-add script to allow easy addition of applets + (Vincent) + - Use g_timeout_add_seconds to reduce wakeups (Javier Jardón) + - Ignore overlapping monitors and just use the largest one (Federico + Mena Quintero) + - Put LVDS as first monitor (Federico Mena Quintero) + - Correctly set struts when two panels are right-oriented (Alexey + Rusakov) + - Use /desktop/gnome/lockdown/disable_lock_screen (Vincent) + - Use a different define for the size of the Applications menu icon + (Vincent) + - Clarify warning message at forced quit (Gabor Kelemen) + - Make sure to preload /apps/panel/general early enough (Behdad + Esfahbod) + - Remove empty labels from translation (Andre Klapper) + - Do not use non-existing monitors for toplevels (Vincent) + - Do not save monitor changes that are caused by constraints (Vincent) + - Use randr 1.3 features to detect the first monitor when possible + (Vincent) + - Use XRRGetScreenResourcesCurrent() when possible (Vincent) + - Improve check for LVDS-named output (Vincent) + - Remove deprecated Encoding key from desktop file (Frédéric Péters) + libpanel-applet + - Port to GtkBuilder (Diego Escalante Urrelo, Vincent) + All Applets + - Port to GtkBuilder (Vincent) + Clock Applet + - Change "Clock Options" label to "Clock Format" (Vincent) + - Launch the configured calendar/tasks application instead of evolution + (Alex Converse, Vincent) + - Port to PolicyKit 1 (Matthias Clasen) + - Make default PolicyKit configuration stricter (Vincent) + - Do not crash when setting time/timezone without PolicyKit (Matt Keenan) + - Do not use obsolete and unneeded daylight variable (Alexis Ballier) + - Fix confusion between GTime and time_t (Matthias Drochner) + - Add missing mnemonics and window title (Gabor Kelemen) + - Use g_timeout_add_seconds to reduce wakeups (Javier Jardón) + - Do not place on the map locations with lat = 0 and lon = 0 (Vincent) + - Make it possible to change the name of a location (Vincent) + - Add/improve translator comments (Vincent) + - Code cleanups (Vincent) + Notification Area Applet + - Allow more flexibility for NaTrayChild compositing (Owen Taylor) + - Use g_timeout_add_seconds to reduce wakeups (Javier Jardón) + Misc + - Add ACLOCAL_AMFLAGS (Sébastien Bacher) + - Use silent-rules instead of shave for quiet build (Vincent) + - Remove workaround for scrollkeeper (Vincent) + - Remove libglade dependency (Vincent) + - Require libgweather 2.27.90 (Vincent) + * debian/control.in: + - Drop build-depends on libglade2-dev + - Bump build-depends on libgweather-dev + * debian/patches/02_polkit1.patch: + * debian/patches/06_clock_permissions.patch: + * debian/patches/31_correct_aclocal_command.patch: + - Applied upstream + * debian/patches/01_layout.patch: + * debian/patches/08_clock_applet_event.patch: + * debian/patches/09_default_icons.patch: + * debian/patches/16_compiz_workspace_switcher.patch: + * debian/patches/17_about-ubuntu-translation.patch: + * debian/patches/30_disable-initial-animation.patch: + * debian/patches/70_relibtoolize.patch: + * debian/patches/85_disable_shutdown_on_ltsp.patch: + * debian/patches/99_ltmain_as-needed.patch: + - Updated + + -- Robert Ancell Wed, 26 Aug 2009 11:28:21 +1000 + +gnome-panel (1:2.27.4-0ubuntu6) karmic; urgency=low + + * debian/patches/86_signal_curtain.patch: + - new version by Cody Russell + + -- Sebastien Bacher Tue, 11 Aug 2009 19:20:19 +0200 + +gnome-panel (1:2.27.4-0ubuntu5) karmic; urgency=low + + * debian/patches/86_signal_curtain.patch: + - Signal the curtain when loaded + * debian/patches/02_polkit1.patch: + * debian/patches/09_default_icons.patch: + * debian/patches/18_lockdown_lock_editor.patch: + * debian/patches/30_disable-initial-animation.patch: + * debian/patches/85_disable_shutdown_on_ltsp.patch: + * debian/patches/99_ltmain_as-needed.patch: + - Refreshed + + -- Robert Ancell Wed, 05 Aug 2009 15:51:54 +0100 + +gnome-panel (1:2.27.4-0ubuntu3) karmic; urgency=low + + * debian/patches/04_default_panel_config.patch: + - don't add a mixer applet to the default configuration since gnome-media + has a notification area icon for that now (lp: #401294) + + -- Sebastien Bacher Wed, 22 Jul 2009 16:35:22 +0200 + +gnome-panel (1:2.27.4-0ubuntu2) karmic; urgency=low + + * debian/patches/04_default_panel_config.patch: + - don't add a mixer applet to the default installation + + -- Sebastien Bacher Wed, 22 Jul 2009 16:34:27 +0200 + +gnome-panel (1:2.27.4-0ubuntu1) karmic; urgency=low + + * New upstream version + * debian/patches/31_correct_aclocal_command.patch: + - use aclocal magic to fix build issue + * debian/patches/70_relibtoolize.patch: + - new version update + * debian/rules: + - don't use configure option to start time-admin since it's not used now + * debian/watch: + - watch unstable versions + + -- Sebastien Bacher Thu, 16 Jul 2009 15:06:23 +0200 + +gnome-panel (1:2.26.3-0ubuntu2) karmic; urgency=low + + * Add 02_polkit1.patch: Port to PolicyKit 1.0 API. + * debian/control.in: Drop libpolkit-gnome-dev and libpolkit-dbus-dev, add + libpolkit-gobject-1-dev build deps. Drop policykit-gnome dependency. + * 70_relibtoolize.patch: Regenerate to pick up changes from above. + * 06_clock_permissions.patch: Update to new PolicyKit configuration syntax. + * debian/gnome-panel-data.install: Update path for polkit-1 files. + + -- Martin Pitt Mon, 13 Jul 2009 14:51:37 +0200 + +gnome-panel (1:2.26.3-0ubuntu1) karmic; urgency=low + + * New upstream version + * debian/control.in: + - typo fix + * debian/patches/18_lockdown_lock_editor.patch: + - change to have lockdown locking the menu editor (lp: #4712, #385596) + * debian/patches/31_fix_crash_second_screen.patch: + - the change is in the new version + + -- Sebastien Bacher Fri, 10 Jul 2009 14:24:56 +0200 + +gnome-panel (1:2.26.2-1ubuntu4) karmic; urgency=low + + * debian/patches/31_fix_crash_second_screen.patch + - Add patch by Gerd Kohlberger to fix a crash when clicking + a launcher on a second screen. (LP: #256041) + + -- Andreas Moog Fri, 03 Jul 2009 17:30:57 +0200 + +gnome-panel (1:2.26.2-1ubuntu3) karmic; urgency=low + + * debian/patches/70_relibtoolize.patch: + - run automake update + + -- Sebastien Bacher Thu, 02 Jul 2009 15:26:55 +0200 + +gnome-panel (1:2.26.2-1ubuntu2) karmic; urgency=low + + * debian/patches/25_dynamic_fusa_detection.patch: + - comment this change for the new gdm since the fast user switch applet + needs to be updated to get system actions working + + -- Sebastien Bacher Thu, 02 Jul 2009 14:42:01 +0200 + +gnome-panel (1:2.26.2-1ubuntu1) karmic; urgency=low + + * Rebase on Debian unstable (LP: #388263): + - debian/add-indicator-applet.py, debian/indicator-applet.desktop: + + Add indicator applet to existing panel configs on upgrade. + - debian/application-default-icon.png.uue: + + Default icon for the menu entries. + - debian/control{.in}: + + Add Vcs-Bzr info. + + Build-depend on sharutils. + + gnome-panel suggests menu-xdg rather than depends on it. + + gnome-panel recommends indicator-applet. + - debian/fusa-applet.note.in, debian/migrate-fusa-config.py, + debian/patches/20_fusa_migration_note_i18n.patch: + + Show an update-notifer hook about the FUSA applet and + add a script that can do the config migration. + - debian/gnome-panel-data.install, debian/ubuntu-about.desktop{.in}: + + Install the "About Ubuntu" menu item. + - debian/gnome-panel-data.preinst: + + Clean conffiles which are not in the new version on upgrade. + - debian/gnome-panel.install: + + Install the files necessary to migrate existing panel configs + on upgrade, to add the FUSA and indicator applet. + - debian/gnome-panel.postinst: + + Show note for adding FUSA applet on upgrade. + + Add GConf defaults for directory fixup and indicator-applet + migration on upgrade. + - debian/gnome-panel.postrm: + - Remove GConf defaults on uninstall. + - debian/patches/01_layout.patch: + + Changes to the panel layout. + - debian/patches/04_default_panel_config.patch: + + Change to the default configuration. + - debian/patches/16_compiz_workspace_switcher.patch: + + Allow the workspace switcher to change the desktop layout + when using compiz. + - debian/patches/17_about-ubuntu-translation.patch: + + List ubuntu-about.desktop for translation. + - debian/patches/25_dynamic_fusa_detection.patch: + + Removes the shutdown, logout and lock screen items when the + FUSA applet is on the panel (LP: #335242). + - debian/patches/25_inode_directory_fixup.patch: + + Restore inode/directory association on upgrade from + Hardy (LP: #260492). + - debian/patches/30_disable-initial-animation.patch: + + Patch to add build-time flag to disable the initial slide-in animation. + - debian/patches/70_relibtoolize.patch: + + Updated for Ubuntu-specific changes. + - debian/patches/85_disable_shutdown_on_ltsp.patch: + + Suppress the shutdown option in the panel if LTSP_CLIENT + is set. (LP: #282669) + - Dropped Debian-specific patches: + + 01_panel_submenus.patch. + + 02_panel_logout.patch. + + 03_switch-user_lock.patch. + + 04_gnome-panel-logout.patch + - debian/rules: + + Don't call patch-translations.mk - none of the translations in + debian/po-up are applicable to Ubuntu. + + Disable the initial slide-in animation. + + Create debian/fusa-applet.note. + + Update translations template. + + Install the default menu icon. + * Closes LP: #327859 + + -- Chris Coulson Mon, 22 Jun 2009 22:26:26 +0100 + +gnome-panel (2.26.2-1) unstable; urgency=low + + * Require gnome-desktop 2.26. Closes: #526680. + * 02_panel_logout.patch: correctly check whether GDM allows shutdown + in case gnome-session 2.26 is not running. Closes: #526807. + * Remove scrollkeeper dependency. + * Add libglib2.0-doc and libgtk2.0-doc to b-d-i to ensure proper + xrefs. + * New upstream release. + + Removes the need for scrollkeeper, fixes FTBFS in experimental. + * Regenerate 70_relibtoolize.patch. + + -- Josselin Mouette Fri, 29 May 2009 11:40:28 +0200 + +gnome-panel (2.26.0-1) experimental; urgency=low + + * New upstream release. + * Bump build-deps on glib/gtk, drop scrollkeeper. + * Bump shlibs to 2.26.0. + * 02_panel_logout.patch: update for new version, using the patch from + Gentoo instead, which allows to support the new gnome-session with a + clean fallback to XSMP/GDM if it is not available. + * 04_gnome-panel-logout.patch: use the new API, so that we actually + talk to gnome-session if possible when invoking gnome-panel-logout. + * 05_clock_dbus.patch: dropped, merged upstream. + * Refresh other patches. + * 70_relibtoolize.patch: updated for the new version. + * Fix debugging package section. + * Update licensing information to match reality. + + -- Josselin Mouette Sun, 12 Apr 2009 12:34:28 +0200 + +gnome-panel (2.24.3-1) unstable; urgency=low + + [ Loic Minier ] + * Let gnome-panel suggest evolution and epiphany-browser as their launchers + are part of the default panel layout and gnome-session (>= 2.23.6) | gdm + as gnome-panel attempts to talk to them for shutdown. + + [ Josselin Mouette ] + * Standards version is 3.8.1. + * New upstream release. + * 70_relibtoolize.patch: updated for the new version. + * Don’t pass gksu to time-admin anymore. + * 05_clock_dbus.patch: new patch, stolen upstream. Fix the D-Bus + configuration so that the applet can actually talk to the helper. + * 06_clock_permissions.patch: new patch. Fix the security hole in the + PolicyKit configuration that otherwise allows everyone to modify the + system time. + * Recommend policykit-gnome. + + -- Josselin Mouette Tue, 07 Apr 2009 12:07:19 +0200 + +gnome-panel (2.24.2-3) experimental; urgency=low + + * Recommend gnome-icon-theme 2.24. + * Bump gnome-menus dependency to match the build-dependency. + * 02_panel_logout.patch: revert the logout code to the version + without the gnome-session 2.24 requirement. + * 03_switch-user_lock.patch, 04_gnome-panel-logout.patch: re-add the + two patches that we applied on top of this old code. Update the + latter to other code changes. + * 70_relibtoolize.patch: regenerated. + * Include patch-translations.mk; bump gnome-pkg-tools requirement to + 0.14. + * Use it to add translations for 02_panel_logout.patch. + + Add panel-logout.c to POTFILES.in so that it is translated. + * Add 72 translations from the gnome-panel 2.22 sources. + + -- Josselin Mouette Sun, 28 Dec 2008 03:39:24 +0100 + +gnome-panel (2.24.2-2) experimental; urgency=low + + * 10_requires_private.patch: removed, it breaks applets builds since + these dependencies are actually part of the expected API. + + -- Josselin Mouette Fri, 26 Dec 2008 21:49:46 +0100 + +gnome-panel (2.24.2-1) experimental; urgency=low + + [ Emilio Pozuelo Monfort ] + * debian/libpanel-applet2-doc.doc-base: fix section. + + [ Josselin Mouette ] + * Relax the build-dependency on scrollkeeper. + + [ Loic Minier ] + * Use lt-nl in version compare instead of testing for $2 in postinst. + + [ Josselin Mouette ] + * New upstream release. + + Opens evolution on the correct day. Closes: #366970. + * Update build-dependencies and -dev dependencies accordingly; enable + PolicyKit support. + * 02_switch-user_lock.patch, 03_gnome-panel-logout.patch: dropped, + obsolete. + * 08_clock_applet_event.patch: updated to apply cleanly. + * 10_appointment_colors.patch: dropped, merged upstream. + * 70_relibtoolize.patch: updated for the new version. + * 10_requires_private.patch: new patch; use Requires.private in + libpanel-applet. + * Recommend gvfs for g_app_info_launch_uris to work. + * Don’t build-depend on -1 revisions. + * Install PolicyKit files. + + -- Josselin Mouette Fri, 26 Dec 2008 17:52:36 +0100 + +gnome-panel (2.22.2-1) experimental; urgency=low + + [ Josselin Mouette ] + * Don’t install /etc/gconf, it is already in /usr/share/gconf. + * Require libedataserver1.2-dev 1.11.2. Closes: #485602. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch: + - Dropped, merged upstream. + + debian/patches/70_relibtoolize.patch: + - Updated for the new version. + * debian/control.in: + + Update Standards-Version to 3.8.0, no additional changes needed. + + -- Sebastian Dröge Wed, 25 Jun 2008 08:37:53 +0200 + +gnome-panel (2.22.1.3-2) experimental; urgency=low + + * debian/patches/10_appointment_colors.patch + - Added. Fixes appointment colors to be different in evolution and the + clock applet (gbz #503581) + + -- Sjoerd Simons Fri, 25 Apr 2008 14:52:44 +0200 + +gnome-panel (2.22.1.3-1) experimental; urgency=low + + [ Loic Minier ] + * Refresh patches 02_switch-user_lock, 03_gnome-panel-logout, + 60_caldav-clock-appointments and 99_ltmain_as-needed to apply cleanly. + * New patch, 90_dont-cleanup-calendard-backend-when-not-loaded, avoids + crashing when shutting down evolution forcefully as intlclock tries to + cleanup data from the calendar backend it didn't load; GNOME #378854. + + [ Sjoerd Simons ] + * New upstream release + * debian/patches/03_gnome-panel-logout.patch + debian/patches/09_default_icons.patch + debian/patches/70_relibtoolize.patch + debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch + - Refreshed to apply again + * debian/patches/60_caldav-clock-appointments: + - Removed. Merged upstream + - Refreshed + * debian/patches/80_from_bugzilla_use_correct_current_timezone.patch: + - Removed. Merged upstream + + [ Sebastian Dröge ] + * New upstream release: + + Fixes FTBFS with newer libgweather (Closes: #476668). + + debian/control.in: + - Require libgweather-dev (>= 2.22.1). + + -- Sebastian Dröge Sat, 19 Apr 2008 20:13:26 +0200 + +gnome-panel (2.22.0-1) experimental; urgency=low + + * New upstream stable release: + + Upload to experimental first because of intrusive changes. + + debian/control.in: + - Update build dependencies and dependencies. + + debian/patches/05_missing_includes.patch: + - Dropped, merged upstream. + + debian/patches/03_gnome-panel-logout.patch, + debian/patches/70_relibtoolize.patch: + - Updated for the new version. + + debian/gnome-panel-data.install: + - Update paths. + + debian/patches/08_clock_applet_event.patch: + - Show multi day events not only on the first day. Patch taken from + the Ubuntu package. + + debian/patches/09_default_icons.patch: + - Show an default icon for .desktop files that don't have one. Patch + taken from the Ubuntu package. + + debian/patches/80_from_bugzilla_use_correct_current_timezone.patch: + - Use the correct current timezone. Patch taken from the Ubuntu package. + + -- Sebastian Dröge Mon, 17 Mar 2008 13:14:39 +0100 + +gnome-panel (2.20.3-3) unstable; urgency=low + + * 03_gnome-panel-logout.patch: correctly call gtk_main_quit to avoid + leaking processes, d’uh. Closes: #466070. + + -- Josselin Mouette Sat, 16 Feb 2008 17:52:30 +0100 + +gnome-panel (2.20.3-2) unstable; urgency=low + + [ Loic Minier ] + * Update patch 60_caldav-clock-appointments to not use a colon for now, it + seems it's encoded in the URI in some way; closes: #454318, #462026, + #463780. + + -- Josselin Mouette Sat, 16 Feb 2008 03:03:36 +0100 + +gnome-panel (2.20.3-1) unstable; urgency=low + + [ Loic Minier ] + * New patch, 60_caldav-clock-appointments, allows display of caldav:// + calendars in clock applet; thanks Roland Mas; closes: #454318. + + [ Josselin Mouette ] + * Switch to quilt for patch handling; build-depend on quilt. + * Refresh patches to apply cleanly. + * 03_gnome-panel-logout.patch: new patch; build a gnome-panel-logout + binary that can be used to invoke the logout window from other + programs. + * 70_relibtoolize.patch: relibtoolize the whole. + * 99_ltmain_as-needed.patch: updated to match the changes. + + [ Sebastian Dröge ] + * New upstream release with translation updates only. + * 70_relibtoolize.patch: regenerated. + * Update Standards-Version to 3.7.3, no additional changes needed. + + -- Sebastian Dröge Sat, 12 Jan 2008 06:56:51 +0100 + +gnome-panel (2.20.2-2) unstable; urgency=low + + * debian/gnome-panel-data.postinst: + + Don't fail if removing a directory fails because it doesn't exist + (Closes: #453881). + + -- Sebastian Dröge Sun, 02 Dec 2007 11:51:41 +0100 + +gnome-panel (2.20.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * gnome-panel-data.post*: cleanup. + * Remove the menu methods and everything related. Closes: #447474. + * gnome-panel-data.postinst: remove these files upon upgrade, and + purge /var/lib/gnome/Debian as well. + + [ Sebastian Dröge ] + * New upstream bugfix release with translation updates. + + -- Sebastian Dröge Sat, 01 Dec 2007 18:24:51 +0100 + +gnome-panel (2.20.1-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Tue, 30 Oct 2007 15:25:18 +0100 + +gnome-panel (2.20.0.1-3) unstable; urgency=low + + * 02_switch-user_lock.patch: don't call gtk_window_get_screen on an + already destroyed object. + + -- Josselin Mouette Sat, 13 Oct 2007 00:13:54 +0200 + +gnome-panel (2.20.0.1-2) unstable; urgency=low + + * 02_switch-user_lock.patch: new patch; lock screen when switching + user. Closes: #433259 + * Don't run dh_makeshlibs for gnome-panel. + + -- Josselin Mouette Sun, 07 Oct 2007 04:16:59 +0200 + +gnome-panel (2.20.0.1-1) unstable; urgency=low + + [ Josselin Mouette ] + * gnome-panel recommends alacarte (closes: #437320, #437335). + + [ Sebastian Dröge ] + * New upstream release. + * Upload to unstable, drop check-dist include. + * debian/control.in: + + Add libglib2.0-dev (>= 2.13.0) dependency to the -dev package (taken + from Ubuntu). + + [ Loic Minier ] + * Drop the version in the scrollkeeper dependency. + + -- Loic Minier Sun, 23 Sep 2007 20:41:59 +0200 + +gnome-panel (2.19.5-1) experimental; urgency=low + + * New upstream release series; these are development releases, the API may + still change incompatibly; no API change in this release though. + - Target at experimental; include check-dist. + - Build-dep on libglib2.0-dev (>= 2.13.0), bump up build-dep and dep on + libgtk2.0-dev to >= 2.11.3, bump up libwnck-dev build-dep to >= 2.19.5. + - Build-dep on evolution-data-server-dev for evolution-data-server-1.2.pc + and on libx11-dev for x11.pc. + - Drop patch 02_custom-launcher-icon, fixed differently upstream. + - Drop patch 06_gksu_time_admin and pass --with-clock-time-utility="gksu + time-admin" to configure instead. + - Bump shlibs to >= 2.19.3 (from Ubuntu). + - Update install files and drop obsolete libpanel-applet2-dbg.install. + * Include CDBS' utils. + + -- Loic Minier Wed, 11 Jul 2007 15:06:37 +0200 + +gnome-panel (2.18.3-1) unstable; urgency=low + + * New upstream stable release; no API change; bug fixes and translations. + * Don't pass --dbg-package to dh_strip as we build-dep on a cdbs >= 0.4.37. + + -- Loic Minier Fri, 06 Jul 2007 22:34:43 +0200 + +gnome-panel (2.18.2-2) unstable; urgency=low + + [ Josselin Mouette ] + * 06_gksu_time_admin.patch: check that the command called by gksu + exists (closes: #427714). + * 99_ltmain_as-needed.patch: get --as-needed back to work. + + [ Guilherme de S. Pastore ] + * debian/control.in: revamp the package descriptions. + + -- Guilherme de S. Pastore Mon, 25 Jun 2007 23:00:00 -0300 + +gnome-panel (2.18.2-1) unstable; urgency=low + + * New upstream stable release; no API change. + * Misc cleanups; drop obsolete snippets in maintainer scripts. + + -- Loic Minier Mon, 28 May 2007 16:49:33 +0200 + +gnome-panel (2.18.1-2) unstable; urgency=low + + [ Loic Minier ] + * Fix duplicate build-dep on libgnome-menu-dev. + + [ Josselin Mouette ] + * Depend on gnome-icon-theme 2.18 (closes: #420553). + + [ Loic Minier ] + * Downgrade the gnome-icon-theme dependency to a Recommends; other icon + themes work fine with gnome-panel 2.18. + + [ Sebastian Dröge ] + * 01_panel_submenus.patch: Use correct menu file filenames to allow adding + submenus as menu to the panel (Closes: #422827). Thanks to Andreas Degert + for the patch. + + [ Sven Arvidsson ] + * New patch, 06_gksu_time_admin; use gksu to launch time-admin; from Ubuntu + (Closes: #412074) + + [ Josselin Mouette ] + * 02_custom-launcher-icon.patch: patch from Ubuntu to provide a + default icon for custom application launchers (closes: #422401). + + -- Josselin Mouette Sat, 19 May 2007 17:26:11 +0200 + +gnome-panel (2.18.1-1) unstable; urgency=low + + [ Riccardo Setti ] + * New upstream release; no API change. + - Added libpango1.0-dev as build-dep. + - Built with --with-in-process-applets=all. + - Dropped 01_default-setup_evolution.patch, new version of evolution + doesn't ship a versioned .desktop file. + - Dropped 02_menu_initial_size.patch, applied upstream. + + [ Loic Minier ] + * Add a libedataserver1.2-dev (>= 1.2.0) build-dep. + * New upstream stable release; no API change. + * Upload to unstable; drop check-dist include. + * Wrap build-deps and deps. + * Add a ${misc:Depends}. + * Only run update-gconf-defaults if it's available. + * Use http in copyright. + * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on + cdbs >= 0.4.41. + * Cleanups. + * Take advantage of the applets rename to stop shipping *.la files. + + -- Loic Minier Sun, 22 Apr 2007 18:43:41 +0200 + +gnome-panel (2.16.3-1) experimental; urgency=low + + [ Josselin Mouette ] + * Remove 04_menus_rename.patch. + * Build-depend on libgnome-menus-dev 2.16.1-1. + * 01_default-setup_evolution.patch: call evolution-2.8.desktop, as + evolution.desktop doesn't exist (closes: #404878). + * 02_menu_initial_size.patch: stolen from the SVN. Fix for the arrows + appearing in a menu when installing new applications. See Bugzilla + #331780. + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * New upstream release; no API change. + - Drop patch 10_panel-transparency-after-resolution-change, merged + upstream. + * Bump up libgnomeui-dev build-dep to >= 2.16.0-2 to make the package + autobuildable. + + -- Loic Minier Mon, 12 Mar 2007 11:42:00 +0100 + +gnome-panel (2.16.2-1) experimental; urgency=low + + * New upstream release. + * Require intltool 0.35.0. + * Update build-dependencies and -dev dependencies. + * Build-depend on gtk-doc-tools. + * Generate less strict shlibs for the library. + * Rename the -dbg package to gnome-panel-dbg and include all debugging + symbols in this package. + * Switch to debhelper mode 5, build-depend accordingly. + * Don't generate cdbs build-depends automatically, thanks. + * Use ${gnome:Version} and ${gnome:NextVersion}. + * Call clean-la.mk and gnome-version.mk. + * Require gnome-pkg-tools 0.7. + * Regenerate the Debian manpages to remove French iso-8859-1 text. + + -- Josselin Mouette Sun, 3 Dec 2006 23:25:17 +0100 + +gnome-panel (2.14.3-3) unstable; urgency=low + + * Sync with overrides: set libpanel-applet2-dbg's priority to extra. + * Fix upstream version computation to allow "-" in upstream versions. + * New patch, 10_panel-transparency-after-resolution-change, to fix wrong + geometry calculation of the root window after a resolution change which + broke gnome-panel transparency; taken from GNOME #353781; patch by + bugreports@nn7.de; thanks Soeren Sonnenburg. + + -- Loic Minier Fri, 24 Nov 2006 14:31:19 +0100 + +gnome-panel (2.14.3-2) unstable; urgency=low + + [ Josselin Mouette ] + * Move menu-xdg to a Depends: instead of a Recommends: + (closes: #322517). + Rationale: people who don't want the Debian menu can remove "menu" + and the "empty menu" bug has been fixed some time ago. + + [ Loic Minier ] + * Only update-gconf-defaults on removal, not on purge. (Closes: #387925) + * Cleanup postinst and postrm. + + -- Loic Minier Sun, 17 Sep 2006 21:11:15 +0200 + +gnome-panel (2.14.3-1) unstable; urgency=low + + * New upstream release; no API changes. + + -- Loic Minier Tue, 8 Aug 2006 11:05:53 +0200 + +gnome-panel (2.14.2-2) unstable; urgency=low + + * Install default entries properly (closes: #369858). + + rules: move the entries to /usr/share/gconf/defaults. + + control.in: depend on gconf2 2.14.0-2 instead of ${misc:Depends}. + + Call update-gconf-defaults in postinst and postrm. + + gnome-panel-data.postinst: recursively unset the entries in /etc. + From now on, the administrator will be able to use this place to + customize the default panel layout. + + -- Josselin Mouette Thu, 3 Aug 2006 00:01:42 +0200 + +gnome-panel (2.14.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * Remove the dependency on this broken gamin package, and remove fam + as well as gnome-menus now use gnome-vfs as a backend + (closes: #349835, #367094, #351093). + + [ Loic Minier ] + * Make gnome-panel Recommend evolution-data-server. (Closes: #372567) + * Drop the useless libnspr4-dev build-dep, thanks Steve Langasek. + [debian/control, debian/control.in] + * New upstream release. + - Bump up libgnomevfs2-dev build-dep to >= 2.14.2. + [debian/control, debian/control.in] + * Use ${binary:Version} instead of ${Source-Version}. + * Add ${misc:Depends}. + * Update watch file to track stable series. + + -- Loic Minier Sat, 24 Jun 2006 11:14:15 +0200 + +gnome-panel (2.14.1-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release. + + * debian/control.in, debian/control: + - updated e-mail address. + - updated Standards-Version to 3.7.2. + - updated build dependencies according to configure.in. + - changed build-dep on libnspr-dev to libnspr4-dev to use xulrunner. + + * debian/patches/06_sync_clear_documents.patch: + - dropped; libegg updated upstream. + + * debian/patches/99_reautogenization.patch: + - dropped; the gnome-panel maintainer runs a Debian derivative. + + [ Marco Cabizza ] + * debian/control.in: + - changed build-dep on deprecated libpng3-dev to libpng12-dev. + + [ Ross Burton ] + * Build-depend on libecal1.2-dev, not libedata-cal1.2-dev + + [ Josselin Mouette ] + * Make the package binNMU-safe. + - Build-depend on dpkg-dev 1.13.19. + - Use ${source:Version}. + * Remove a useless ${Source-Version}. + + -- Guilherme de S. Pastore Mon, 8 May 2006 15:54:43 -0300 + +gnome-panel (2.12.3-2) unstable; urgency=low + + * Simple rebuild to get rid of references to Xcursor.la and Xrender.la. + + -- Loic Minier Sun, 23 Apr 2006 21:31:36 +0200 + +gnome-panel (2.12.3-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * debian/control.in: + - General cleanups + - Added the alternative on x-terminal-emulator back, as gnome-panel + obeys the GNOME prefered applications settings. + + [ Loic Minier ] + * Depend on gamin | fam since gnome-vfs deps are not enough to ensure it's + there. (Closes: #353164) + [debian/control, debian/control.in] + + [ Sjoerd Simons ] + * New upstream release + * Let libpanel-applet2-dev depend on liborbit2-dev >= 2.12.4. It defines the + new ORBIT2_MAYBE_CONS macro the code generator uses. (Closes: #350883) + * debian/patches/99_reautogenization.patch + + Updated. + + -- Sjoerd Simons Mon, 20 Feb 2006 22:56:36 +0100 + +gnome-panel (2.12.2-3) unstable; urgency=low + + * Upload to unstable (Closes: #347881) + + [ Josselin Mouette ] + * Suggest gnome-terminal only, as x-terminal-emulator won't be used + (closes: #291058). + + -- Guilherme de S. Pastore Fri, 13 Jan 2006 13:40:37 -0200 + +gnome-panel (2.12.2-2) experimental; urgency=low + + * Build-depend on libedataserverui1.2-dev (>= 1.3.0), so control-center and + gnome-panel can't be build with conflicting e-d-s libraries. + + -- Sjoerd Simons Tue, 27 Dec 2005 19:54:59 +0100 + +gnome-panel (2.12.2-1) experimental; urgency=low + + * New upstream release + * debian/patches/02_panel-menu-items.c.patch: + - dropped; applied upstream + * Don't build on a separate directory, it breaks gnome-doc-utils + + -- Guilherme de S. Pastore Wed, 30 Nov 2005 14:30:20 -0200 + +gnome-panel (2.12.1-2) experimental; urgency=low + + * New maintainer + Thanks for all your work, Marc! + + * debian/patches/06_sync_clear_documents.patch: + - patch from upstream CVS to force update when Gamin/FAM + notification is not available (Closes: #319800, #330847) + + -- Guilherme de S. Pastore Fri, 11 Nov 2005 20:54:11 -0200 + +gnome-panel (2.12.1-1) experimental; urgency=low + + [ Gustavo Noronha Silva ] + * New upstream release + * debian/patches/01_defaults_add_notifarea.patch, + debian/patches/02_clockapplet_reload_timezone.patch, + debian/patches/03_libpanel-applet_X11_link_missing.patch + - removed, applied upstream or fixed otherwise + * debian/patches/02_panel-menu-items.c.patch: + - added, from Ubuntu's package packaging patch, which added it + from GNOME's bugzilla #315322 + * debian/patches/99_reautogenization.patch: + - updated with: + libtoolize -c -f --automake && aclocal-1.9 && autoheader && \ + automake-1.9 -acf && autoconf && rm -rf autom4te.cache + * debian/patches/04_menus_rename.patch: + - updated + * debian/rules: + - disable scrollkeeper on build, based on Ubuntu's change + * debian/watch: + - updated for 2.12 major + * debian/control.in: + - updated Build-Depends according to Ubuntu's package and on the + upstream package's configure.in pkgconfig stuff + + [ Guilherme de S. Pastore ] + * debian/control.in: + - moved menu-xdg from Suggests to Recommends (Closes: #315782) + + [ Loic Minier ] + * Clarify "Copyright" versus "License". + + -- Gustavo Noronha Silva Sat, 29 Oct 2005 19:54:10 -0200 + +gnome-panel (2.10.2-2) UNRELEASED; urgency=low + + * Menu transition, part 1 and 2: move from #!/usr/sbin/install-menu to + #!/usr/bin/install-menu. [debian/gnome-vfolder-user, + debian/gnome-panel-data.menu-method.experimental, + debian/gnome-panel-data.menu-method] + + -- Loic Minier Thu, 20 Oct 2005 16:33:49 +0200 + +gnome-panel (2.10.2-1) unstable; urgency=low + + * New upstream release + * Removed 06_fr_po_fix.patch now included upstream. + * Re-autogen-ized. + * Increased Standards-Version (no changes needed). + + -- Marc Dequènes (Duck) Tue, 28 Jun 2005 23:30:00 +0200 + +gnome-panel (2.10.1-5) unstable; urgency=medium + + * Don't overwrite DEB_CONFIGURE_SCRIPT_ENV completely. + * Remove most replaces and conflicts fields, they are unused now. + * gnome-panel only Recommends: gnome-session. + * gnome-panel-data only Recommends: gnome-panel (breaking a dependency + cycle). + + -- Josselin Mouette Sat, 25 Jun 2005 19:45:52 +0200 + +gnome-panel (2.10.1-4) unstable; urgency=low + + * Replaced Suggests on menu by menu-xdg (Closes: #313011). + * Added patch to fix missing includes from Dann Frazier (Closes: + #314692). + * Fix fr translation s/Environnement de bureau/Bureau/ (from GNOME + CVS) (Closes: #313351). + * Now building in 'debian/build/' directory (cleaner). + * Pass --as-needed to LDFLAGS to reduce dependencies if possible. + * Disabled evolution-data-server support on Hurd (thanks to Michael + Banck). + + -- Marc Dequènes (Duck) Sun, 19 Jun 2005 11:51:40 +0200 + +gnome-panel (2.10.1-3) unstable; urgency=low + + * Upload to unstable (Closes: #312609). + * Added patch to solve menu files conflicts with other desktop + environnements (Closes: #307098) (thanks to seb128). + * Removed clean rule hack to work around #299010. + + -- Marc Dequènes (Duck) Tue, 7 Jun 2005 23:44:00 +0200 + +gnome-panel (2.10.1-2) experimental; urgency=low + + * Some more build-depends, depends, and suggests update (gnome-about + and new gnome-menus are now dependencies). + * Fixed in 2.10 branch : + + drawer does not open at the right place on dual-screen display + (Closes: #260480). + + click repeat rate in calendar view for clock applet is too fast + (Closes: #272885). + + panel won't scale some SVGs properly (Closes: #275215). + + translation error in pt-BR (Closes: #293656). + * Removed 'gnome-panel-screenshot' man page (command moved to gnome- + utils). + * Fixed stupid cut-and-paste mistake in 'debian/copyright'. + + -- Marc Dequènes (Duck) Sun, 17 Apr 2005 02:25:16 +0200 + +gnome-panel (2.10.1-1) experimental; urgency=low + + * New upstream release + * Removed the following patches now included upstream : + + 03_french_typo.patch + + 06_translation_silliness.patch + + 08_improved_run_in_term_speed.patch + * Mass build-depends and depends update. + * Patched libpanel-applet to correctly link with X11. + * Re-autogen-ized. + * Removed '/usr/share/gnome-panel' not used anymore in 'debian/gnome- + panel-data.install'. + * Updated 'debian/watch'. + + -- Marc Dequènes (Duck) Sun, 10 Apr 2005 21:06:35 +0200 + +gnome-panel (2.8.3-1) unstable; urgency=medium + + * Marc Dequènes: + + Rebuilt with fixed libgnomeui without non-free howl stuff + (Closes: #298887) (thus urgency). + + Used revised timezone patch for clock applet made by Stephen Gildea + (Closes: #294591). + + Made load of gconf config quiet (Closes: #293204). + + Readded 'userprefix' in menu-method as it broke 'favorites://' in + nautilus (Closes: #295091). + + Added a menu-method to produce a customisable Debian menu made by + Bill Allombert (not activated by default, see README.Debian) + (Closes: #259400). + * Sjoerd Simons: + + New upstream release + + debian/patches/07_empty_desktop_keys.patch + - Removed. Merged upstream. + + -- Marc Dequènes (Duck) Sun, 13 Mar 2005 11:01:55 +0100 + +gnome-panel (2.8.2-2) unstable; urgency=medium + + * urgency high because menu bug is very bad for sarge, and custom + lauchers are an important feature which is unfortunatly broken. + * menu : (thanks to Bill Allombert) + + updated suggests and added conflicts for nice woody transition + (Closes: #291085). + + removed unuseful 'userprefix' in menu-method. + * Added patches : + + custom lauchers fix from Sjoerd Simons (Closes: #291185). + + run-application typing completion speed improvements (from + gnomezilla) (Closes: #287120). + * Corrected doc-base index location (Closes: #285650). + * Corrected descriptions to please lintian. + + -- Marc Dequènes (Duck) Fri, 28 Jan 2005 23:58:50 +0100 + +gnome-panel (2.8.2-1) unstable; urgency=low + + * New upstream release : + + no longer respond to delete event (Closes: #254972). + * CDBS Tweaks. + * Regenerated '05_clockapplet_reload_timezone.patch'. + * Regenerated relibtoolize patch. + * Updated policy to 3.6.1.1 (no changes needed). + * Patched or and uk translations : some translators should _really_ + learn how to read english. + + -- Marc Dequènes (Duck) Fri, 10 Dec 2004 02:31:05 +0100 + +gnome-panel (2.8.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastien Bacher Fri, 19 Nov 2004 13:14:18 +0100 + +gnome-panel (2.8.1-1) experimental; urgency=low + + * New upstream release. + * Removed '03_define_types.patch' not necessary anymore. + * Regenerated relibtoolize patch. + * Reintroduced '04_french_typo.patch' removed by mistake. + + -- Marc Dequènes (Duck) Thu, 14 Oct 2004 01:28:31 +0200 + +gnome-panel (2.8.0.1-1) experimental; urgency=low + + * New upstream release : + + clock applet : fixed padding on a 24px panel (Closes: #258323). + + fix panel orientation badly set/remembered (Closes: #216997). + + fix freakiness with autohiding and snap-to-screen-edge + (Closes: #255608). + * [JHM] Added devhelp doc symlink (Closes: #273491) + * Dropped '04_french_typo.patch' now included upstream. + + -- Marc Dequènes (Duck) Sun, 3 Oct 2004 15:09:48 +0200 + +gnome-panel (2.8.0-2) experimental; urgency=low + + * Version 2.8.0 corrects : + + run in terminal works again (Closes: #262487). + + custom launcher command browser was lacking navigation entries + (Closes: #254443). + * Enabled evolution-data-server support (Closes: #272061). + * Updated versions in 'debian/control'. + + -- Marc Dequènes (Duck) Wed, 22 Sep 2004 00:50:02 +0200 + +gnome-panel (2.8.0-1) experimental; urgency=low + + * New upstream release. + * Updated watch file. + * Regenerated relibtoolize patch. + * Made build idempotent (typo patch for 'po/fr.po' was causing + problems) + * Added 'autotools-dev' to build dependencies to take advantage of the + CDBS automatic 'config.*' management. + + -- Marc Dequènes (Duck) Tue, 14 Sep 2004 21:16:42 +0200 + +gnome-panel (2.7.92-1) experimental; urgency=low + + * New upstream release : + + correct pointer detection problem on multiscreen causing several + problems like autihiding not always working (Closes: #178710) + + new add applet dialog (Closes: #247982) (bug obsoleted) + * NOTICE : panel settings dialog was removed upstream, use gconf + editor instead. + * Build-Depends/Depends versions update (Closes: #261327). + * Ported changes from 2.6.2-2 & 2.6.2-3. + * Removed 03_po_gu_fix.patch now included upstream. + * Patch added to correct a typo in french translation (Closes: + #268618). + * Corrected quoting problem in description (Closes: #244071). + * Patch from gnomezilla to reload timezone in clock applet (Closes: + #61611). + * Regenerated relibtoolize patch. + + -- Marc Dequènes (Duck) Sun, 12 Sep 2004 17:57:49 +0200 + +gnome-panel (2.7.91.1-1) experimental; urgency=low + + * New upstream development release. + * [debian/control.in] Bumped libwnck build dependency as per configure.in. + * [debian/patches/02_relibtoolise.patch] Regenerated. + * [debian/gnome-panel-data.install] Removed + debian/tmp/usr/share/control-center-2.0 . + * [debian/rules] Ensure at build time that all symbols are resolvable; make + the linker work a bit harder to speed up dynamic loading. + + -- J.H.M. Dassen (Ray) Sat, 21 Aug 2004 13:22:47 +0200 + +gnome-panel (2.7.4.1-1) experimental; urgency=low + + * New upstream release : + + updated translations (Closes: #247982, #247984). + * Regenerated relibtoolize patch. + + -- Marc Dequènes (Duck) Wed, 21 Jul 2004 18:24:00 +0200 + +gnome-panel (2.7.3-1) experimental; urgency=low + + * New upstream release + * Regenerated relibtoolize patch. + + -- Marc Dequènes (Duck) Tue, 6 Jul 2004 14:38:10 +0200 + +gnome-panel (2.7.1-1) experimental; urgency=low + + * New upstream release + + -- Marc Dequènes (Duck) Thu, 24 Jun 2004 20:30:55 +0200 + +gnome-panel (2.6.2-1) unstable; urgency=low + + * New upstream release. + * Updated some Build-Depends versions. + * Regenerated '02_relibtoolise.patch'. + + -- Marc Dequènes (Duck) Sat, 19 Jun 2004 11:14:06 +0200 + +gnome-panel (2.6.1-4) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable. + * debian/control.in: + + Don't Build-Depends on evolution-data-server since this package is + not in unstable + + -- Sebastien Bacher Wed, 26 May 2004 16:38:41 +0200 + +gnome-panel (2.6.1-3) experimental; urgency=low + + * GNOME Team Upload. + * Rebuilt with new evolution-data-server (Closes: #250807). + + -- Sebastien Bacher Tue, 25 May 2004 19:38:22 +0200 + +gnome-panel (2.6.1-2) experimental; urgency=low + + * Added missing Build-Depends on 'libxmu-dev' (Closes: #247285). + + -- Marc Dequènes (Duck) Thu, 20 May 2004 18:39:24 +0200 + +gnome-panel (2.6.1-1) experimental; urgency=low + + * New upstream release : + - fixed visibility problem with solid-color background + (Closes: #179871). + * Recreated and split relibtoolize patch. + * Improved tight versioning rules. + * Deactivated gtk-doc documentation regeneration (see GNOME Policy on + Alioth for details). + * Removing all remaining 'Makefile' files in clean rule. + + -- Marc Dequènes (Duck) Wed, 21 Apr 2004 02:47:43 +0200 + +gnome-panel (2.6.0-5) experimental; urgency=low + + * Gustavo Noronha Silva: + - debian/gnome-panel-data.postinst: + + add a call to gconftool-2 to --load the .entries file which + contains the default panel configuration + + -- Gustavo Noronha Silva Thu, 15 Apr 2004 22:14:40 -0300 + +gnome-panel (2.6.0-4) experimental; urgency=low + + * Added missing Replaces for 'libpanel-applet2-dev' on 'gnome-panel- + data' for 2.4->2.6 transition. + * J.H.M. Dassen (Ray): + - [debian/patches/01_relibtoolise.patch] New. Cut down direct + dependencies. + * Jordi Mallach: + - debian/control.in: build-depend on an epoched libglade2-dev. + - debian/rules: don't let clean fail if find returns error. + + -- Marc Dequènes (Duck) Fri, 9 Apr 2004 04:02:26 +0200 + +gnome-panel (2.6.0-3) experimental; urgency=low + + * Rebuilt to use 'evolution-data-server'. + + -- Marc Dequènes (Duck) Mon, 29 Mar 2004 23:56:27 +0200 + +gnome-panel (2.6.0-2) experimental; urgency=low + + * Corrected 'gnome-applet' tight dependency on 'libpanel-applet2-0'. + * Corrected missing Build-Depends on 'cdbs'. + * Updated Depends & Recommends. + + -- Marc Dequènes (Duck) Sun, 28 Mar 2004 23:29:52 +0200 + +gnome-panel (2.6.0-1) experimental; urgency=low + + * New Maintainer (Closes: 238884). + * New upstream release: + + fix X resource leak (Closes: #235903). + + fix auto-open behaviour for drawers (Closes: #216577). + * Switched to CDBS. + * Updated Uploaders and using the 'gnome-pkg-tools' pkg. + * Added some Replaces/Conflicts for smoother upgrade. + * Compatibility level switched to 4, and old patches were deactivated. + * Cleaned dirty 'debian/*' made by CM, now using simple and clean CDBS + rules and '*.install' files. + * Improved 'debian/copyright'. + * Removed now unused 'go.uue' to genrate 'go.png'. + * 'debian/control', 'debian/changelog' and 'debian/copyright' are now + UTF-8 encoded. + + -- Marc Dequènes (Duck) Sun, 28 Mar 2004 23:21:32 +0200 + +gnome-panel (2.4.2-4) unstable; urgency=low + + * the right + + -- Christian Marillat Fri, 19 Mar 2004 15:39:39 +0100 + +gnome-panel (2.4.2-3) unstable; urgency=low + + * Remove DTD hack and update scrollkeeper dependency to 0.3.14-5 + * Add outputencoding="UTF-8" in menu-method file (Closes: #230804) + + -- Christian Marillat Sun, 8 Feb 2004 11:09:26 +0100 + +gnome-panel (2.4.2-2) unstable; urgency=low + + * Suggests gnome-system-tools for gnome-panel, needed if you want to set + up the system time (Closes: #229043) + + -- Christian Marillat Fri, 23 Jan 2004 11:52:49 +0100 + +gnome-panel (2.4.2-1) unstable; urgency=low + + * New upstream release. + * Remove 05_manpage patch, included by upstream + + -- Christian Marillat Fri, 16 Jan 2004 10:22:17 +0100 + +gnome-panel (2.4.1-7) unstable; urgency=low + + * debian/prerm Unregister schemas file from the database. + + -- Christian Marillat Fri, 9 Jan 2004 15:48:01 +0100 + +gnome-panel (2.4.1-6) unstable; urgency=low + + * Add a version (>= 2.4.0) to the gnome-applets recommends (Closes: #223550) + + -- Christian Marillat Wed, 31 Dec 2003 09:21:18 +0100 + +gnome-panel (2.4.1-5) unstable; urgency=low + + * Add a -dbg package for libpanel-applet2 library (Closes: #220734) + * Add missing manpages. + + -- Christian Marillat Sun, 7 Dec 2003 11:05:31 +0100 + +gnome-panel (2.4.1-4) unstable; urgency=low + + * Panel should conflicts with metacity <= 2.6.0 (Closes: #217122) + * Patch from bugzilla to fix duplicate entries in the help message (Closes: #183130) + * debian/control update build-dependecies to GNOME 2.4 packages (Closes: #217497) + + -- Christian Marillat Sat, 25 Oct 2003 09:54:07 +0200 + +gnome-panel (2.4.1-3) unstable; urgency=low + + * Register default panel configuration with gconftool (Closes: #216600) + + -- Christian Marillat Mon, 20 Oct 2003 01:19:20 +0200 + +gnome-panel (2.4.1-2) unstable; urgency=low + + * gnome-panel-data should replaces gnome-desktop-data (Closes: #216458) + * Rebuild to remove liblinc dependency in the -dev package + + -- Christian Marillat Sun, 19 Oct 2003 10:01:36 +0200 + +gnome-panel (2.4.1-1) unstable; urgency=low + + * New upstream release. + * Should suggest a terminal emulator for the run program dialog (Closes: #214650) + * Don't need to depends on xbase-clients + + -- Christian Marillat Sat, 18 Oct 2003 10:36:24 +0200 + +gnome-panel (2.2.2.2-2) unstable; urgency=low + + * Change userprefix in menu-method. You can access user generated Debian + menus with favorites:/// in nautilus + * Use theme folder icons for Debian menus (Closes: #207494) + * New patch to fix manpage entry for gnome-panel (Closes: #212037) + + -- Christian Marillat Sun, 21 Sep 2003 23:33:11 +0200 + +gnome-panel (2.2.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 15 Jul 2003 15:28:51 +0200 + +gnome-panel (2.2.2.1-2) unstable; urgency=low + + * Patch 04_drawer.c to fix a panel crash when a new drawer is added + (Closes: #198695) + + -- Christian Marillat Sat, 28 Jun 2003 14:35:49 +0200 + +gnome-panel (2.2.2.1-1) unstable; urgency=low + + * New upstream release + * Add a gnome-control-center (>= 2.2.2) dependency (Closes: #198371) + * New patch (01) to fix broken translation in bn.po (Closes: #193635) + + -- Christian Marillat Sun, 22 Jun 2003 15:44:58 +0200 + +gnome-panel (2.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 16 May 2003 17:45:28 +0200 + +gnome-panel (2.2.1-2) unstable; urgency=low + + * Only add longtitle as tooltip in Debian menu (Closes: #186697) + * Update section + * Add go icon + + -- Christian Marillat Sun, 13 Apr 2003 08:29:10 +0200 + +gnome-panel (2.2.1-1.1) unstable; urgency=low + + * zero source change NMU to resolve problems on ia64 that binary NMU caused + + -- Bdale Garbee Fri, 11 Apr 2003 02:13:24 -0600 + +gnome-panel (2.2.1-1) unstable; urgency=low + + * New upstream release. + * Remove notification applet patch + + -- Christian Marillat Tue, 11 Mar 2003 15:51:00 +0100 + +gnome-panel (2.2.0.1-2) unstable; urgency=low + + * Patch to fix the notification applet crash (Closes: #180133) + + -- Christian Marillat Mon, 17 Feb 2003 16:04:23 +0100 + +gnome-panel (2.2.0.1-1) unstable; urgency=low + + * New upstream release. + * Remove replaces libpanel-applet-dev in the -dev package. + + -- Christian Marillat Tue, 4 Feb 2003 14:36:28 +0100 + +gnome-panel (2.2.0-2) unstable; urgency=low + + * Conflicts with system-tray-applet (Closes: #178278) + * Add versioned conflicts for gnome-core (Closes: #178401) + + -- Christian Marillat Sat, 25 Jan 2003 23:52:18 +0100 + +gnome-panel (2.2.0-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 21 Jan 2003 15:33:47 +0100 + +gnome-panel (2.1.90.1-1) unstable; urgency=low + + * New upstream release. + * Add a quick-lounge-applet (<= 0.98-1) conflicts, this applet crash the panel. + * Launcher are restored properly (Closes: #172385) + * Menu panel doesn't disappears (Closes: #172848) + * Fixes panel hogging the CPU when hide_delay and show_delay are zero (Closes: #174002) + * Fix inbox monitor randomly displays wildly inaccurate info (Closes: #168877) + * debian/control Add yelp and gnome2-user-guide in Suggests for the panel + + -- Christian Marillat Sat, 18 Jan 2003 17:12:02 +0100 + +gnome-panel (2.0.11-3) unstable; urgency=low + + * Bump Standards-Version to 3.5.8 + + -- Christian Marillat Sat, 28 Dec 2002 17:55:58 +0100 + +gnome-panel (2.0.11-2) unstable; urgency=low + + * Move libpanel documentation in a -doc package (Closes: #171007) + + -- Christian Marillat Fri, 20 Dec 2002 16:18:00 +0100 + +gnome-panel (2.0.11-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 15 Nov 2002 14:40:58 +0100 + +gnome-panel (2.0.10-2) unstable; urgency=low + + * Upload to unstable + * Gnome-hints has been removed (Closes: #152335) + * Fix in clock update (Closes: #156401) + * Applets save their properties (Closes: #135569) + * No more buttons in the tasklist applet (Closes: #116205) + * Docklet has been removed (Closes: #137450) + * Launcher properties are now saved (Closes: #139827) + * Now menus are always sorted (Closes: #150649) + * kmail doesn't crash the panel (Closes: #146706) + * The tasklist isn't dynamic resizable (Closes: #89752) + * No more problem with windowmaker and the panel (Closes: #94592) + * No more duplicate entrie in the main menu (Closes: #97473) + * No more memory leak in the tasklist applet (Closes: #103880) + * Tasklist doen't display app titles (Closes: #112059) + * Netscape entry menu is fixed (Closes: #135992) + * No more "Fill window thumbnails" option in tasklist (Closes: #151134) + * Tooltips in the arrows panel are correctly displayed (Closes: #113642) + * Completion in run dialog work with ctrl-TAB (Closes: #75665) + * gmenu has been removed (Closes: #95014) + * menu have a mozilla entry (if mozilla is present) (Closes: #135993) + * Xemacs.desktop has been removed (Closes: #148500) + + -- Christian Marillat Mon, 28 Oct 2002 16:08:15 +0100 + +gnome-panel (2.0.10-1) experimental; urgency=low + + * New upstream release. + * gnome-panel should depends on xbase-clients for xrdb + * Add build-dependency for xbase-clients + + -- Christian Marillat Mon, 14 Oct 2002 16:47:55 +0200 + +gnome-panel (2.0.9-4) experimental; urgency=low + + * Upload with original tarball + + -- Christian Marillat Sun, 29 Sep 2002 17:45:08 +0200 + +gnome-panel2 (2.0.9-3) experimental; urgency=low + + * Upload without the 2 suffix + + -- Christian Marillat Sat, 28 Sep 2002 18:46:17 +0200 + +gnome-panel2 (2.0.9-2) experimental; urgency=low + + * Add libmpg3-dev in build-depends (Closes: #160758) + * Update to standards version 3.5.7 + * -dev package should depends on the same lib version + + -- Christian Marillat Mon, 16 Sep 2002 11:35:00 +0200 + +gnome-panel2 (2.0.9-1) experimental; urgency=low + + * New upstream release. + * Update lignome-ui-dev dependencies to 2.0.5-2 + + -- Christian Marillat Fri, 6 Sep 2002 13:50:51 +0200 + +gnome-panel2 (2.0.8-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 5 Sep 2002 19:00:46 +0200 + +gnome-panel2 (2.0.7-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 27 Aug 2002 11:19:52 +0200 + +gnome-panel2 (2.0.6-2) experimental; urgency=low + + * Add scrollkeeper in build-depends + * Build against the latest libgnomevfs2-dev 2.0.2-4 + + -- Christian Marillat Fri, 16 Aug 2002 17:36:42 +0200 + +gnome-panel2 (2.0.6-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 12 Aug 2002 19:44:49 +0200 + +gnome-panel2 (2.0.5-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 8 Aug 2002 16:46:21 +0200 + +gnome-panel2 (2.0.4-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 5 Aug 2002 19:35:26 +0200 + +gnome-panel2 (2.0.3-2) experimental; urgency=low + + * Recompiled against the latest lignome-vfs to remove libssl dependency. + + -- Christian Marillat Fri, 2 Aug 2002 17:14:51 +0200 + +gnome-panel2 (2.0.3-1) experimental; urgency=low + + * New upstream release. + * Remove gmenu entry in menu file (Closes: #153213) + * debian/menu s/panel/gnome-panel/ + + -- Christian Marillat Tue, 30 Jul 2002 17:08:21 +0200 + +gnome-panel2 (2.0.2-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 15 Jul 2002 15:31:05 +0200 + +gnome-panel2 (2.0.1-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 17 Jun 2002 16:07:40 +0200 + +gnome-panel2 (2.0.0-1) experimental; urgency=low + + * New upstream release. + * Replace "Distribution menu" by "Debian menu" + + -- Christian Marillat Mon, 10 Jun 2002 16:51:50 +0200 + +gnome-panel2 (1.5.24-2) experimental; urgency=low + + * Build against the latest libraries. + + -- Christian Marillat Sun, 9 Jun 2002 18:29:23 +0200 + +gnome-panel2 (1.5.24-1) experimental; urgency=low + + * New upstream release. + * Remove call to Internet DTD (Closes: #148899) + * Call scrollkeeper-update in gnome-panel-data2.postrm + + -- Christian Marillat Tue, 4 Jun 2002 17:22:35 +0200 + +gnome-panel2 (1.5.23-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 28 May 2002 15:51:18 +0200 + +gnome-panel2 (1.5.22-2) experimental; urgency=low + + * debian/rules Add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 in install target. + * gnome-panel2 should depends on gnome-desktop-data + * debian/gnome-panel-data2.postinst check if schemas files are present + before calling gconftool-2 + + -- Christian Marillat Mon, 27 May 2002 16:01:57 +0200 + +gnome-panel2 (1.5.22-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 20 May 2002 21:58:18 +0200 + +gnome-panel2 (1.5.21-1) experimental; urgency=low + + * New upstream release. + * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and + DEB_BUILD_OPTIONS + + -- Christian Marillat Wed, 15 May 2002 20:39:24 +0200 + +gnome-panel2 (1.5.20-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 12 May 2002 14:25:08 +0200 + +gnome-panel2 (1.5.19-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 29 Apr 2002 20:51:20 +0200 + +gnome-panel2 (1.5.18-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 22 Apr 2002 16:41:41 +0200 + +gnome-panel2 (1.5.17-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 17 Apr 2002 15:46:23 +0200 + +gnome-panel2 (1.5.16-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 1 Apr 2002 22:40:37 +0200 + +gnome-panel2 (1.5.15-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 29 Mar 2002 17:01:04 +0100 + +gnome-panel2 (1.5.12-2) experimental; urgency=low + + * Add libwnck-dev in build-depends (Closes: #137954) + + -- Christian Marillat Wed, 13 Mar 2002 10:51:00 +0100 + +gnome-panel2 (1.5.12-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 5 Mar 2002 14:47:36 +0100 + +gnome-panel2 (1.5.11-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 26 Feb 2002 15:37:43 +0100 + +gnome-panel2 (1.5.10-2) experimental; urgency=low + + * Replace gettext by intltoo in build-depends + + -- Christian Marillat Mon, 25 Feb 2002 15:40:43 +0100 + +gnome-panel2 (1.5.10-1) experimental; urgency=low + + * new upstream release. + + -- Christian Marillat Mon, 18 Feb 2002 22:06:48 +0100 + +gnome-panel2 (1.5.9-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 15 Feb 2002 00:38:51 +0100 + +gnome-panel2 (1.5.7-1) experimental; urgency=low + + * New upstrema release. + + -- Christian Marillat Tue, 5 Feb 2002 14:41:01 +0100 + +gnome-core2 (1.5.4-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 20 Jan 2002 16:21:40 +0100 + +gnome-core (1.4.0.4-16) unstable; urgency=low + + * Fix typo in gnome-terminal.wrapper (Closes: #127768) + * Remove gnome-hint patche (Closes: #121390, #129184) + * debian/control Replace libpng-dev by libpng2-dev in Build-Depends + (Closes: #128377) + + -- Christian Marillat Mon, 14 Jan 2002 15:04:52 +0100 + +gnome-core (1.4.0.4-15) unstable; urgency=low + + * Build against the latest gnome-libs to update the libzvt2 dependency + (Closes: #127309, #127271) + * debian/control Replace libpng2-dev by libpng-dev in Build-Depends. + * debian/control Build-depends on libzvt-dev (>= 1.4.1.2-9) + + -- Christian Marillat Tue, 1 Jan 2002 15:27:43 +0100 + +gnome-core (1.4.0.4-14) unstable; urgency=low + + * Fix typo in gnome-terminal.1 (Closes: #123073) + * Fix base page for doc-base in libpanel-applet-dev package. + * Fix typo in gnome-help documentation (Closes: #126566) + * Apply patch to allows meta functionnality in gnome-terminal (Closes: #50427) + + -- Christian Marillat Thu, 27 Dec 2001 14:47:36 +0100 + +gnome-core (1.4.0.4-13) unstable; urgency=low + + * Default font for gnome-terminal is "fixed" only (Closes: #117126) + * Patch against gnome-hint.c Don't use gettext for font descriptor + (Closes: #116606) + * Patch against gnome-about/Makefile.am to use new gdk_pixbuf include path + (Closes: #120312) + * Revert my change on logout.c Only root can shutdown/reboot from the + panel (Closes: #119316, #120127) + + -- Christian Marillat Tue, 20 Nov 2001 11:36:05 +0100 + +gnome-core (1.4.0.4-12) unstable; urgency=low + + * gnome-wm honour --default-wm (Closes: #115668) + * Build against the latest gnome-libs + + -- Christian Marillat Sun, 21 Oct 2001 14:11:19 +0200 + +gnome-core (1.4.0.4-11) unstable; urgency=low + + * debian/control lynx comeback in Recommends (Closes: #114142) + * debian/control replaces xml-i18n-tools by intltool (Closes: #115024) + * Fix automake 1.5 errors. Thanks to Denis Barbier (Closes: #114369) + * Build against the latest orbit (Closes: #115309) + + -- Christian Marillat Fri, 12 Oct 2001 10:46:49 +0200 + +gnome-core (1.4.0.4-10) unstable; urgency=low + + * Fix typo in panel/panel.hints (Closes: #113590) + * Replace lynx by w3m (Closes: #113613) + * Move gnome-terminal.desktop in gnome-terminal package (Closes: #113736) + * Move gnome-help.desktop in gnome-help package + * debian:control Add Replaces: gnome-panel-data (<= 1.4.0.4-9) for above + * Patch against gsm/logout.c Now you can reboot/halt your machine from the + panel. This only work for root, because shutdown doesn't understand the + -a option. Read README.debian in gnome-panel package. + * debian/rules Remove less files in clean target (Closes: #114020) + + -- Christian Marillat Mon, 1 Oct 2001 11:34:06 +0200 + +gnome-core (1.4.0.4-9) unstable; urgency=low + + * Add Debian menu for panel and gmenu (Closes: #112176) + * Remove /var/lib/gnome on purge (Closes: #113005) + * Remove /etc/gnome/config on purge (Closes: #112994) + * Remove /etc/gnome on purge (Closes: #112995) + * debian/control replace cygnus-stylesheets by docbook-utils + + -- Christian Marillat Mon, 24 Sep 2001 18:39:19 +0200 + +gnome-core (1.4.0.4-8) unstable; urgency=high + + * High urgency, because the current release in testing has a missing + dependency on libpanel-applet0 and the panel package doesn't work if + libpanel-applet0 isn't installed (Closes: #111517) + * debian/control for gnome-help, move lynx from depends to recommends + (Closes: #109652) + * debian/control gnome-panel suggests fortune-mod (Closes: #110865) + * debian/control gnome-help suggests gnome-users-guide not + gnome-users-guide-en (Closes: #111200) + * Don't change cursor color (Closes: #97697) + * Change default font for gnome-terminal (Closes: #111319) + + -- Christian Marillat Fri, 7 Sep 2001 15:06:07 +0200 + +gnome-core (1.4.0.4-7) unstable; urgency=low + + * Fix path in gnome-session.1 (Closes: #107724) + * debian/*.sgml Use docbook 4.1 + * debian/control gnome-help-data Replaces gnome-terminal (<= 1.0.55-2) + (CLoses: #107948) + + -- Christian Marillat Wed, 8 Aug 2001 08:07:56 +0200 + +gnome-core (1.4.0.4-6) unstable; urgency=low + + * debian/rules for dh_makeshlibs replace libcapplet0 by libpanel-applet0 + (Closes: #105772) + + -- Christian Marillat Wed, 18 Jul 2001 19:02:59 +0200 + +gnome-core (1.4.0.4-5) unstable; urgency=low + + * Patch against gnome-edit to use EDITOR if the default gnome editor is + unavailable. + * Remove gnome-wm patch, and move the patched file in debian/ + * debian/gnome-wm Try to exec $WINDOW_MANAGER before x-window-manager + (Closes: #103430 + * New patch from Michael Urman to hide task names in tasklist_applet + (Closes: #104587) + + -- Christian Marillat Sat, 14 Jul 2001 16:58:12 +0200 + +gnome-core (1.4.0.4-4) unstable; urgency=low + + * Gnome-help Provides: man-browser, www-browser, info-browser + * Switch to debhelper V3 + * Change libraries versionning to (>= 1.4.0.2-3) instead of the latest + package number. + * Build-depends on groff-base instead of groff + + -- Christian Marillat Fri, 22 Jun 2001 17:02:37 +0200 + +gnome-core (1.4.0.4-3) unstable; urgency=low + + * New patch: Allows to save/load the keyboard secure state (Closes: #83028) + * New patch: Remove a warning in configure + * gnome-help replace gnome-panel-data (Closes: #99499) + * Build-depends on xml-i18n-tools (>= 0.8.4.cvs.20010530-1) (Close: #98784) + + -- Christian Marillat Sat, 2 Jun 2001 14:41:45 +0200 + +gnome-core (1.4.0.4-2) unstable; urgency=low + + * New patch: Replace Distribution by Debian in configuration dialog box. + * New patch: Upstream patch to allow Debian menu in default configuration. + * New patch: Fix some wrong path. + * Move gnome-feedback doc from gnome-help-data to gnome-core. + + -- Christian Marillat Tue, 15 May 2001 15:36:51 +0200 + +gnome-core (1.4.0.4-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 9 May 2001 23:56:27 +0200 + +gnome-core (1.4.0.3-2) unstable; urgency=low + + * Remove debugging code (/tmp/languages file) + + -- Christian Marillat Mon, 7 May 2001 16:48:18 +0200 + +gnome-core (1.4.0.3-1) unstable; urgency=low + + * New upstream release. + * New: tooltips for long task names in tasklist_applet (Closes: #63898) + + -- Christian Marillat Thu, 3 May 2001 15:51:58 +0200 + +gnome-core (1.4.0.2-3) unstable; urgency=low + + * Fix wrong dif.gz file (Closes: #94499) + * Build against the latest lignome-dev (Closes: #95301, #95691) + * gnome-terminal should depends on gnome-bin (Closes: #95498) + * Doesn't build against gtkhtml this break fonts displaying (Closes: #92187) + + -- Christian Marillat Tue, 1 May 2001 11:03:14 +0200 + +gnome-core (1.4.0.2-2) unstable; urgency=low + + * New/old patch against manpages, never applied by upstream. + * gnome-help depends on lynx. + * Use x-terminal-emulator in gnome-download instead of xterm. + * Move gnome-convert and gnome-download from gnome-core to gnome-help. + * Move gnome-login-check from gnome-core to gnome-session. + * Move gnome-panel-add-launcher from gnome-core to gnome-panel. + * Move sesion-properties* from gnome-core to gnome-session. + * debian/control Add Replaces for the changes above. + * Write manpages (Closes: #87085) + + -- Christian Marillat Tue, 17 Apr 2001 18:54:15 +0200 + +gnome-core (1.4.0.2-1) unstable; urgency=low + + * New upstream release. + * Build-depends on latest gettext (Closes: #93198) + * Icon box in menu editor is back (Closes: #91938) + * Build-depends on latest xml-i18n-tools and libgnome-dev + + -- Christian Marillat Wed, 11 Apr 2001 15:16:20 +0200 + +gnome-core (1.4.0.1-2) unstable; urgency=low + + * Build depends on versionned gettext 0.10.35-17 (Closes: #93198) + * Write manpage for gnome-session and add docbook-to-man in build-depnds + * Write manpages for gnome-help (Closes: #87089) + + -- Christian Marillat Sat, 7 Apr 2001 15:52:40 +0200 + +gnome-core (1.4.0.1-1) unstable; urgency=low + + * New upstream release. + * debian/gnome-terminal.wrapper change -T by -t (Closes: #90847) + * debian/gnome-session.README.debian remove references to .xsession. This + is now obsolete by the new x-session-manager scheme. + + -- Christian Marillat Sun, 1 Apr 2001 15:01:51 +0200 + +gnome-core (1.4.0-2) unstable; urgency=low + + * Build depends on libglade-gnome0-dev (>= 0.16-1) (Closes: #90416) + * debian/control Add Build-Conflicts: libgtkhtml-dev (>= 0.7-1) (Closes: #90700) + + -- Christian Marillat Thu, 22 Mar 2001 16:44:12 +0100 + +gnome-core (1.4.0-1) unstable; urgency=low + + * New upstream release. + * Gnome-core replaces gnome-control-center 1.2.3-1 (Closes: #90124) + * Remove manpages patche included by upstream. + * gnome-session don't always saves session on logout (Closes: #89630) + * Can add a launcher in the panel (Closes: #90018) + * Deskguide don't crashes on Fill with mini-images (Closes: #86952) + * Deskguide don't fail to run (Closes: #89769) + * Pager applet don't fail to run (Closes: #89025) + + -- Christian Marillat Mon, 19 Mar 2001 13:01:26 +0100 + +gnome-core (1.3.1-2) unstable; urgency=low + + * Remove taslisk-applet manpage (Closes: #88994) + * New patch against gnome-terminal.1 (Closes: #89005) + * Move /usr/lib/libtasklist_applet.so in libpanel-applet0 + (Closes: #89053, #89008, #89012, #89091, #89003) + * Gnome-terminal replace gnome-help-data (<= 1.0.55-2) (Closes: #87910) + + -- Christian Marillat Sat, 10 Mar 2001 10:45:14 +0100 + +gnome-core (1.3.1-1) unstable; urgency=low + + * New upstream release. + * Removed default.session patch + * debian/control Add Replaces: gnome-control-center (<= 1.2.2-10), because + the session-properties-capplet is now in this package. + * debian/{postinst,prerm} Call scrollkeeper + * debian/control Add scrollkeeper, xml-i18n-tools and libglade-gnome0-dev in + build-depends and scrollkeeper in depends for gnome-core + * Menu and laucnh keys works now (Closes: #86955) + * Dead keys work in gnome-terminal (Closes: #63102) + * Gnome-terminal isn't broken (Closes: #86752) + * New patch htmlurl.h (This file was broken by upstream author) + * XFMail doesn't crash the tasklist applet in this release (Closes: #88515) + * debian/gnome-core.menu New file for the session properties capplet + + -- Christian Marillat Mon, 5 Mar 2001 11:40:15 +0100 + +gnome-core (1.2.4-11) unstable; urgency=low + + * Update (again) the Build-depends field (Closes: #87419) + * Add a debian directory for the gnome-help-browser and add suggest doc-base + for gnome-help. Now we can watch debian documentation registered with doc-base. + * Add a lintian override file for libpanel-applet0 + + -- Christian Marillat Sun, 25 Feb 2001 16:14:09 +0100 + +gnome-core (1.2.4-10) unstable; urgency=low + + * Update the Build-depends field (Closes: #86441, #87419) + * Call update-alternatives only in remove (gnome-terminal, gnome-session) (Closes: #87327, #87328) + + -- Christian Marillat Sat, 24 Feb 2001 18:03:20 +0100 + +gnome-core (1.2.4-9) unstable; urgency=low + + * Remove abandonned /etc/CORBA/servers/bad-applet.goad (Closes: #84950) + * Build against the latest gnome-libs (1.2.11) (Close: #85932) + + -- Christian Marillat Wed, 14 Feb 2001 13:49:26 +0100 + +gnome-core (1.2.4-8) unstable; urgency=low + + * debian/control Add Replaces: gnome-help-data (<< 1.0.55-2) for + gnome-help (Closes: #80974) + * debian/gnome-help.mime Rewrote (Closes: #82891) + * debian/control gnome-core depends on gnome-bin (Closes: #82951) + * Wrote gnome-panel.README.Debian (Closes: #82954) + + -- Christian Marillat Mon, 22 Jan 2001 16:04:58 +0100 + +gnome-core (1.2.4-7) unstable; urgency=low + + * Added gnome-bin (>= 1.2.0) in gnome-session Depends field (Closes: #80589, #80595, #80733) + + -- Christian Marillat Wed, 27 Dec 2000 19:24:08 +0100 + +gnome-core (1.2.4-6) unstable; urgency=low + + * Apply patch to gnome-run to call x-terminal-emulator (Closes: #80219) + * debian/gnome-terminal.wrapper This is -t not -T close (Closes: #80405) + + -- Christian Marillat Sun, 24 Dec 2000 03:27:12 +0100 + +gnome-core (1.2.4-5) unstable; urgency=low + + * Install gnome-terminal.wrapper as x-terminal-emulator and remove + debian/patches/gnome-terminal.dpatch (Closes: 64326) + Thanks to Eric Gillespie, Jr. + * Add Recommends: gnome-applets on gnome-panel (Closes: #72208) + * gnome-sesion provides x-session-manager and install alternative (Closes: #60667) + * Added hints=Gnome for all menu files. + + -- Christian Marillat Wed, 20 Dec 2000 23:19:55 +0100 + +gnome-core (1.2.4-4) unstable; urgency=low + + * Call x-terminal-emulator in gnome-wm and add depends on the latest debianutils + for gnome-session. Thanks to Joseph Carter for the file + (Closes: #79776) + * Rewrote default.session patch + * Add patch form Doug Larrick for gwmthumbnail.c (Closes: #78550) + + -- Christian Marillat Sun, 17 Dec 2000 12:04:54 +0100 + +gnome-core (1.2.4-3) unstable; urgency=low + + * Change gnome-help.mime to call the right file (Closes: #77986) + Thanks Malcolm Parsons for the patch. + * Patch gsm/default.in (two entries with same id) (Closes: #78276) + Thanks to Normal User (Nice name) + * Move gnome-control-center from Depends to Suggests. + * Remove libgtkhtml-dev from Build-Depends (Closes: #79527) + + -- Christian Marillat Wed, 13 Dec 2000 18:01:34 +0100 + +gnome-core (1.2.4-2) unstable; urgency=low + + * Remove README and NEWS files (Closes: #77250) + * Disable thumbnails by default in deskguide_applet (Closes: #77205) + * debian/rules --with-window-manager is now sawfish (was x-window-manager) + and rewrote debian/patches/gnome-wm.dpatch to remove x-window-manager (Closes: #77401) + * Should close this old bug (Closes: #51198) + * Patch gnome-edit to use x-terminal-emulator instead of xterm. + + -- Christian Marillat Mon, 20 Nov 2000 11:35:55 +0100 + +gnome-core (1.2.4-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 16 Nov 2000 00:43:15 +0100 + +gnome-core (1.2.3.1-1) unstable; urgency=low + + * New upstream release. + * Add gnome-help example and manpage in gnome-help package (Closes: #49977) + * This release should close these old bugs (Closes: #60561, #60768, #45053) + * Gnome-panel don't use all CPU time (Closes: #75251, #60209) + * Remove gmenu patch included by upstream. + + -- Christian Marillat Wed, 8 Nov 2000 17:09:42 +0100 + +gnome-core (1.2.3-1) unstable; urgency=low + + * New upstream release. + * Debian menus aren't empty (Closes: #70470) + * Launcher can find icon (Closes: #62502) + + -- Christian Marillat Tue, 24 Oct 2000 15:51:11 +0200 + +gnome-core (1.2.2.1-3) unstable; urgency=low + + * Add gnome-terminal.prerm for update-alternatives --remove (Closes: #74451) + * Patch gnome-terminal to accept -T option (Closes: #74450) + * Move README.debian in gnome-session package (Closes: #60440) + * mesg work in gnome-terminal (Closes: #71728) + * Upstream fix these old bugs in Gnome-terminal + Problem with menubar (Closes: #57516) + Problem with console-apt Closes: #60079) + Problem with screen (Closes: #50156) + * Binaries don't should go in /usr/X11R6/bin (Closes: #24031) + Quoting Debian policy : + "Packages using the X Window System should abide by the FHS standard" + "whenever possible; they should install binaries, libraries, manual" + "pages, and other files in FHS-mandated locations wherever possible." + "This means that files must not be installed into /usr/X11R6/bin/'" + * hostname isn't harcoded (Closes: #72536) + * Error messages mention Lynx (Closes: #62216) + * Display correctly deskuse.html (Closes: #49974) + * Add patch from malcolm (Closes: #64820) + + -- Christian Marillat Sat, 14 Oct 2000 23:39:49 +0200 + +gnome-core (1.2.2.1-2) unstable; urgency=low + + * Typo in debian/gnome-terminal.postinst + * Add gnome-terminal manpage (Closes: #69188) + * Closes: #63103 already closed in 1.2.1-0.2 (typo in debian/changelog) + * Gnome-terminal write to /var/run/utmp (Closes: #59053) + * delete/backspace keys works (Closes: #57198) + * Install GnomeHelp file in /etc/gnome/config (Closes: #73012) + * Convert png icons in xpm for Debian menu. + * Rearange documentation for dhelp (Closes: #56672) + + -- Christian Marillat Thu, 5 Oct 2000 00:59:44 +0200 + +gnome-core (1.2.2.1-1) unstable; urgency=low + + * New upstream release. + * Patch all manpages (Closes: #70009) + * gnome-panel 1.0.55-2.0.1 (sparc) is now installable (Closes: #69075, #71570) + * gmenu don't jam up all translations (Closes: #46446) + * panel remember its configuration between session + (Closes: #47734, #54190) + * Icons are now centered (Closes: #63868) + * Bugs closed by previous NMU in gnome-panel (Closes: #40036, #52584, #54755, + #58278, #61083, #69428)) + * libgen_util_applet.so installed in 1.2.1-0.2 (Closes: #69463) + * debian/control remove Conflicts: asclock (Closes: #52077) + * gnome-help 1.0.55-2.0.1 (sparc) is now installable (Closes: #69356) + * Bugs closed by previous NMU in gnome-help (Closes: #49734, #56081, #58679, #58973) + * debian/control move gmc from Recommends to Suggests (Closes: #59415) + * The first search in gnome-wm search is x-window-manager + (Closes: #50940, #65969, #62143) + * Bug closed in 1.2.2-1 (README.debian in gnome-session package) (Closes: #66219) + * Bugs closed by previous NMU in gnome-terminal + (Closes: #64579, #63592, #63332, #56584, #55477, #54428) + * gnome-terminal provide x-terminal-emulator (Closes: #61805, #53994, #56225) + + -- Christian Marillat Wed, 27 Sep 2000 16:02:16 +0200 + +gnome-core (1.2.2-1) unstable; urgency=low + + * New maintainer, thanks James. + * New upstream release. + * Switch to debhelper V2 + * Move README.debian in gnome-session package (Closes: #65235) and + update this file (Closes: #71339) + * Bug closed in 1.2.1-0.2 (Install missing libraries) (Closes: #69590, #70483) + * Bugs closed in 1.2.1-0.1 (typo close instead closes) (Closes: #53764, #54050) + * Remove gtkhtml patch. + * The desk guide show thumbnail (Closes: #72359) + * Missing package under sparc (Closes: #71438) + * debian/control add Conflicts: libgnome32 (<< 1.2.0-1) for gnome-panel (Closes: #72039) + * Added icons in Debian menu. + * Eject in drivemount check if '-u' is available (Closes: #63954) + * Patch gmenu to find Debian menu. + + -- Christian Marillat Tue, 26 Sep 2000 17:34:23 +0200 + +gnome-core (1.2.1-0.2) unstable; urgency=low + + * NMU. + * Install these libraries libfish_applet.so libgen_util_applet.so + libpanel_status.so (Closes: #69428, #69590) + * Copy latest gnome aclocal in macros/ and run macros/autogen.sh + This is needed to build gnome-help-browser against libgtkhtml4. + * In debian/control + gnome-session depends on gnome-panel (>= ${Source-Version}). + gnome-help depends on gnome-core (>= 1.2.0-0.1) no Source-Version. + gnome-terminal don't depends on gnome-core. + * URL's are clickable in gnome-terminal (Closes: 63103). + * debian/gnome-panel.undocumented removed printer_applet.1 + * Cut and paste work in gnome-terminal (Closes: #63592). + + -- Christian Marillat Wed, 23 Aug 2000 21:23:36 +0200 + +gnome-core (1.2.1-0.1) unstable; urgency=low + + * New upstream release (Closes: #58806, #66467) + * NMU. + * Standards-Version to 3.1.1.1 Added Build-depends field. + * Removed patches: dialer, drivemount-floppy, modemlights, term, + help-browser, debian-menu, url-match. + * Added patches: gtkhtml. + * Build against libgtkhtml3. Closes: #58679, #36806, #49734 + * Default manpath and infopath are wrong. Closes: #56081 + * gmenu segfaults. Close: #53764, #54050 + * gnome-panel: panel no longer works. Closes: #58278 + * gnome-panel: gnomepager-applet should put braces around. Closes: #52584 + * Backspace and delete work correctly. Closes: #54428 + * TERM never select xterm-debian. Closes: #56584, #55477, #64579 + * Disable arrows option is now saved. Closes: #54755 + * No more files in /usr/share. Closes: #61083 + * Show debian menus. Closes: #66214 + * New help documentation for panel. Closes: #40036 + * Gnome-terminal write to /var/run/utmp. Closes: #59053 + * gnome-terminal provide x-terminal-emulator. Closes: #61805, #56225 + * README.Debian is here. Closes: #65235 + + -- Christian Marillat Tue, 25 Jul 2000 19:09:21 +0200 + +gnome-core (1.0.55-2) frozen unstable; urgency=low + + * Make x-window-manager run first by gnome-wm script to conform to + debian policy (Closes: #61617) (This is an important bug) + + -- James LewisMoss Sun, 21 May 2000 19:31:19 -0400 + +gnome-core (1.0.55-1) unstable; urgency=low + + * New upstream. + + -- James LewisMoss Sun, 2 Jan 2000 07:32:36 -0500 + +gnome-core (1.0.54-2) unstable; urgency=low + + * Fix the gnome-pager forgets size settings bug (was saved to wrong + section). Closes: #49839, #46845. + + -- James LewisMoss Fri, 12 Nov 1999 07:54:46 -0500 + +gnome-core (1.0.54-1) unstable; urgency=low + + * New upstream. + + -- James LewisMoss Thu, 4 Nov 1999 23:20:14 -0500 + +gnome-core (1.0.53-4) unstable; urgency=low + + * New maintainer. + + -- James LewisMoss Mon, 25 Oct 1999 23:17:31 -0400 + +gnome-core (1.0.53-3) unstable; urgency=low + + * Ok, I made a mistake by setgiding gnome-terminal to + utmp. Reverted the change. Closes: #47960 + + -- Raphael Hertzog Mon, 18 Oct 1999 19:17:27 +0200 + +gnome-core (1.0.53-2) unstable; urgency=low + + * gnome-session does launch a default window-manager. It does launch + gnome-wm if no other information has been found. gnome-wm now + reads the list of window managers from /etc/X11/window-managers + once it has tried gnome compliant wm. Closes: #38347, #47370 + * Patched gnome-terminal. TERM=xterm-debian again ... actually this + closes: #47552, #44960, #41065 + * gnome-terminal is now setgid utmp and can thus register itself + in the UTMP database. Closes: #40507 + * The URL match does now accept % characters. Closes: #47281 + * libpanel-applet0.postinst check for the changelog.gz mysteriously + staying around. Closes: #45871 + * Unreproducable bugs without answer from the submitter. + Closes: #41195, #42865 + + -- Raphael Hertzog Sat, 16 Oct 1999 19:52:38 +0200 + +gnome-core (1.0.53-1) unstable; urgency=low + + * New upstream version. + * gnome-session does now depend on gnome-panel and recommends + gmc (both are needed for a full Gnome desktop). + * gnome-terminal does not have a border. Closes: #38972 + + -- Raphael Hertzog Tue, 12 Oct 1999 21:17:58 +0200 + +gnome-core (1.0.52-1) unstable; urgency=low + + * New maintainer. Steve said that he wanted to give away some of + his packages. I've asked to take gnome-core, he never replied, so + I'm taking it but I will give it back to him if he wanted to + keep it. In the meantime I can better manage bugs with my name + in the Maintainer field. + * New upstream version. + + -- Raphael Hertzog Mon, 4 Oct 1999 21:28:18 +0200 + +gnome-core (1.0.50-0.1) unstable; urgency=low + + * New upstream version. + * NMU again. + + -- Raphael Hertzog Thu, 30 Sep 1999 22:10:03 +0200 + +gnome-core (1.0.41-0.1) unstable; urgency=low + + * New upstream version. + * NMU again. + + -- Raphael Hertzog Mon, 27 Sep 1999 13:10:31 +0200 + +gnome-core (1.0.9-0.1) unstable; urgency=low + + * New upstream version. Closes: #43253, #44098 + * Apply patches before configuring (and relaunch automake && autoconf + because one of the patches is applied on Makefile.am). + * NMU. Thanks to Christian Marillat for his work. + * Imlib bug corrected: closes: #39085 + * X11 binaries don't have to go /usr/X11R6/bin. Closes: #24031 + * The panel does start correctly wihout complaining about a + missing name service. Closes: #39380, #39634, #40478 + * The panel doesn't consume all CPU resources. Closes: #30654 + * The panel launches apps from where it has been launched itself. + Closes: #32319 + * The panel keeps the settings. Closes: #37052, #40579, #43496 + * Old core dump corrected upstream. Closes: #39400, #40328, #42167 + Closes: #44344, #44724, #44732, #44759, #44773 + * Bug in menu-method, not in gnome-panel. Already reported against + menu. Closes: #40089 + * cdplayer_applet works again. Closes: #42192 + * gnome pager works well: Closes: #42499, #42610 + * modem_lights draws itself correctly. Closes: #43861, #45055 + * The dialer applets doesn't exit when stopping while + not yet connected. Closes: #45287 + * No more Debian menu in the panel. Closes: #41040 + * GnomeICU works with this panel. Closes: #39626, #39515 + * gnome-panel-data conflicts with asclock. + Closes: #40712, #40715, #40808, #41430 + A better solution will be needed. Maybe put asclock in his own + package or create a asclock-data package that will be shared. + * Updated the modemlights patch. Closes: #43512 + * Added a patch for gnome-wm. Closes: #38366 + * Move lib{gkb,fish}_applet.so files to libgnome-applet0 (those are + not libraries to be linked with, just simple modules). Closes: #38596 + * Asclock works well without xearth (the code still mentions xearth + however). Closes: #40530 + * New patch (help-browser) for changing the default MANPATH and INFOPATH in + gnome-help-browser.c Closes: #41452 + * Moved help-browser to the new "Help" menu section. + * Added gnome-help.mime. Closes: #42205 + * Gnome-session does launch gnome-panel ! (I suppose that it failed + to launch since panel was broken). Closes: #42937 + * gnome-sesion doesn't core dump. Closes: #36640 + * The terminal does remember the TERM var. Closes: #43067 + * The terminal keeps its size when dragging the manu bar in and out. + Closes: #44762 + * The menu section of gnome-terminal corrected. Closes: #37635 + + -- Raphael Hertzog Wed, 22 Sep 1999 13:24:34 +0200 + +gnome-core (1.0.7-1) unstable; urgency=low + + * New upstream version. + * Removed "term" patch + + -- Steve Haslam Mon, 28 Jun 1999 01:36:31 +0100 + +gnome-core (1.0.6-2) unstable; urgency=low + + * debian-menu.dpatch: created to fix guessing Debian menus + (/etc/menu-methods/gnome-panel now) and to make Debian menus the default + instead of GNOME system menus. + * gnome-help now suggests gnome-users-guide-en (closes: #35724) + * /etc/menu-methods/gnome-panel now creates .directory files and searches + /usr/X11R6/include/X11/pixmaps for menu icons + + -- Steve Haslam Sun, 13 Jun 1999 15:28:52 +0100 + +gnome-core (1.0.6-1) unstable; urgency=low + + * New upstream version. + + -- Steve Haslam Sat, 5 Jun 1999 12:57:08 +0100 + +gnome-core (1.0.5-3) unstable; urgency=low + + * debian/gnome-terminal.menu: managed to lose change mentioned in last + revision. Replaced. + * debian/gnome-core.undocumented: removed gnome-wm.1 (it was in + gnome-session.undocumented too). + + -- Steve Haslam Mon, 31 May 1999 19:15:54 +0100 + +gnome-core (1.0.5-2) unstable; urgency=low + + * debian/gnome-terminal.menu: changed section to XShells (Bug#37635) + * debian/rules: added gnome-wm and gnome-edit to dh_undocumented call + (Bug#37632) + * debian/gnome.menu-method: added patch to honour needs=text (Bug#36928) + from Decklin Foster + * Call dh_strip when making libpanel-applet-dev (Closes: Bug#31244) + * Removed /usr/share/gnome/apps/Debian symlink, (closes: #38100) + * Sanified build system a la gnome-libs + * debian/control: made gnome-help, gnome-help-data and gnome-panel-data + packages. + + -- Steve Haslam Sun, 23 May 1999 14:35:44 +0100 + +gnome-core (1.0.5-1) unstable; urgency=low + + * New maintainer. + + -- Steve Haslam Tue, 11 May 1999 01:01:12 +0100 + +gnome-core (1.0.5-0.2) unstable; urgency=low + + * gnome-panel.files.in: added asclock themes, libgkb_applet.a + * gnome-core.files.in: added gnome-wm, gnome-edit + * term.dpatch: gnome-terminal TERM to xterm-debian rather than xterm + * gsm/Makefile.am: put default.session, default.wm in /etc/gnome + * debian/gnome-session.conffiles.in: added above two files + * debian/gnome-session.files.in: updated this too + + -- Steve Haslam Sun, 18 Apr 1999 16:47:23 +0100 + +gnome-core (1.0.5-0.1) unstable; urgency=low + + * Non-maintainer upload + * New upstream version + + -- Steve Haslam Thu, 15 Apr 1999 23:22:23 +0100 + +gnome-core (1.0.1-0.3) unstable; urgency=low + + * Weehay! More broken dependencies. This one libghttp -1.1, + a bogus package that only ever existed on my machine. + + -- Jules Bean Mon, 8 Mar 1999 08:24:00 +0000 + +gnome-core (1.0.1-0.2) unstable; urgency=low + + * Another NMU, this time to fix bogus dependencies on libgtop0 + and libglib1.1 + + -- Jules Bean Sun, 7 Mar 1999 14:21:12 +0000 + +gnome-core (1.0.1-0.1) unstable; urgency=low + + * NMU for GNOME-1.0 + * Hacked to patch SIGPIPE bug + * Don't delete GIFs in rules + + -- Jules Bean Fri, 5 Mar 1999 18:36:29 +0100 + +gnome-core (0.99.99pre1.0.0-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Fri, 26 Feb 1999 23:18:10 -0800 + +gnome-core (0.99.3.2-4) unstable; urgency=low + + * Recompiled yet again - dual dependency on libglib. + Fixes: BUG#32510 + + -- Jim Pick Thu, 28 Jan 1999 00:00:22 -0800 + +gnome-core (0.99.3.2-3) unstable; urgency=low + + * Recompiled again to due to dependencies. + + -- Jim Pick Sun, 24 Jan 1999 01:10:07 -0800 + +gnome-core (0.99.3.2-2) unstable; urgency=low + + * Recompiled with libgnome 0.99.4. + + -- Jim Pick Fri, 22 Jan 1999 16:44:45 -0800 + +gnome-core (0.99.3.2-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Wed, 20 Jan 1999 11:42:46 -0800 + +gnome-core (0.30-2) frozen unstable; urgency=low + + * Recompiled with new libs. + * Fixed reference to /usr/X11R6 in README.Debian. + * Added warnings (Gnome is ALPHA). + * Patched dialer_applet to use pon/poff. + * Patched drivemount_applet to default to /floppy. + + -- Jim Pick Tue, 24 Nov 1998 10:56:08 -0800 + +gnome-core (0.30-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 24 Sep 1998 21:28:02 -0700 + +gnome-core (0.28.1-1) unstable; urgency=low + + * New upstream release. + * Hopefully fixes panel applet bug. + + -- Jim Pick Wed, 19 Aug 1998 20:12:25 -0700 + +gnome-core (0.28-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 17 Aug 1998 12:59:26 -0700 + +gnome-core (0.27-1) unstable; urgency=low + + * New upstream release. + * Added /usr/doc/gnome + + -- Jim Pick Sat, 15 Aug 1998 14:21:06 -0700 + +gnome-core (0.25-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 6 Aug 1998 22:51:22 -0700 + +gnome-core (0.20-2) unstable; urgency=low + + * Added Debian menu-method for gnome-panel. Fixed Bug #24025 + (Thanks to Ray Dassen for reporting the bug, and Riku Voipio + who wrote the menu method for Gnome 0.12) + + -- Jim Pick Wed, 22 Jul 1998 20:22:00 -0700 + +gnome-core (0.20-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 8 Jun 1998 12:00:08 -0700 + +gnome-core (0.13-1) unstable; urgency=low + + * Initial Release. + + -- Jim Pick Mon, 16 Mar 1998 15:27:43 -0800 --- gnome-panel-2.27.92.orig/debian/libpanel-applet2-doc.links +++ gnome-panel-2.27.92/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.27.92.orig/debian/libpanel-applet2-doc.install +++ gnome-panel-2.27.92/debian/libpanel-applet2-doc.install @@ -0,0 +1 @@ +doc/reference/panel-applet/html usr/share/doc/libpanel-applet2-doc/ --- gnome-panel-2.27.92.orig/debian/ubuntu-about.desktop.in +++ gnome-panel-2.27.92/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.27.92.orig/debian/README.Debian +++ gnome-panel-2.27.92/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.27.92.orig/debian/gnome-panel-data.postinst +++ gnome-panel-2.27.92/debian/gnome-panel-data.postinst @@ -0,0 +1,18 @@ +#!/bin/sh +set -e + +#DEBHELPER# + +update-gconf-defaults + +if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl "2.20.1-2"; then + rm -f /etc/menu-methods/gnome-panel-data /etc/menu-methods/gnome-vfolder-user + rm -f /etc/gnome-vfs-2.0/vfolders/applications.template + if [ -d /etc/gnome-vfs-2.0/vfolders ]; then + rmdir --ignore-fail-on-non-empty /etc/gnome-vfs-2.0/vfolders + fi + rm -rf /var/lib/gnome/Debian + if [ -d /var/lib/gnome ]; then + rmdir --ignore-fail-on-non-empty /var/lib/gnome + fi +fi --- gnome-panel-2.27.92.orig/debian/gnome-panel.install +++ gnome-panel-2.27.92/debian/gnome-panel.install @@ -0,0 +1,8 @@ +debian/tmp/usr/bin +debian/tmp/usr/lib/gnome-panel/*.so +debian/tmp/usr/lib/gnome-panel/*-mechanism +debian/tmp/usr/share/man +debian/fusa-applet.note usr/share/gnome-panel +debian/migrate-fusa-config.py usr/share/gnome-panel +debian/add-indicator-applet.py usr/share/gnome-panel +debian/indicator-applet.desktop etc/xdg/autostart --- gnome-panel-2.27.92.orig/debian/gnome-panel-data.preinst +++ gnome-panel-2.27.92/debian/gnome-panel-data.preinst @@ -0,0 +1,31 @@ +#!/bin/sh +set -e + +rm_conffile() { + PKGNAME="$1" + CONFFILE="$2" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" le "1:2.23.92"; then + rm_conffile gnome-panel-data "/etc/gnome-vfs-2.0/vfolders/applications.template" + rm_conffile gnome-panel-data "/etc/menu-methods/gnome-panel-data" + rm_conffile gnome-panel-data "/etc/menu-methods/gnome-vfolder-user" + fi +esac + +#DEBHELPER# --- gnome-panel-2.27.92.orig/debian/control.in +++ gnome-panel-2.27.92/debian/control.in @@ -0,0 +1,130 @@ +Source: gnome-panel +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Guilherme de S. Pastore +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.8.1 +Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-panel/ubuntu +Build-Depends: cdbs (>= 0.4.41), + debhelper (>= 5), + quilt, + intltool (>= 0.40.0), + gnome-pkg-tools (>= 0.14), + dpkg-dev (>= 1.13.19), + gnome-doc-utils, + libx11-dev, + libxau-dev, + libgtk2.0-dev (>= 2.15.1), + libgnomeui-dev (>= 2.16.0-2), + libgnome-desktop-dev (>= 2.26), + libgnome2-dev (>= 2.13.0), + libbonoboui2-dev (>= 2.1.1), + liborbit2-dev (>= 1:2.12.1), + libwnck-dev (>= 2.19.5), + libgconf2-dev (>= 2.6.1), + libecal1.2-dev (>= 1.6.0) [!hurd-i386], + libedataserverui1.2-dev (>= 1.11.2) [!hurd-i386], + libcairo2-dev (>= 1.0.0), + gtk-doc-tools (>= 1.0), + libgnome-menu-dev (>= 2.27.92), + libpango1.0-dev (>= 1.15.4), + libedataserver1.2-dev (>= 1.2.0), + libglib2.0-dev (>= 2.18.0), + evolution-data-server-dev [!hurd-i386], + libgweather-dev (>= 2.27.90), + librsvg2-dev, + libdbus-glib-1-dev (>= 0.71), + libdbus-1-dev (>= 1.1.2), + network-manager-dev (>= 0.6), + libnm-util-dev (>= 0.6), + libpolkit-gobject-1-dev (>= 0.91), + sharutils +Build-Depends-Indep: libglib2.0-dev, libgtk2.0-dev + +Package: gnome-panel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-panel-data (>= ${gnome:Version}), + gnome-panel-data (<< ${gnome:NextVersion}), + gnome-desktop-data (>= 2.10.0-1), + gnome-control-center (>= 1:2.8.2-3), + gnome-menus (>= 2.16.1), + gnome-about (>= 2.10.0-1) +Recommends: gnome-applets (>= 2.12.1-1), + gnome-session, + evolution-data-server, + gnome-icon-theme (>= 2.24), + alacarte, + gvfs, + indicator-applet +Suggests: yelp, + gnome2-user-guide, + gnome-terminal | x-terminal-emulator, + gnome-system-tools, + nautilus, + evolution, + epiphany-browser, + gnome-session (>= 2.23.6) | gdm, + menu-xdg (>= 0.2) +Description: launcher and docking facility for GNOME + The GNOME Panel is an essential part of the GNOME Desktop, providing + toolbar-like “panels” which can be attached to the sides of your desktop. + They are used to launch applications and embed a number of other + functions, such as quick launch icons, the clock, the notification area, + volume controls and the battery charge indicator, and utilities ranging + from weather forecast to system monitoring. + +Package: libpanel-applet2-0 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: library for GNOME Panel applets + This library is used by GNOME Panel applets. + +Package: gnome-panel-dbg +Section: debug +Priority: extra +Architecture: any +Depends: ${misc:Depends}, + gnome-panel (= ${binary:Version}), + libpanel-applet2-0 (= ${binary:Version}) +Description: GNOME Panel and library for panel applets - debugging symbols + This package contains debugging symbols for gnome-panel and the + libpanel-applet library. It is provided to help debugging problem in + the panel itself or in the library. The debugging symbols are installed + in /usr/lib/debug and will automatically be used by gdb. + +Package: libpanel-applet2-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libpanel-applet2-0 (= ${binary:Version}), + libgconf2-dev (>= 2.6.1), + libgtk2.0-dev (>= 2.13.1), + libgnomeui-dev (>= 2.5.4), + libbonoboui2-dev (>= 2.1.1) +Description: library for GNOME Panel applets - development files + This packages provides the include files and static library for the GNOME + Panel applet library functions. + +Package: libpanel-applet2-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: doc-base +Description: library for GNOME Panel applets - documentation files + This packages provides the documentation files for the GNOME Panel applet + library functions. + +Package: gnome-panel-data +Section: gnome +Architecture: all +Depends: ${misc:Depends}, + gconf2 (>= 2.14.0-2) +Recommends: gnome-panel +Description: common files for the GNOME Panel + This package includes some files that are needed by the GNOME Panel + (Pixmaps, .desktop files and internationalization files). --- gnome-panel-2.27.92.orig/debian/gnome-panel-data.postrm +++ gnome-panel-2.27.92/debian/gnome-panel-data.postrm @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "$1" = remove ] && [ -x /usr/sbin/update-gconf-defaults ]; then + update-gconf-defaults +fi + +#DEBHELPER# --- gnome-panel-2.27.92.orig/debian/compat +++ gnome-panel-2.27.92/debian/compat @@ -0,0 +1 @@ +5 --- gnome-panel-2.27.92.orig/debian/gnome-desktop-item-edit.sgml +++ gnome-panel-2.27.92/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.27.92.orig/debian/gnome-panel.postinst +++ gnome-panel-2.27.92/debian/gnome-panel.postinst @@ -0,0 +1,25 @@ +#!/bin/sh + +# show note for people upgrading about the new fusa applet +if [ "$1" = configure ] && dpkg --compare-versions "$2" le-nl "1:2.24.0-0ubuntu2" \ + && [ -e /usr/share/gnome-panel/fusa-applet.note ]; +then + cp /usr/share/gnome-panel/fusa-applet.note /var/lib/update-notifier/user.d +fi + +# gconf default for the directory fixup +if [ "$1" = configure ] && dpkg --compare-versions "$2" le-nl "1:2.24.1-0ubuntu2.1"; +then + echo "/apps/panel/need_directory_fixup true" > /usr/share/gconf/defaults/20_gnome_panel_directory_fixup + update-gconf-defaults +fi + +# gconf default for the indicator applet +if [ "$1" = configure ] && dpkg --compare-versions "$2" le-nl "1:2.26.0-0ubuntu2"; +then + echo "/apps/panel/need_add_indicator_applet true" > /usr/share/gconf/defaults/25_gnome_panel_indicator_applet + update-gconf-defaults +fi + + +#DEBHELPER# --- gnome-panel-2.27.92.orig/debian/gnome-panel.postrm +++ gnome-panel-2.27.92/debian/gnome-panel.postrm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + rm -f /usr/share/gconf/defaults/20_gnome_panel_directory_fixup + rm -f /usr/share/gconf/defaults/25_gnome_panel_indicator_applet +fi + +#DEBHELPER# + --- gnome-panel-2.27.92.orig/debian/patches/01_layout.patch +++ gnome-panel-2.27.92/debian/patches/01_layout.patch @@ -0,0 +1,32 @@ +Index: gnome-panel-2.27.92/gnome-panel/panel-menu-items.c +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/panel-menu-items.c 2009-09-08 02:08:42.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/panel-menu-items.c 2009-09-18 16:01:01.000000000 +0200 +@@ -991,6 +991,7 @@ + GtkWidget *item; + char *gconf_name; + char *name; ++ char *path; + char *uri; + GFile *file; + +@@ -1157,9 +1158,18 @@ + if (add_separator) + add_menu_separator (menu); + +- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL, FALSE); ++ panel_menu_items_append_from_desktop (menu, "yelp.desktop", _("Help and Support"), FALSE); ++ + panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL, FALSE); + ++ 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, FALSE); ++ ++ if (g_file_test (DATADIR"/omf/about-edubuntu/about-edubuntu-C.omf", ++ G_FILE_TEST_IS_REGULAR)) ++ panel_menu_items_append_from_desktop (menu, "edubuntu-about.desktop", NULL, FALSE); ++ + if (parent->priv->append_lock_logout) + panel_menu_items_append_lock_logout (menu); + } --- gnome-panel-2.27.92.orig/debian/patches/86_signal_curtain.patch +++ gnome-panel-2.27.92/debian/patches/86_signal_curtain.patch @@ -0,0 +1,18 @@ +diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c +index c2932ee..c3bd534 100644 +--- a/gnome-panel/applet.c ++++ b/gnome-panel/applet.c +@@ -842,6 +842,13 @@ panel_applet_queue_initial_unhide_toplevels (gpointer user_data) + for (l = panel_toplevel_list_toplevels (); l != NULL; l = l->next) + panel_toplevel_queue_initial_unhide ((PanelToplevel *) l->data); + ++ g_spawn_command_line_async("dbus-send " ++ "--system --type=method_call " ++ "--dest=com.ubuntu.BootCurtain " ++ "/com/ubuntu/BootCurtain " ++ "com.ubuntu.BootCurtain.SignalLoaded string:gnome-panel", ++ NULL); ++ + return FALSE; + } + --- gnome-panel-2.27.92.orig/debian/patches/series +++ gnome-panel-2.27.92/debian/patches/series @@ -0,0 +1,15 @@ +01_layout.patch +04_default_panel_config.patch +08_clock_applet_event.patch +09_default_icons.patch +16_compiz_workspace_switcher.patch +17_about-ubuntu-translation.patch +18_lockdown_lock_editor.patch +20_fusa_migration_note_i18n.patch +25_inode_directory_fixup.patch +25_dynamic_fusa_detection.patch +30_disable-initial-animation.patch +70_relibtoolize.patch +85_disable_shutdown_on_ltsp.patch +86_signal_curtain.patch +99_ltmain_as-needed.patch --- gnome-panel-2.27.92.orig/debian/patches/08_clock_applet_event.patch +++ gnome-panel-2.27.92/debian/patches/08_clock_applet_event.patch @@ -0,0 +1,13 @@ +Index: gnome-panel-2.27.92/applets/clock/calendar-client.c +=================================================================== +--- gnome-panel-2.27.92.orig/applets/clock/calendar-client.c 2009-08-11 20:51:51.000000000 +0200 ++++ gnome-panel-2.27.92/applets/clock/calendar-client.c 2009-09-09 13:06:07.000000000 +0200 +@@ -2061,6 +2061,8 @@ + { + time_t day_tm = appointment->start_time + day_offset * 86400; + ++ if (duration == day_offset * 86400) ++ continue; + if (day_tm > month_end) + break; + if (day_tm >= month_begin) --- gnome-panel-2.27.92.orig/debian/patches/09_default_icons.patch +++ gnome-panel-2.27.92/debian/patches/09_default_icons.patch @@ -0,0 +1,26 @@ +Index: gnome-panel-2.27.92/gnome-panel/menu.c +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/menu.c 2009-09-08 02:08:42.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/menu.c 2009-09-09 13:06:08.000000000 +0200 +@@ -1489,7 +1489,7 @@ + NULL, 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 (), +Index: gnome-panel-2.27.92/gnome-panel/panel-stock-icons.h +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/panel-stock-icons.h 2009-08-19 21:59:57.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/panel-stock-icons.h 2009-09-09 13:06:08.000000000 +0200 +@@ -46,6 +46,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.27.92.orig/debian/patches/04_default_panel_config.patch +++ gnome-panel-2.27.92/debian/patches/04_default_panel_config.patch @@ -0,0 +1,467 @@ +Index: gnome-panel-2.27.92/gnome-panel/panel-default-setup.entries +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/panel-default-setup.entries 2009-06-30 00:49:36.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/panel-default-setup.entries 2009-09-15 15:27:38.000000000 +0200 +@@ -33,7 +33,7 @@ + browser_launcher + + +- email_launcher ++ yelp_launcher + + + +@@ -47,15 +47,15 @@ + + + +- window_menu +- +- + clock + + + notification_area + + ++ indicator_applet ++ ++ + show_desktop_button + + +@@ -64,6 +64,12 @@ + + workspace_switcher + ++ ++ trashapplet ++ ++ ++ fast_user_switch ++ + + + +@@ -261,7 +267,7 @@ + objects/browser_launcher/launcher_location + /schemas/apps/panel/objects/launcher_location + +- epiphany.desktop ++ firefox.desktop + + + +@@ -274,221 +280,275 @@ + objects/browser_launcher/menu_path/schemas/apps/panel/objects/menu_path + objects/browser_launcher/action_type/schemas/apps/panel/objects/action_type + +- ++ + + +- objects/email_launcher/object_type ++ objects/yelp_launcher/object_type + /schemas/apps/panel/objects/object_type + + launcher-object + + + +- objects/email_launcher/toplevel_id ++ objects/yelp_launcher/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + +- objects/email_launcher/position ++ objects/yelp_launcher/position + /schemas/apps/panel/objects/position + +- 2 ++ 4 + + + +- objects/email_launcher/panel_right_stick ++ objects/yelp_launcher/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + false + + + +- objects/email_launcher/locked ++ objects/yelp_launcher/locked + /schemas/apps/panel/objects/locked + + true + + + +- objects/email_launcher/launcher_location ++ objects/yelp_launcher/launcher_location + /schemas/apps/panel/objects/launcher_location + +- evolution.desktop ++ file:///usr/share/applications/yelp.desktop + + + +- objects/email_launcher/bonobo_iid/schemas/apps/panel/objects/bonobo_iid +- objects/email_launcher/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id +- objects/email_launcher/tooltip/schemas/apps/panel/objects/tooltip +- objects/email_launcher/use_custom_icon/schemas/apps/panel/objects/use_custom_icon +- objects/email_launcher/custom_icon/schemas/apps/panel/objects/custom_icon +- objects/email_launcher/use_menu_path/schemas/apps/panel/objects/use_menu_path +- objects/email_launcher/menu_path/schemas/apps/panel/objects/menu_path +- objects/email_launcher/action_type/schemas/apps/panel/objects/action_type ++ objects/yelp_launcher/bonobo_iid/schemas/apps/panel/objects/bonobo_iid ++ objects/yelp_launcher/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id ++ objects/yelp_launcher/tooltip/schemas/apps/panel/objects/tooltip ++ objects/yelp_launcher/use_custom_icon/schemas/apps/panel/objects/use_custom_icon ++ objects/yelp_launcher/custom_icon/schemas/apps/panel/objects/custom_icon ++ objects/yelp_launcher/use_menu_path/schemas/apps/panel/objects/use_menu_path ++ objects/yelp_launcher/menu_path/schemas/apps/panel/objects/menu_path ++ objects/yelp_launcher/action_type/schemas/apps/panel/objects/action_type + +- ++ + + +- applets/window_menu/object_type ++ applets/clock/object_type + /schemas/apps/panel/objects/object_type + + bonobo-applet + + + +- applets/window_menu/toplevel_id ++ applets/clock/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + +- applets/window_menu/position ++ applets/clock/position + /schemas/apps/panel/objects/position + +- 0 ++ 2 + + + +- applets/window_menu/panel_right_stick ++ applets/clock/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + true + + + +- applets/window_menu/locked ++ applets/clock/locked + /schemas/apps/panel/objects/locked + + true + + + +- applets/window_menu/bonobo_iid ++ applets/clock/bonobo_iid + /schemas/apps/panel/objects/bonobo_iid + +- OAFIID:GNOME_WindowMenuApplet ++ OAFIID:GNOME_ClockApplet + + + +- 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/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/clock/object_type ++ applets/notification_area/object_type + /schemas/apps/panel/objects/object_type + + bonobo-applet + + + +- applets/clock/toplevel_id ++ applets/notification_area/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + +- applets/clock/position ++ applets/notification_area/position + /schemas/apps/panel/objects/position + +- 2 ++ 5 + + + +- applets/clock/panel_right_stick ++ applets/notification_area/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + true + + + +- applets/clock/locked ++ applets/notification_area/locked + /schemas/apps/panel/objects/locked + + true + + + +- applets/clock/bonobo_iid ++ applets/notification_area/bonobo_iid + /schemas/apps/panel/objects/bonobo_iid + +- OAFIID:GNOME_ClockApplet ++ OAFIID:GNOME_NotificationAreaApplet + + + +- 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/notification_area/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id ++ applets/notification_area/tooltip/schemas/apps/panel/objects/tooltip ++ applets/notification_area/use_custom_icon/schemas/apps/panel/objects/use_custom_icon ++ applets/notification_area/custom_icon/schemas/apps/panel/objects/custom_icon ++ applets/notification_area/use_menu_path/schemas/apps/panel/objects/use_menu_path ++ applets/notification_area/menu_path/schemas/apps/panel/objects/menu_path ++ applets/notification_area/launcher_location/schemas/apps/panel/objects/launcher_location ++ applets/notification_area/action_type/schemas/apps/panel/objects/action_type + +- ++ + + +- applets/notification_area/object_type ++ applets/indicator_applet/object_type + /schemas/apps/panel/objects/object_type + + bonobo-applet + + + +- applets/notification_area/toplevel_id ++ applets/indicator_applet/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + +- applets/notification_area/position ++ applets/indicator_applet/position + /schemas/apps/panel/objects/position + +- 3 ++ 4 + + + +- applets/notification_area/panel_right_stick ++ applets/indicator_applet/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + + true + + + +- applets/notification_area/locked ++ applets/indicator_applet/locked + /schemas/apps/panel/objects/locked + + true + + + +- applets/notification_area/bonobo_iid ++ applets/indicator_applet/bonobo_iid + /schemas/apps/panel/objects/bonobo_iid + +- OAFIID:GNOME_NotificationAreaApplet ++ OAFIID:GNOME_IndicatorApplet + + + +- applets/notification_area/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id +- applets/notification_area/tooltip/schemas/apps/panel/objects/tooltip +- applets/notification_area/use_custom_icon/schemas/apps/panel/objects/use_custom_icon +- applets/notification_area/custom_icon/schemas/apps/panel/objects/custom_icon +- applets/notification_area/use_menu_path/schemas/apps/panel/objects/use_menu_path +- applets/notification_area/menu_path/schemas/apps/panel/objects/menu_path +- applets/notification_area/launcher_location/schemas/apps/panel/objects/launcher_location +- applets/notification_area/action_type/schemas/apps/panel/objects/action_type ++ applets/indicator_applet/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id ++ applets/indicator_applet/tooltip/schemas/apps/panel/objects/tooltip ++ applets/indicator_applet/use_custom_icon/schemas/apps/panel/objects/use_custom_icon ++ applets/indicator_applet/custom_icon/schemas/apps/panel/objects/custom_icon ++ applets/indicator_applet/use_menu_path/schemas/apps/panel/objects/use_menu_path ++ applets/indicator_applet/menu_path/schemas/apps/panel/objects/menu_path ++ applets/indicator_applet/launcher_location/schemas/apps/panel/objects/launcher_location ++ applets/indicator_applet/action_type/schemas/apps/panel/objects/action_type ++ ++ ++ ++ ++ applets/fast_user_switch/object_type ++ /schemas/apps/panel/objects/object_type ++ ++ bonobo-applet ++ ++ ++ ++ applets/fast_user_switch/toplevel_id ++ /schemas/apps/panel/objects/toplevel_id ++ ++ top_panel ++ ++ ++ ++ applets/fast_user_switch/position ++ /schemas/apps/panel/objects/position ++ ++ 0 ++ ++ ++ ++ applets/fast_user_switch/panel_right_stick ++ /schemas/apps/panel/objects/panel_right_stick ++ ++ true ++ ++ ++ ++ applets/fast_user_switch/locked ++ /schemas/apps/panel/objects/locked ++ ++ true ++ ++ ++ ++ applets/fast_user_switch/bonobo_iid ++ /schemas/apps/panel/objects/bonobo_iid ++ ++ OAFIID:GNOME_FastUserSwitchApplet ++ ++ ++ ++ applets/fast_user_switch/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id ++ applets/fast_user_switch/tooltip/schemas/apps/panel/objects/tooltip ++ applets/fast_user_switch/use_custom_icon/schemas/apps/panel/objects/use_custom_icon ++ applets/fast_user_switch/custom_icon/schemas/apps/panel/objects/custom_icon ++ applets/fast_user_switch/use_menu_path/schemas/apps/panel/objects/use_menu_path ++ applets/fast_user_switch/menu_path/schemas/apps/panel/objects/menu_path ++ applets/fast_user_switch/launcher_location/schemas/apps/panel/objects/launcher_location ++ applets/fast_user_switch/action_type/schemas/apps/panel/objects/action_type + + + +@@ -618,7 +678,7 @@ + applets/workspace_switcher/position + /schemas/apps/panel/objects/position + +- 0 ++ 1 + + + +@@ -652,6 +712,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.27.92.orig/debian/patches/20_fusa_migration_note_i18n.patch +++ gnome-panel-2.27.92/debian/patches/20_fusa_migration_note_i18n.patch @@ -0,0 +1,14 @@ +=== modified file 'po/POTFILES.in' +Index: gnome-panel-2.27.92/po/POTFILES.in +=================================================================== +--- gnome-panel-2.27.92.orig/po/POTFILES.in 2009-09-09 13:06:09.000000000 +0200 ++++ gnome-panel-2.27.92/po/POTFILES.in 2009-09-09 13:06:11.000000000 +0200 +@@ -1,6 +1,8 @@ + # List of source files containing translatable strings. + # Please keep this file sorted alphabetically. + [encoding: UTF-8] ++[type: gettext/rfc822deb]debian/fusa-applet.note.in ++debian/migrate-fusa-config.py + applets/clock/GNOME_ClockApplet.xml + applets/clock/GNOME_ClockApplet_Factory.server.in.in + applets/clock/calendar-client.c --- gnome-panel-2.27.92.orig/debian/patches/17_about-ubuntu-translation.patch +++ gnome-panel-2.27.92/debian/patches/17_about-ubuntu-translation.patch @@ -0,0 +1,9 @@ +Index: gnome-panel-2.27.92/po/POTFILES.in +=================================================================== +--- gnome-panel-2.27.92.orig/po/POTFILES.in 2009-08-11 17:18:52.000000000 +0200 ++++ gnome-panel-2.27.92/po/POTFILES.in 2009-09-09 13:06:09.000000000 +0200 +@@ -79,3 +79,4 @@ + libpanel-applet/GNOME_Panel_TestApplet.server.in + libpanel-applet/panel-test-applets.c + [type: gettext/glade]libpanel-applet/panel-test-applets.ui ++debian/ubuntu-about.desktop.in --- gnome-panel-2.27.92.orig/debian/patches/30_disable-initial-animation.patch +++ gnome-panel-2.27.92/debian/patches/30_disable-initial-animation.patch @@ -0,0 +1,58 @@ +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=575938 +# Patch: http://bugzilla.gnome.org/attachment.cgi?id=130957&action=view +# Description: allow the initial animation to be disabled +# +Index: gnome-panel-2.27.92/config.h.in +=================================================================== +--- gnome-panel-2.27.92.orig/config.h.in 2009-09-09 02:26:37.000000000 +0200 ++++ gnome-panel-2.27.92/config.h.in 2009-09-09 13:06:14.000000000 +0200 +@@ -3,6 +3,9 @@ + /* Defined when compiling the clock applet in-process */ + #undef CLOCK_INPROCESS + ++/* Define to disable initial animation */ ++#undef DISABLE_INITIAL_ANIMATION ++ + /* always defined to indicate that i18n is enabled */ + #undef ENABLE_NLS + +Index: gnome-panel-2.27.92/configure.in +=================================================================== +--- gnome-panel-2.27.92.orig/configure.in 2009-09-09 02:22:57.000000000 +0200 ++++ gnome-panel-2.27.92/configure.in 2009-09-09 13:06:14.000000000 +0200 +@@ -220,6 +220,15 @@ + fi; fi; fi; fi + done + ++# Make it possible to disable initial slide-in animation ++AC_ARG_ENABLE(initial-animation, ++ AC_HELP_STRING([--disable-initial-animation], ++ [disable the initial slide-in animation of panels]), ++ [AS_IF([test "x$enable_initial_animation" = xno], ++ [AC_DEFINE([DISABLE_INITIAL_ANIMATION], [1], ++ [Define to disable initial animation])])], ++ []) ++ + AM_CONDITIONAL(CLOCK_INPROCESS, test -n "$CLOCK_COMPILE_INPROCESS") + AM_CONDITIONAL(FISH_INPROCESS, test -n "$FISH_COMPILE_INPROCESS") + AM_CONDITIONAL(NOTIFICATION_AREA_INPROCESS, test -n "$NOTIFICATION_AREA_COMPILE_INPROCESS") +Index: gnome-panel-2.27.92/gnome-panel/panel-toplevel.c +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/panel-toplevel.c 2009-08-21 12:31:49.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/panel-toplevel.c 2009-09-09 13:06:14.000000000 +0200 +@@ -2936,6 +2936,7 @@ + static void + panel_toplevel_initially_hide (PanelToplevel *toplevel) + { ++#ifndef DISABLE_INITIAL_ANIMATION + if (!toplevel->priv->attached) { + toplevel->priv->initial_animation_done = FALSE; + +@@ -2945,6 +2946,7 @@ + toplevel->priv->state = PANEL_STATE_AUTO_HIDDEN; + gtk_widget_queue_resize (GTK_WIDGET (toplevel)); + } else ++#endif /* DISABLE_INITIAL_ANIMATION */ + toplevel->priv->initial_animation_done = TRUE; + } + --- gnome-panel-2.27.92.orig/debian/patches/25_inode_directory_fixup.patch +++ gnome-panel-2.27.92/debian/patches/25_inode_directory_fixup.patch @@ -0,0 +1,46 @@ +=== modified file 'gnome-panel/main.c' +Index: gnome-panel-2.27.92/gnome-panel/main.c +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/main.c 2009-09-09 13:06:08.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/main.c 2009-09-09 13:06:12.000000000 +0200 +@@ -110,6 +110,40 @@ + * connecting to the session manager */ + panel_session_init (); + ++ /* ubuntu specifc cleanup for bug #260492 - this needs to be kept ++ * until the next LTS after hardy (8.04) is released ++ */ ++ GAppInfo *app, *new_app = NULL; ++ GConfClient *gc = gconf_client_get_default(); ++ GList *l_start, *l; ++ if(gconf_client_get_bool(gc, "/apps/panel/need_directory_fixup", NULL)) ++ { ++ app = g_app_info_get_default_for_type ("inode/directory", FALSE); ++ if(app && strcmp(g_app_info_get_id(app), "nautilus-folder-handler.desktop") != 0) ++ { ++ g_message("inode/directory points to '%s' - fixing", g_app_info_get_id(app)); ++ l_start = l = g_app_info_get_all_for_type("inode/directory"); ++ while(l != NULL) ++ { ++ if(strcmp(g_app_info_get_id(G_APP_INFO(l->data)), ++ "nautilus-folder-handler.desktop") == 0) ++ new_app = g_app_info_dup(l->data); ++ g_object_unref(G_OBJECT(l->data)); ++ l=g_list_next(l); ++ } ++ if(new_app) ++ { ++ g_app_info_set_as_default_for_type (new_app, "inode/directory", NULL); ++ g_object_unref(new_app); ++ } ++ g_list_free(l_start); ++ g_object_unref(app); ++ } ++ gconf_client_set_bool(gc, "/apps/panel/need_directory_fixup", FALSE, NULL); ++ } ++ g_object_unref(gc); ++ /* end of ubuntu specific code */ ++ + gtk_main (); + + panel_lockdown_finalize (); --- gnome-panel-2.27.92.orig/debian/patches/18_lockdown_lock_editor.patch +++ gnome-panel-2.27.92/debian/patches/18_lockdown_lock_editor.patch @@ -0,0 +1,35 @@ +# Description: lockdown locks the menu editor entry too +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=499148 +# Ubuntu: https://bugs.launchpad.net/bugs/4712 +Index: gnome-panel-2.27.92/gnome-panel/panel-menu-bar.c +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/panel-menu-bar.c 2009-09-08 02:08:42.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/panel-menu-bar.c 2009-09-09 13:06:10.000000000 +0200 +@@ -345,8 +345,9 @@ + _("_Help"), + NULL); + +- if (panel_is_program_in_path ("alacarte") || +- panel_is_program_in_path ("gmenu-simple-editor")) { ++ if (!panel_lockdown_get_locked_down () && ++ (panel_is_program_in_path ("alacarte") || ++ panel_is_program_in_path ("gmenu-simple-editor"))) { + panel_applet_add_callback (menubar->priv->info, + "edit", + NULL, +Index: gnome-panel-2.27.92/gnome-panel/panel-menu-button.c +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/panel-menu-button.c 2009-09-08 02:08:42.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/panel-menu-button.c 2009-09-09 13:06:10.000000000 +0200 +@@ -663,8 +663,9 @@ + + panel_applet_add_callback (info, "help", GTK_STOCK_HELP, _("_Help"), NULL); + +- if (panel_is_program_in_path ("alacarte") || +- panel_is_program_in_path ("gmenu-simple-editor")) ++ if (!panel_lockdown_get_locked_down () && ++ (panel_is_program_in_path ("alacarte") || ++ panel_is_program_in_path ("gmenu-simple-editor"))) + panel_applet_add_callback (info, "edit", NULL, + _("_Edit Menus"), NULL); + --- gnome-panel-2.27.92.orig/debian/patches/70_relibtoolize.patch +++ gnome-panel-2.27.92/debian/patches/70_relibtoolize.patch @@ -0,0 +1,21140 @@ +diff -Nur gnome-panel-2.27.92/aclocal.m4 gnome-panel-2.27.92.ubuntu/aclocal.m4 +--- gnome-panel-2.27.92/aclocal.m4 2009-09-09 02:26:32.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/aclocal.m4 2009-09-09 13:08:19.000000000 +0200 +@@ -13,2102 +13,2102 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +-[m4_warning([this file was generated for autoconf 2.63. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, ++[m4_warning([this file was generated for autoconf 2.64. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 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. +-# (This private macro should not be called outside this file.) +-AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.11' +-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +-dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11], [], +- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +-]) ++AC_DEFUN([AM_GCONF_SOURCE_2], ++[ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi + +-# _AM_AUTOCONF_VERSION(VERSION) +-# ----------------------------- +-# aclocal traces this macro to find the Autoconf version. +-# This is a private macro too. Using m4_define simplifies +-# the logic in aclocal, which can simply ignore this definition. +-m4_define([_AM_AUTOCONF_VERSION], []) ++ AC_ARG_WITH([gconf-source], ++ AC_HELP_STRING([--with-gconf-source=sourceaddress], ++ [Config database for installing schema files.]), ++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) + +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11])dnl +-m4_ifndef([AC_AUTOCONF_VERSION], +- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) ++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) + +-# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ AC_ARG_WITH([gconf-schema-file-dir], ++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir], ++ [Directory for installing schema files.]), ++ [GCONF_SCHEMA_FILE_DIR="$withval"],) + +-# 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_SUBST(GCONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ ++ AC_ARG_ENABLE(schemas-install, ++ AC_HELP_STRING([--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, 2006, 2008 +-# 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 9 ++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])dnl +-AC_SUBST([$1_FALSE])dnl +-_AM_SUBST_NOTMAKE([$1_TRUE])dnl +-_AM_SUBST_NOTMAKE([$1_FALSE])dnl +-m4_define([_AM_COND_VALUE_$1], [$2])dnl +-if $2; then +- $1_TRUE= +- $1_FALSE='#' ++# GLIB_LC_MESSAGES ++#-------------------- ++glib_DEFUN([GLIB_LC_MESSAGES], ++ [AC_CHECK_HEADERS([locale.h]) ++ if test $ac_cv_header_locale_h = yes; then ++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++ [AC_TRY_LINK([#include ], [return LC_MESSAGES], ++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ AC_DEFINE(HAVE_LC_MESSAGES, 1, ++ [Define if your file defines LC_MESSAGES.]) ++ fi ++ fi]) ++ ++# GLIB_PATH_PROG_WITH_TEST ++#---------------------------- ++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, ++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], ++[# Extract the first word of "$2", so it can be a program name with args. ++set dummy $2; ac_word=[$]2 ++AC_MSG_CHECKING([for $ac_word]) ++AC_CACHE_VAL(ac_cv_path_$1, ++[case "[$]$1" in ++ /*) ++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in ifelse([$5], , $PATH, [$5]); do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if [$3]; then ++ ac_cv_path_$1="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++dnl If no 4th arg is given, leave the cache variable unset, ++dnl so AC_PATH_PROGS will keep looking. ++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ++])dnl ++ ;; ++esac])dnl ++$1="$ac_cv_path_$1" ++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then ++ AC_MSG_RESULT([$]$1) + else +- $1_TRUE='#' +- $1_FALSE= ++ AC_MSG_RESULT(no) + fi +-AC_CONFIG_COMMANDS_PRE( +-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([[conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]]) +-fi])]) +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++AC_SUBST($1)dnl ++]) + +-# serial 10 ++# GLIB_WITH_NLS ++#----------------- ++glib_DEFUN([GLIB_WITH_NLS], ++ dnl NLS is obligatory ++ [USE_NLS=yes ++ AC_SUBST(USE_NLS) + +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++ gt_cv_have_gettext=no + ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl +- +-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], UPC, [depcc="$UPC" am_compiler_list=], +- [$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 +- am__universal=false +- m4_case([$1], [CC], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac], +- [CXX], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac]) +- +- 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 ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" + +- # 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. Also, some Intel +- # versions had trouble with output in subdirs +- am__obj=sub/conftest.${OBJEXT-o} +- am__minus_obj="-o $am__obj" +- case $depmode in +- gcc) +- # This depmode causes a compiler race in universal mode. +- test "$am__universal" = false || continue +- ;; +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break ++ # ++ # First check in libc ++ # ++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !ngettext ("","", 1)], ++ gt_cv_func_ngettext_libc=yes, ++ gt_cv_func_ngettext_libc=no) ++ ]) ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !dgettext ("","")], ++ gt_cv_func_dgettext_libc=yes, ++ gt_cv_func_dgettext_libc=no) ++ ]) + fi +- ;; +- msvisualcpp | msvcmsys) +- # This compiler won't grok `-c -o', but also, the minuso test has +- # not run yet. These depmodes are late enough in the game, and +- # so weak that their functioning should not be impacted. +- am__obj=conftest.${OBJEXT-o} +- am__minus_obj= +- ;; +- none) break ;; +- esac +- if depmode=$depmode \ +- source=sub/conftest.c object=$am__obj \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CHECK_FUNCS(bind_textdomain_codeset) + fi +- fi +- done +- +- cd .. +- rm -rf conftest.dir +-else +- am_cv_$1_dependencies_compiler_type=none +-fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) +- +- +-# 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 +-]) +- + +-# 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 +-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +-]) +- +-# Generate code to set up dependency tracking. -*- Autoconf -*- +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +-# 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 5 ++ # ++ # 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)])]) + +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[{ +- # Autoconf 2.62 quotes --file arguments for eval, but not when files +- # are listed without --file. Let's play safe and only enable the eval +- # if we detect the quoting. +- case $CONFIG_FILES in +- *\'*) eval set x "$CONFIG_FILES" ;; +- *) set x $CONFIG_FILES ;; +- esac +- shift +- for mf +- 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. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/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 ++ 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" + +-# 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"]) +-]) ++ 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 + +-# 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. ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ AC_DEFINE(HAVE_GETTEXT,1, ++ [Define if the GNU gettext() function is already present or preinstalled.]) ++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ AC_CHECK_FUNCS(dcgettext) ++ MSGFMT_OPTS= ++ AC_MSG_CHECKING([if msgfmt accepts -c]) ++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test \n" ++"Language-Team: C \n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) ++ AC_SUBST(MSGFMT_OPTS) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share and ++ dnl and CATOBJEXT=.gmo in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [CATOBJEXT=.mo ++ DATADIRNAME=lib]) ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac]) ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi ++ fi ++ ]) + +-# serial 8 ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [always defined to indicate that i18n is enabled]) ++ fi + +-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++ 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 + +-# Do all the work for Automake. -*- Autoconf -*- ++ # We need to process the po/ directory. ++ POSUB=po + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2008, 2009 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_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) + +-# serial 16 ++ 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 + +-# This macro actually does too much. Some checks are only needed if +-# your package does certain things. But this isn't really a big deal. ++ dnl Make all variables we use known to autoconf. ++ AC_SUBST(CATALOGS) ++ AC_SUBST(CATOBJEXT) ++ AC_SUBST(DATADIRNAME) ++ AC_SUBST(GMOFILES) ++ AC_SUBST(INSTOBJEXT) ++ AC_SUBST(INTLLIBS) ++ AC_SUBST(PO_IN_DATADIR_TRUE) ++ AC_SUBST(PO_IN_DATADIR_FALSE) ++ AC_SUBST(POFILES) ++ AC_SUBST(POSUB) ++ ]) + +-# AM_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.62])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 +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +- fi +-fi ++# 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 + +-# 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]) ++ 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 + +-# 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 +-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++ 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 + +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++ 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) + +-# 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) +-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +-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_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +-]) +-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +-AC_CONFIG_COMMANDS_PRE(dnl +-[m4_provide_if([_AM_COMPILER_EXEEXT], +- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +-]) ++ 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 ++ ]) + +-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +-dnl mangled by Autoconf and run in a shell conditional statement. +-m4_define([_AC_COMPILER_EXEEXT], +-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) ++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) ++# ------------------------------- ++# Define VARIABLE to the location where catalog files will ++# be installed by po/Makefile. ++glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl ++glib_save_prefix="$prefix" ++glib_save_exec_prefix="$exec_prefix" ++glib_save_datarootdir="$datarootdir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++datarootdir=`eval echo "${datarootdir}"` ++if test "x$CATOBJEXT" = "x.mo" ; then ++ localedir=`eval echo "${libdir}/locale"` ++else ++ localedir=`eval echo "${datadir}/locale"` ++fi ++prefix="$glib_save_prefix" ++exec_prefix="$glib_save_exec_prefix" ++datarootdir="$glib_save_datarootdir" ++AC_DEFINE_UNQUOTED($1, "$localedir", ++ [Define the location where the catalogs will be installed]) ++]) + ++dnl ++dnl Now the definitions that aclocal will find ++dnl ++ifdef(glib_configure_in,[],[ ++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) ++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ++])dnl + +-# 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. ++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) ++# ++# Create a temporary file with TEST-FILE as its contents and pass the ++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with ++# 0 and perform ACTION-IF-FAIL for any other exit status. ++AC_DEFUN([GLIB_RUN_PROG], ++[cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) + +-# 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_arg=$1 +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $_am_arg | $_am_arg:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +-# +-# 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. ++# gnome-common.m4 ++# + +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-if test x"${install_sh}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; +- *) +- install_sh="\${SHELL} $am_aux_dir/install-sh" +- esac +-fi +-AC_SUBST(install_sh)]) ++dnl GNOME_COMMON_INIT + +-# 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. ++AC_DEFUN([GNOME_COMMON_INIT], ++[ ++ dnl this macro should come after AC_CONFIG_MACRO_DIR ++ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) + +-# serial 2 ++ 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 + +-# 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_SUBST([ACLOCAL_AMFLAGS]) ++]) + +-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +-# From Jim Meyering ++AC_DEFUN([GNOME_DEBUG_CHECK], ++[ ++ AC_ARG_ENABLE([debug], ++ AC_HELP_STRING([--enable-debug], ++ [turn on debugging]),, ++ [enable_debug=no]) + +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +-# 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$enable_debug = xyes ; then ++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1, ++ [Enable additional debugging at the expense of performance and size]) ++ fi ++]) + +-# serial 5 ++dnl GNOME_MAINTAINER_MODE_DEFINES () ++dnl define DISABLE_DEPRECATED ++dnl ++AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], ++[ ++ AC_REQUIRE([AM_MAINTAINER_MODE]) + +-# AM_MAINTAINER_MODE([DEFAULT-MODE]) +-# ---------------------------------- +-# Control maintainer-specific portions of Makefiles. +-# Default is to disable them, unless `enable' is passed literally. +-# For symmetry, `disable' may be passed as well. Anyway, the user +-# can override the default with the --enable/--disable switch. +-AC_DEFUN([AM_MAINTAINER_MODE], +-[m4_case(m4_default([$1], [disable]), +- [enable], [m4_define([am_maintainer_other], [disable])], +- [disable], [m4_define([am_maintainer_other], [enable])], +- [m4_define([am_maintainer_other], [enable]) +- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +- dnl maintainer-mode's default is 'disable' unless 'enable' is passed +- AC_ARG_ENABLE([maintainer-mode], +-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- [USE_MAINTAINER_MODE=$enableval], +- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) +- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) +- MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST([MAINT])dnl +-] +-) ++ if test $USE_MAINTAINER_MODE = yes; then ++ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED" ++ else ++ DISABLE_DEPRECATED="" ++ fi ++ AC_SUBST(DISABLE_DEPRECATED) ++]) + +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++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 ****************************** + +-# Check to see how 'make' treats includes. -*- Autoconf -*- ++ 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])"]) + +-# Copyright (C) 2001, 2002, 2003, 2005, 2009 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. ++ warnCFLAGS= ++ if test "x$GCC" != xyes; then ++ enable_compile_warnings=no ++ fi + +-# serial 4 ++ warning_flags= ++ realsave_CFLAGS="$CFLAGS" + +-# 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 this is the am__doit target +-.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 +-# Ignore all kinds of additional output from `make'. +-case `$am_make -s -f confmf 2> /dev/null` in #( +-*the\ am__doit\ target*) +- am__include=include +- am__quote= +- _am_result=GNU +- ;; +-esac +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- case `$am_make -s -f confmf 2> /dev/null` in #( +- *the\ am__doit\ target*) +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- ;; +- esac +-fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf +-]) ++ 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) 1999, 2000, 2001, 2003, 2004, 2005, 2008 +-# 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]) + +-# serial 6 ++ 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) + +-# AM_PROG_CC_C_O +-# -------------- +-# Like AC_PROG_CC_C_O, but changed for automake. +-AC_DEFUN([AM_PROG_CC_C_O], +-[AC_REQUIRE([AC_PROG_CC_C_O])dnl +-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([compile])dnl +-# FIXME: we rely on the cache variable name because +-# there is no other way. +-set dummy $CC +-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +-if test "$am_t" != yes; then +- # Losing compiler, so override with the script. +- # FIXME: It is wrong to rewrite CC. +- # But if we don't then we get into trouble of one sort or another. +- # A longer-term fix would be to have automake use am__CC in this case, +- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" +- CC="$am_aux_dir/compile $CC" +-fi +-dnl Make sure AC_PROG_CC is never called again, or it will override our +-dnl setting of CC. +-m4_define([AC_PROG_CC], +- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) ++ WARN_CFLAGS="$warning_flags $complCFLAGS" ++ AC_SUBST(WARN_CFLAGS) + ]) + +-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++dnl For C++, do basically the same thing. + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +-# 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_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])"]) + +-# serial 6 ++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) ++ warnCXXFLAGS= ++ if test "x$GXX" != xyes; then ++ enable_cxx_warnings=no ++ fi ++ if test "x$enable_cxx_warnings" != "xno"; then ++ if test "x$GXX" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-Wall[\ \ ]*) ;; ++ *) warnCXXFLAGS="-Wall -Wno-unused" ;; ++ esac + +-# 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)]) ++ ## -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) + ++ AC_ARG_ENABLE(iso-cxx, ++ AC_HELP_STRING([--enable-iso-cxx], ++ [Try to warn if code is not ISO C++ ]),, ++ [enable_iso_cxx=no]) + +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([missing])dnl +-if test x"${MISSING+set}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +- *) +- MISSING="\${SHELL} $am_aux_dir/missing" ;; +- esac +-fi +-# 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_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) ++ complCXXFLAGS= ++ if test "x$enable_iso_cxx" != "xno"; then ++ if test "x$GXX" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; ++ esac + +-# Copyright (C) 2003, 2004, 2005, 2006 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. ++ case " $CXXFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; ++ esac ++ fi ++ fi ++ AC_MSG_RESULT($complCXXFLAGS) + +-# AM_PROG_MKDIR_P +-# --------------- +-# Check for `mkdir -p'. +-AC_DEFUN([AM_PROG_MKDIR_P], +-[AC_PREREQ([2.60])dnl +-AC_REQUIRE([AC_PROG_MKDIR_P])dnl +-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +-dnl while keeping a definition of mkdir_p for backward compatibility. +-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +-dnl Makefile.ins that do not define MKDIR_P, so we do our own +-dnl adjustment using top_builddir (which is defined more often than +-dnl MKDIR_P). +-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +-case $mkdir_p in +- [[\\/$]]* | ?:[[\\/]]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac ++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" ++ AC_SUBST(WARN_CXXFLAGS) + ]) + +-# Helper functions for option handling. -*- Autoconf -*- ++# nls.m4 serial 3 (gettext-0.15) ++dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++dnl ++dnl This file can can be used in projects which are not available under ++dnl the GNU General Public License or the GNU Library General Public ++dnl License but which still want to provide support for the GNU gettext ++dnl functionality. ++dnl Please note that the actual code of the GNU gettext library is covered ++dnl by the GNU Library General Public License, and the rest of the GNU ++dnl gettext package package is covered by the GNU General Public License. ++dnl They are *not* in the public domain. + +-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. ++dnl Authors: ++dnl Ulrich Drepper , 1995-2000. ++dnl Bruno Haible , 2000-2003. ++ ++AC_PREREQ(2.50) ++ ++AC_DEFUN([AM_NLS], ++[ ++ AC_MSG_CHECKING([whether NLS is requested]) ++ dnl Default is enabled NLS ++ AC_ARG_ENABLE(nls, ++ [ --disable-nls do not use Native Language Support], ++ USE_NLS=$enableval, USE_NLS=yes) ++ AC_MSG_RESULT($USE_NLS) ++ AC_SUBST(USE_NLS) ++]) ++ ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant . + # +-# 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 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. + +-# serial 4 ++# 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 ++ ++# 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 ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG + +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED + +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 +-# Free Software Foundation, Inc. ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) + # +-# 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_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +-# --------------------------------------------------------------------------- +-# Adds support for distributing Python modules and packages. To +-# install modules, copy them to $(pythondir), using the python_PYTHON +-# automake variable. To install a package with the same name as the +-# automake package, install to $(pkgpythondir), or use the +-# pkgpython_PYTHON automake variable. + # +-# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as +-# locations to install python extension modules (shared libraries). +-# Another macro is required to find the appropriate flags to compile +-# extension modules. ++# 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 + # +-# If your package is configured with a different prefix to python, +-# users will have to add the install directory to the PYTHONPATH +-# environment variable, or create a .pth file (see the python +-# documentation for details). + # +-# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will +-# cause an error if the version of python installed on the system +-# doesn't meet the requirement. MINIMUM-VERSION should consist of +-# numbers and dots only. +-AC_DEFUN([AM_PATH_PYTHON], +- [ +- dnl Find a Python interpreter. Python versions prior to 2.0 are not +- dnl supported. (2.0 was released on October 16, 2000). +- m4_define_default([_AM_PYTHON_INTERPRETER_LIST], +- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl +-python2.1 python2.0]) ++# -------------------------------------------------------------- ++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 + +- m4_if([$1],[],[ +- dnl No version check is needed. +- # Find any Python interpreter. +- if test -z "$PYTHON"; then +- AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) +- fi +- am_display_PYTHON=python +- ], [ +- dnl A version check is needed. +- if test -n "$PYTHON"; then +- # If the user set $PYTHON, use it and don't search something else. +- AC_MSG_CHECKING([whether $PYTHON version >= $1]) +- AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], +- [AC_MSG_RESULT(yes)], +- [AC_MSG_ERROR(too old)]) +- am_display_PYTHON=$PYTHON +- else +- # Otherwise, try each interpreter until we find one that satisfies +- # VERSION. +- AC_CACHE_CHECK([for a Python interpreter with version >= $1], +- [am_cv_pathless_PYTHON],[ +- for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do +- test "$am_cv_pathless_PYTHON" = none && break +- AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) +- done]) +- # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. +- if test "$am_cv_pathless_PYTHON" = none; then +- PYTHON=: +- else +- AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) +- fi +- am_display_PYTHON=$am_cv_pathless_PYTHON +- fi +- ]) ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) + +- if test "$PYTHON" = :; then +- dnl Run any user-specified action, or abort. +- m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) +- else ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +- dnl Query Python for its version number. Getting [:3] seems to be +- dnl the best way to do this; it's what "site.py" does in the standard +- dnl library. ++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.]) + +- AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], +- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) +- AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) ++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 + +- dnl Use the values of $prefix and $exec_prefix for the corresponding +- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made +- dnl distinct variables so they can be overridden if need be. However, +- dnl general consensus is that you shouldn't need this ability. ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: + +- AC_SUBST([PYTHON_PREFIX], ['${prefix}']) +- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) ++$$1_PKG_ERRORS + +- dnl At times (like when building shared libraries) you may want +- dnl to know which OS platform Python thinks this is. ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + +- AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], +- [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) +- AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) ++_PKG_TEXT ++])], ++ [AC_MSG_RESULT([no]) ++ $4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. + ++_PKG_TEXT + +- dnl Set up 4 directories: ++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 + +- dnl pythondir -- where to install python scripts. This is the +- dnl site-packages directory, not the python standard library +- dnl directory like in previous automake betas. This behavior +- dnl is more consistent with lispdir.m4 for example. +- dnl Query distutils for this directory. distutils does not exist in +- dnl Python 1.5, so we fall back to the hardcoded directory if it +- dnl doesn't work. +- AC_CACHE_CHECK([for $am_display_PYTHON script directory], +- [am_cv_python_pythondir], +- [if test "x$prefix" = xNONE +- then +- am_py_prefix=$ac_default_prefix +- else +- am_py_prefix=$prefix +- fi +- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || +- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` +- case $am_cv_python_pythondir in +- $am_py_prefix*) +- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` +- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` +- ;; +- esac +- ]) +- AC_SUBST([pythondir], [$am_cv_python_pythondir]) ++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 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 pkgpythondir -- $PACKAGE directory under pythondir. Was +- dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is +- dnl more consistent with the rest of automake. ++# 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. ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.11' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.11], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) + +- AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) + +- dnl pyexecdir -- directory for installing python extension modules +- dnl (shared libraries) +- dnl Query distutils for this directory. distutils does not exist in +- dnl Python 1.5, so we fall back to the hardcoded directory if it +- dnl doesn't work. +- AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], +- [am_cv_python_pyexecdir], +- [if test "x$exec_prefix" = xNONE +- then +- am_py_exec_prefix=$am_py_prefix +- else +- am_py_exec_prefix=$exec_prefix +- fi +- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || +- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` +- case $am_cv_python_pyexecdir in +- $am_py_exec_prefix*) +- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` +- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` +- ;; +- esac +- ]) +- AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++[AM_AUTOMAKE_VERSION([1.11])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +- dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +- AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) ++# 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. + +- dnl Run any user-specified action. +- $2 +- 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/../..'. ++# ++# 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. + ++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 -*- + +-# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +-# --------------------------------------------------------------------------- +-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. +-# Run ACTION-IF-FALSE otherwise. +-# This test uses sys.hexversion instead of the string equivalent (first +-# word of sys.version), in order to cope with versions such as 2.2c1. +-# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). +-AC_DEFUN([AM_PYTHON_CHECK_VERSION], +- [prog="import sys +-# split strings by '.' and convert to numeric. Append some zeros +-# because we need at least 4 digits for the hex conversion. +-# map returns an iterator in Python 3.0 and a list in 2.x +-minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] +-minverhex = 0 +-# xrange is not present in Python 3.0 and range returns an iterator +-for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] +-sys.exit(sys.hexversion < minverhex)" +- AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 ++# 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. + +-# Check to make sure that the build environment is sane. -*- Autoconf -*- ++# serial 9 + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 ++# 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])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++m4_define([_AM_COND_VALUE_$1], [$2])dnl ++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])]) ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 + # 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 5 ++# serial 10 + +-# 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 +-# Reject unsafe characters in $srcdir or the absolute working directory +-# name. Accept space and tab only in the latter. +-am_lf=' +-' +-case `pwd` in +- *[[\\\"\#\$\&\'\`$am_lf]]*) +- AC_MSG_ERROR([unsafe absolute working directory name]);; +-esac +-case $srcdir in +- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) +- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +-esac ++# 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... + +-# 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 + +- # 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 ++# _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], UPC, [depcc="$UPC" am_compiler_list=], ++ [$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 ++ am__universal=false ++ m4_case([$1], [CC], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac], ++ [CXX], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac]) ++ ++ 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 ++ ++ # 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. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj 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 + +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : ++ cd .. ++ rm -rf conftest.dir + else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) ++ am_cv_$1_dependencies_compiler_type=none + fi +-AC_MSG_RESULT(yes)]) +- +-# Copyright (C) 2009 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++]) ++AC_SUBST([$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]) ++]) + +-# serial 1 + +-# AM_SILENT_RULES([DEFAULT]) +-# -------------------------- +-# Enable less verbose build rules; with the default set to DEFAULT +-# (`yes' being less verbose, `no' or empty being verbose). +-AC_DEFUN([AM_SILENT_RULES], +-[AC_ARG_ENABLE([silent-rules], +-[ --enable-silent-rules less verbose build output (undo: `make V=1') +- --disable-silent-rules verbose build output (undo: `make V=0')]) +-case $enable_silent_rules in +-yes) AM_DEFAULT_VERBOSITY=0;; +-no) AM_DEFAULT_VERBOSITY=1;; +-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +-esac +-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +-AM_BACKSLASH='\' +-AC_SUBST([AM_BACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++# 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 + ]) + +-# 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. + +-# 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], :) ++# 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 +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) +- +-# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 2 +- +-# _AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +-# This macro is traced by Automake. +-AC_DEFUN([_AM_SUBST_NOTMAKE]) +- +-# AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Public sister of _AM_SUBST_NOTMAKE. +-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++]) + +-# Check how to create a tarball. -*- Autoconf -*- ++# Generate code to set up dependency tracking. -*- Autoconf -*- + +-# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 ++#serial 5 + +-# _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 +- ;; ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[{ ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; + esac ++ shift ++ for mf ++ 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. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/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 + +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break +- +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir + +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +-AC_SUBST([am__tar]) +-AC_SUBST([am__untar]) +-]) # _AM_PROG_TAR ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. ++# ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) + +-dnl 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 ++# 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. + +-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 ++# serial 8 + +- AC_ARG_WITH([gconf-source], +- AC_HELP_STRING([--with-gconf-source=sourceaddress], +- [Config database for installing schema files.]), +- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) ++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) +- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++# Do all the work for Automake. -*- Autoconf -*- + +- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' +- fi ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008, 2009 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_WITH([gconf-schema-file-dir], +- AC_HELP_STRING([--with-gconf-schema-file-dir=dir], +- [Directory for installing schema files.]), +- [GCONF_SCHEMA_FILE_DIR="$withval"],) ++# serial 16 + +- AC_SUBST(GCONF_SCHEMA_FILE_DIR) +- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++# 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_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]) +-]) ++# 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.62])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 ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi ++fi + +-# 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) ++# 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 +-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 ++# 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 ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +-# 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]) ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +-# 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 ++# 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) ++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl ++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_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++]) ++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl ++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the ++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro ++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. ++AC_CONFIG_COMMANDS_PRE(dnl ++[m4_provide_if([_AM_COMPILER_EXEEXT], ++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + ]) + +-# 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="" +- +- # +- # 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)])]) ++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not ++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further ++dnl mangled by Autoconf and run in a shell conditional statement. ++m4_define([_AC_COMPILER_EXEEXT], ++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +- 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" ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. + +- if test "$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 ++# 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_arg=$1 ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $_am_arg | $_am_arg:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- || test "$gt_cv_func_dgettext_libintl" = "yes"; then +- gt_cv_have_gettext=yes +- fi +- +- if test "$gt_cv_func_dgettext_libintl" = "yes"; then +- INTLLIBS="-lintl $libintl_extra_libs" +- fi +- +- if test "$gt_cv_have_gettext" = "yes"; then +- AC_DEFINE(HAVE_GETTEXT,1, +- [Define if the GNU gettext() function is already present or preinstalled.]) +- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl +- if test "$MSGFMT" != "no"; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS $INTLLIBS" +- AC_CHECK_FUNCS(dcgettext) +- MSGFMT_OPTS= +- AC_MSG_CHECKING([if msgfmt accepts -c]) +- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +-msgid "" +-msgstr "" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Project-Id-Version: test 1.0\n" +-"PO-Revision-Date: 2007-02-15 12:01+0100\n" +-"Last-Translator: test \n" +-"Language-Team: C \n" +-"MIME-Version: 1.0\n" +-"Content-Transfer-Encoding: 8bit\n" +-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) +- AC_SUBST(MSGFMT_OPTS) +- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) +- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr], +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [case $host in +- *-*-solaris*) +- dnl On Solaris, if bind_textdomain_codeset is in libc, +- dnl GNU format message catalog is always supported, +- dnl since both are added to the libc all together. +- dnl Hence, we'd like to go with DATADIRNAME=share and +- dnl and CATOBJEXT=.gmo in this case. +- AC_CHECK_FUNC(bind_textdomain_codeset, +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [CATOBJEXT=.mo +- DATADIRNAME=lib]) +- ;; +- *) +- CATOBJEXT=.mo +- DATADIRNAME=lib +- ;; +- esac]) +- LIBS="$glib_save_LIBS" +- INSTOBJEXT=.mo +- else +- gt_cv_have_gettext=no +- fi +- fi +- ]) ++# Copyright (C) 2001, 2003, 2005, 2008 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 "$gt_cv_have_gettext" = "yes" ; then +- AC_DEFINE(ENABLE_NLS, 1, +- [always defined to indicate that i18n is enabled]) +- fi ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi ++AC_SUBST(install_sh)]) + +- 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 ++# 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. + +- # We need to process the po/ directory. +- POSUB=po ++# serial 2 + +- AC_OUTPUT_COMMANDS( +- [case "$CONFIG_FILES" in *po/Makefile.in*) +- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +- esac]) ++# 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])]) + +- 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 ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering + +- dnl Make all variables we use known to autoconf. +- AC_SUBST(CATALOGS) +- AC_SUBST(CATOBJEXT) +- AC_SUBST(DATADIRNAME) +- AC_SUBST(GMOFILES) +- AC_SUBST(INSTOBJEXT) +- AC_SUBST(INTLLIBS) +- AC_SUBST(PO_IN_DATADIR_TRUE) +- AC_SUBST(PO_IN_DATADIR_FALSE) +- AC_SUBST(POFILES) +- AC_SUBST(POSUB) +- ]) ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# 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 5 + +- 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_MAINTAINER_MODE([DEFAULT-MODE]) ++# ---------------------------------- ++# Control maintainer-specific portions of Makefiles. ++# Default is to disable them, unless `enable' is passed literally. ++# For symmetry, `disable' may be passed as well. Anyway, the user ++# can override the default with the --enable/--disable switch. ++AC_DEFUN([AM_MAINTAINER_MODE], ++[m4_case(m4_default([$1], [disable]), ++ [enable], [m4_define([am_maintainer_other], [disable])], ++ [disable], [m4_define([am_maintainer_other], [enable])], ++ [m4_define([am_maintainer_other], [enable]) ++ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) ++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed ++ AC_ARG_ENABLE([maintainer-mode], ++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ [USE_MAINTAINER_MODE=$enableval], ++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST([MAINT])dnl ++] ++) + +- 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 ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +- 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) ++# Check to see how 'make' treats includes. -*- Autoconf -*- + +- 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 +- ]) ++# Copyright (C) 2001, 2002, 2003, 2005, 2009 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_DEFINE_LOCALEDIR(VARIABLE) +-# ------------------------------- +-# Define VARIABLE to the location where catalog files will +-# be installed by po/Makefile. +-glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +-glib_save_prefix="$prefix" +-glib_save_exec_prefix="$exec_prefix" +-glib_save_datarootdir="$datarootdir" +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-test "x$exec_prefix" = xNONE && exec_prefix=$prefix +-datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then +- localedir=`eval echo "${libdir}/locale"` +-else +- localedir=`eval echo "${datadir}/locale"` ++# serial 4 ++ ++# 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 this is the am__doit target ++.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 ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac + fi +-prefix="$glib_save_prefix" +-exec_prefix="$glib_save_exec_prefix" +-datarootdir="$glib_save_datarootdir" +-AC_DEFINE_UNQUOTED($1, "$localedir", +- [Define the location where the catalogs will be installed]) ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf + ]) + +-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 ++# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 ++# 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. + +-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +-# +-# Create a temporary file with TEST-FILE as its contents and pass the +-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +-# 0 and perform ACTION-IF-FAIL for any other exit status. +-AC_DEFUN([GLIB_RUN_PROG], +-[cat >conftest.foo <<_ACEOF +-$2 +-_ACEOF +-if AC_RUN_LOG([$1 conftest.foo]); then +- m4_ifval([$3], [$3], [:]) +-m4_ifvaln([$4], [else $4])dnl +-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +-fi]) ++# serial 6 ++ ++# AM_PROG_CC_C_O ++# -------------- ++# Like AC_PROG_CC_C_O, but changed for automake. ++AC_DEFUN([AM_PROG_CC_C_O], ++[AC_REQUIRE([AC_PROG_CC_C_O])dnl ++AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([compile])dnl ++# FIXME: we rely on the cache variable name because ++# there is no other way. ++set dummy $CC ++am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` ++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o ++if test "$am_t" != yes; then ++ # Losing compiler, so override with the script. ++ # FIXME: It is wrong to rewrite CC. ++ # But if we don't then we get into trouble of one sort or another. ++ # A longer-term fix would be to have automake use am__CC in this case, ++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" ++ CC="$am_aux_dir/compile $CC" ++fi ++dnl Make sure AC_PROG_CC is never called again, or it will override our ++dnl setting of CC. ++m4_define([AC_PROG_CC], ++ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) ++]) + ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# gnome-common.m4 +-# ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 ++# 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 GNOME_COMMON_INIT ++# serial 6 + +-AC_DEFUN([GNOME_COMMON_INIT], +-[ +- dnl this macro should come after AC_CONFIG_MACRO_DIR +- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) ++# 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 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]) ++# 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 ++AC_REQUIRE_AUX_FILE([missing])dnl ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi ++# 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_DEFUN([GNOME_DEBUG_CHECK], +-[ +- AC_ARG_ENABLE([debug], +- AC_HELP_STRING([--enable-debug], +- [turn on debugging]),, +- [enable_debug=no]) ++# Copyright (C) 2003, 2004, 2005, 2006 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$enable_debug = xyes ; then +- AC_DEFINE(GNOME_ENABLE_DEBUG, 1, +- [Enable additional debugging at the expense of performance and size]) +- fi ++# AM_PROG_MKDIR_P ++# --------------- ++# Check for `mkdir -p'. ++AC_DEFUN([AM_PROG_MKDIR_P], ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac + ]) + +-dnl GNOME_MAINTAINER_MODE_DEFINES () +-dnl define DISABLE_DEPRECATED +-dnl +-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +-[ +- AC_REQUIRE([AM_MAINTAINER_MODE]) ++# Helper functions for option handling. -*- Autoconf -*- + +- DISABLE_DEPRECATED="" +- if test $USE_MAINTAINER_MODE = yes; then +- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" +- for DOMAIN in $DOMAINS; do +- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" +- done +- fi ++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- AC_SUBST(DISABLE_DEPRECATED) +-]) ++# serial 4 + +-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 ****************************** ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +- AC_ARG_ENABLE(compile-warnings, +- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], +- [Turn on compiler warnings]),, +- [enable_compile_warnings="m4_default([$1],[yes])"]) ++# _AM_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)]) + +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +- warning_flags= +- realsave_CFLAGS="$CFLAGS" ++# _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 "$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) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 ++# 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_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# --------------------------------------------------------------------------- ++# Adds support for distributing Python modules and packages. To ++# install modules, copy them to $(pythondir), using the python_PYTHON ++# automake variable. To install a package with the same name as the ++# automake package, install to $(pkgpythondir), or use the ++# pkgpython_PYTHON automake variable. ++# ++# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as ++# locations to install python extension modules (shared libraries). ++# Another macro is required to find the appropriate flags to compile ++# extension modules. ++# ++# If your package is configured with a different prefix to python, ++# users will have to add the install directory to the PYTHONPATH ++# environment variable, or create a .pth file (see the python ++# documentation for details). ++# ++# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will ++# cause an error if the version of python installed on the system ++# doesn't meet the requirement. MINIMUM-VERSION should consist of ++# numbers and dots only. ++AC_DEFUN([AM_PATH_PYTHON], ++ [ ++ dnl Find a Python interpreter. Python versions prior to 2.0 are not ++ dnl supported. (2.0 was released on October 16, 2000). ++ m4_define_default([_AM_PYTHON_INTERPRETER_LIST], ++ [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl ++python2.1 python2.0]) + +- 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 ++ m4_if([$1],[],[ ++ dnl No version check is needed. ++ # Find any Python interpreter. ++ if test -z "$PYTHON"; then ++ AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) + fi +- AC_MSG_RESULT($complCFLAGS) ++ am_display_PYTHON=python ++ ], [ ++ dnl A version check is needed. ++ if test -n "$PYTHON"; then ++ # If the user set $PYTHON, use it and don't search something else. ++ AC_MSG_CHECKING([whether $PYTHON version >= $1]) ++ AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], ++ [AC_MSG_RESULT(yes)], ++ [AC_MSG_ERROR(too old)]) ++ am_display_PYTHON=$PYTHON ++ else ++ # Otherwise, try each interpreter until we find one that satisfies ++ # VERSION. ++ AC_CACHE_CHECK([for a Python interpreter with version >= $1], ++ [am_cv_pathless_PYTHON],[ ++ for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do ++ test "$am_cv_pathless_PYTHON" = none && break ++ AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) ++ done]) ++ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. ++ if test "$am_cv_pathless_PYTHON" = none; then ++ PYTHON=: ++ else ++ AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) ++ fi ++ am_display_PYTHON=$am_cv_pathless_PYTHON ++ fi ++ ]) ++ ++ if test "$PYTHON" = :; then ++ dnl Run any user-specified action, or abort. ++ m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) ++ else + +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- AC_SUBST(WARN_CFLAGS) +-]) ++ dnl Query Python for its version number. Getting [:3] seems to be ++ dnl the best way to do this; it's what "site.py" does in the standard ++ dnl library. + +-dnl For C++, do basically the same thing. ++ AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], ++ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) ++ AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) + +-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])"]) ++ dnl Use the values of $prefix and $exec_prefix for the corresponding ++ dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made ++ dnl distinct variables so they can be overridden if need be. However, ++ dnl general consensus is that you shouldn't need this ability. + +- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) +- warnCXXFLAGS= +- if test "x$GXX" != xyes; then +- enable_cxx_warnings=no +- fi +- if test "x$enable_cxx_warnings" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-Wall[\ \ ]*) ;; +- *) warnCXXFLAGS="-Wall -Wno-unused" ;; +- esac ++ AC_SUBST([PYTHON_PREFIX], ['${prefix}']) ++ AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) + +- ## -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) ++ dnl At times (like when building shared libraries) you may want ++ dnl to know which OS platform Python thinks this is. + +- 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_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], ++ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) ++ AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) + +- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) +- complCXXFLAGS= +- if test "x$enable_iso_cxx" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; +- esac + +- case " $CXXFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; +- esac ++ dnl Set up 4 directories: ++ ++ dnl pythondir -- where to install python scripts. This is the ++ dnl site-packages directory, not the python standard library ++ dnl directory like in previous automake betas. This behavior ++ dnl is more consistent with lispdir.m4 for example. ++ dnl Query distutils for this directory. distutils does not exist in ++ dnl Python 1.5, so we fall back to the hardcoded directory if it ++ dnl doesn't work. ++ AC_CACHE_CHECK([for $am_display_PYTHON script directory], ++ [am_cv_python_pythondir], ++ [if test "x$prefix" = xNONE ++ then ++ am_py_prefix=$ac_default_prefix ++ else ++ am_py_prefix=$prefix + fi +- fi +- AC_MSG_RESULT($complCXXFLAGS) ++ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || ++ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` ++ case $am_cv_python_pythondir in ++ $am_py_prefix*) ++ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` ++ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` ++ ;; ++ esac ++ ]) ++ AC_SUBST([pythondir], [$am_cv_python_pythondir]) + +- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" +- AC_SUBST(WARN_CXXFLAGS) +-]) ++ dnl pkgpythondir -- $PACKAGE directory under pythondir. Was ++ dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is ++ dnl more consistent with the rest of automake. + +-# nls.m4 serial 3 (gettext-0.15) +-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +-dnl This file is free software; the Free Software Foundation +-dnl gives unlimited permission to copy and/or distribute it, +-dnl with or without modifications, as long as this notice is preserved. +-dnl +-dnl This file can can be used in projects which are not available under +-dnl the GNU General Public License or the GNU Library General Public +-dnl License but which still want to provide support for the GNU gettext +-dnl functionality. +-dnl Please note that the actual code of the GNU gettext library is covered +-dnl by the GNU Library General Public License, and the rest of the GNU +-dnl gettext package package is covered by the GNU General Public License. +-dnl They are *not* in the public domain. ++ AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) + +-dnl Authors: +-dnl Ulrich Drepper , 1995-2000. +-dnl Bruno Haible , 2000-2003. ++ dnl pyexecdir -- directory for installing python extension modules ++ dnl (shared libraries) ++ dnl Query distutils for this directory. distutils does not exist in ++ dnl Python 1.5, so we fall back to the hardcoded directory if it ++ dnl doesn't work. ++ AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], ++ [am_cv_python_pyexecdir], ++ [if test "x$exec_prefix" = xNONE ++ then ++ am_py_exec_prefix=$am_py_prefix ++ else ++ am_py_exec_prefix=$exec_prefix ++ fi ++ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || ++ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` ++ case $am_cv_python_pyexecdir in ++ $am_py_exec_prefix*) ++ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` ++ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` ++ ;; ++ esac ++ ]) ++ AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) + +-AC_PREREQ(2.50) ++ dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) ++ ++ AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) ++ ++ dnl Run any user-specified action. ++ $2 ++ fi + +-AC_DEFUN([AM_NLS], +-[ +- AC_MSG_CHECKING([whether NLS is requested]) +- dnl Default is enabled NLS +- AC_ARG_ENABLE(nls, +- [ --disable-nls do not use Native Language Support], +- USE_NLS=$enableval, USE_NLS=yes) +- AC_MSG_RESULT($USE_NLS) +- AC_SUBST(USE_NLS) + ]) + +-# 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. ++ ++# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) ++# --------------------------------------------------------------------------- ++# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. ++# Run ACTION-IF-FALSE otherwise. ++# This test uses sys.hexversion instead of the string equivalent (first ++# word of sys.version), in order to cope with versions such as 2.2c1. ++# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). ++AC_DEFUN([AM_PYTHON_CHECK_VERSION], ++ [prog="import sys ++# split strings by '.' and convert to numeric. Append some zeros ++# because we need at least 4 digits for the hex conversion. ++# map returns an iterator in Python 3.0 and a list in 2.x ++minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] ++minverhex = 0 ++# xrange is not present in Python 3.0 and range returns an iterator ++for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] ++sys.exit(sys.hexversion < minverhex)" ++ AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) ++ ++# Check to make sure that the build environment is sane. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 ++# Free Software Foundation, Inc. + # +-# 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. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# PKG_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]) ++# serial 5 ++ ++# 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 ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[[\\\"\#\$\&\'\`$am_lf]]*) ++ AC_MSG_ERROR([unsafe absolute working directory name]);; ++esac ++case $srcdir in ++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) ++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; ++esac ++ ++# 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 ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi ++ ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) + fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=m4_default([$1], [0.9.0]) +- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- PKG_CONFIG="" +- fi +- +-fi[]dnl +-])# PKG_PROG_PKG_CONFIG ++AC_MSG_RESULT(yes)]) + +-# 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. +-# ++# Copyright (C) 2009 Free Software Foundation, Inc. + # +-# Similar to PKG_CHECK_MODULES, make sure that the first instance of +-# this or PKG_CHECK_MODULES is called, or make sure to call +-# PKG_CHECK_EXISTS manually +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_EXISTS], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-if test -n "$PKG_CONFIG" && \ +- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then +- m4_ifval([$2], [$2], [:]) +-m4_ifvaln([$3], [else +- $3])dnl +-fi]) ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + ++# serial 1 + +-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +-# --------------------------------------------- +-m4_define([_PKG_CONFIG], +-[if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- elif test -n "$PKG_CONFIG"; then +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- else +- pkg_failed=untried +-fi[]dnl +-])# _PKG_CONFIG ++# AM_SILENT_RULES([DEFAULT]) ++# -------------------------- ++# Enable less verbose build rules; with the default set to DEFAULT ++# (`yes' being less verbose, `no' or empty being verbose). ++AC_DEFUN([AM_SILENT_RULES], ++[AC_ARG_ENABLE([silent-rules], ++[ --enable-silent-rules less verbose build output (undo: `make V=1') ++ --disable-silent-rules verbose build output (undo: `make V=0')]) ++case $enable_silent_rules in ++yes) AM_DEFAULT_VERBOSITY=0;; ++no) AM_DEFAULT_VERBOSITY=1;; ++*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; ++esac ++AC_SUBST([AM_DEFAULT_VERBOSITY])dnl ++AM_BACKSLASH='\' ++AC_SUBST([AM_BACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++]) + +-# _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 ++# 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. + ++# 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="\$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +-# [ACTION-IF-NOT-FOUND]) +-# +-# +-# Note that if there is a possibility the first call to +-# PKG_CHECK_MODULES might not happen, you should be sure to include an +-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +-# ++# Copyright (C) 2006, 2008 Free Software Foundation, Inc. + # +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_MODULES], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-pkg_failed=no +-AC_MSG_CHECKING([for $1]) ++# serial 2 + +-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) + +-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.]) ++# AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Public sister of _AM_SUBST_NOTMAKE. ++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +-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 --print-errors "$2" 2>&1` +- else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++# Check how to create a tarball. -*- Autoconf -*- + +- ifelse([$4], , [AC_MSG_ERROR(dnl +-[Package requirements ($2) were not met: ++# 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. + +-$$1_PKG_ERRORS ++# serial 2 + +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac + +-_PKG_TEXT +-])], +- [AC_MSG_RESULT([no]) +- $4]) +-elif test $pkg_failed = untried; then +- ifelse([$4], , [AC_MSG_FAILURE(dnl +-[The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. ++ # 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 + +-_PKG_TEXT ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir + +-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 ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR + + m4_include([m4/d-type.m4]) + m4_include([m4/gnome-doc-utils.m4]) +diff -Nur gnome-panel-2.27.92/applets/clock/Makefile.in gnome-panel-2.27.92.ubuntu/applets/clock/Makefile.in +--- gnome-panel-2.27.92/applets/clock/Makefile.in 2009-09-09 02:26:39.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/applets/clock/Makefile.in 2009-09-09 13:08:25.000000000 +0200 +@@ -372,6 +372,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/applets/clock/pixmaps/Makefile.in gnome-panel-2.27.92.ubuntu/applets/clock/pixmaps/Makefile.in +--- gnome-panel-2.27.92/applets/clock/pixmaps/Makefile.in 2009-09-09 02:26:39.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/applets/clock/pixmaps/Makefile.in 2009-09-09 13:08:25.000000000 +0200 +@@ -203,6 +203,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/applets/fish/Makefile.in gnome-panel-2.27.92.ubuntu/applets/fish/Makefile.in +--- gnome-panel-2.27.92/applets/fish/Makefile.in 2009-09-09 02:26:39.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/applets/fish/Makefile.in 2009-09-09 13:08:25.000000000 +0200 +@@ -263,6 +263,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/applets/Makefile.in gnome-panel-2.27.92.ubuntu/applets/Makefile.in +--- gnome-panel-2.27.92/applets/Makefile.in 2009-09-09 02:26:38.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/applets/Makefile.in 2009-09-09 13:08:24.000000000 +0200 +@@ -219,6 +219,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/applets/notification_area/Makefile.in gnome-panel-2.27.92.ubuntu/applets/notification_area/Makefile.in +--- gnome-panel-2.27.92/applets/notification_area/Makefile.in 2009-09-09 02:26:39.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/applets/notification_area/Makefile.in 2009-09-09 13:08:25.000000000 +0200 +@@ -290,6 +290,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/applets/wncklet/Makefile.in gnome-panel-2.27.92.ubuntu/applets/wncklet/Makefile.in +--- gnome-panel-2.27.92/applets/wncklet/Makefile.in 2009-09-09 02:26:39.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/applets/wncklet/Makefile.in 2009-09-09 13:08:25.000000000 +0200 +@@ -274,6 +274,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/config.h.in gnome-panel-2.27.92.ubuntu/config.h.in +--- gnome-panel-2.27.92/config.h.in 2009-09-09 13:10:25.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/config.h.in 2009-09-09 13:08:24.000000000 +0200 +@@ -138,6 +138,9 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +diff -Nur gnome-panel-2.27.92/configure gnome-panel-2.27.92.ubuntu/configure +--- gnome-panel-2.27.92/configure 2009-09-09 02:26:36.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/configure 2009-09-09 13:08:23.000000000 +0200 +@@ -1,20 +1,22 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.63 for gnome-panel 2.27.92. ++# Generated by GNU Autoconf 2.64 for gnome-panel 2.27.92. + # + # Report bugs to . + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software ++# Foundation, Inc. ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +@@ -22,23 +24,15 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- + as_nl=' + ' + export as_nl +@@ -46,7 +40,13 @@ + as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' + else +@@ -57,7 +57,7 @@ + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; +- case $arg in ++ case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +@@ -80,13 +80,6 @@ + } + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- + + # IFS + # We need space, tab and new line, in precisely that order. Quoting is +@@ -96,15 +89,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -116,12 +109,16 @@ + fi + if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' +@@ -133,330 +130,301 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi +- +- +-# Name of the executable. +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- + # CDPATH. +-$as_unset CDPATH +- ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + if test "x$CONFIG_SHELL" = x; then +- if (eval ":") 2>/dev/null; then +- as_have_required=yes ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST + else +- as_have_required=no ++ case \`(set -o) 2>/dev/null\` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac + fi +- +- if test $as_have_required = yes && (eval ": +-(as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++" ++ as_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } + + exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : ++ ++else ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 ++test \$(( 1 + 1 )) = 2 || exit 1" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_have_required=no + fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +-test \$exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=\$LINENO +- as_lineno_2=\$LINENO +- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && +- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +-") 2> /dev/null; then +- : + else +- as_candidate_shells= +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false + for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- case $as_dir in ++ as_found=: ++ case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do +- as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi + done;; + esac ++ as_found=false + done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } + IFS=$as_save_IFS + + +- for as_shell in $as_candidate_shells $SHELL; do +- # Try only shells that exist, to save several forks. +- if { test -f "$as_shell" || test -f "$as_shell.exe"; } && +- { ("$as_shell") 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- +-fi +- +- +-: +-_ASEOF +-}; then +- CONFIG_SHELL=$as_shell +- as_have_required=yes +- if { "$as_shell" 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- +-fi +- +- +-: +-(as_func_return () { +- (exit $1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} +- +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = "$1" ); then +- : +-else +- exitcode=1 +- echo positional parameters were not saved. +-fi +- +-test $exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } +- +-_ASEOF +-}; then +- break +-fi +- +-fi +- +- done +- +- if test "x$CONFIG_SHELL" != x; then +- for as_var in BASH_ENV ENV +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- done ++ if test "x$CONFIG_SHELL" != x; then : ++ # We cannot yet assume a decent shell, so we have to provide a ++ # neutralization value for shells without unset; and this also ++ # works around shells that cannot unset nonexistent variables. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + fi + +- +- if test $as_have_required = no; then +- echo This script requires a shell more modern than all the +- echo shells that I found on your system. Please install a +- echo modern shell, or manually run the script under such a +- echo shell if you do have one. +- { (exit 1); exit 1; } ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." ++ else ++ $as_echo "$0: Please tell bug-autoconf@gnu.org and ++$0: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ++$0: about your system, including any error possibly output ++$0: before this message. Then install a modern shell, or ++$0: manually run the script under such a shell if you do ++$0: have one." ++ fi ++ exit 1 + fi +- +- + fi +- + fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS ++ ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ + ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +-(eval "as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++} # as_fn_mkdir_p ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append + +-exitcode=0 +-if as_func_success; then +- : ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' + else +- exitcode=1 +- echo as_func_success failed. +-fi ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith + +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi + +-if as_func_ret_success; then +- : ++# as_fn_error ERROR [LINENO LOG_FD] ++# --------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with status $?, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr + else +- exitcode=1 +- echo as_func_ret_success failed. ++ as_expr=false + fi + +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false + fi + +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_dirname=false + fi + +-test \$exitcode = 0") || { +- echo No shell found that supports shell functions. +- echo Please tell bug-autoconf@gnu.org about your system, +- echo including any error possibly output before this message. +- echo This can help us improve future autoconf versions. +- echo Configuration will now proceed without shell functions. +-} ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { ++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= +@@ -473,8 +441,7 @@ + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +@@ -484,29 +451,18 @@ + exit + } + +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then +@@ -536,7 +492,7 @@ + rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +@@ -555,10 +511,10 @@ + if test -d "$1"; then + test -d "$1/."; + else +- case $1 in ++ case $1 in #( + -*)set "./$1";; + esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +@@ -573,7 +529,6 @@ + + + +- + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + +@@ -740,7 +695,6 @@ + subdirs= + MFLAGS= + MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} + + # Identity of this package. + PACKAGE_NAME='gnome-panel' +@@ -748,6 +702,7 @@ + PACKAGE_VERSION='2.27.92' + PACKAGE_STRING='gnome-panel 2.27.92' + PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel' ++PACKAGE_URL='' + + # Factoring default headers for most tests. + ac_includes_default="\ +@@ -1019,6 +974,7 @@ + program_transform_name + prefix + exec_prefix ++PACKAGE_URL + PACKAGE_BUGREPORT + PACKAGE_STRING + PACKAGE_VERSION +@@ -1046,6 +1002,7 @@ + enable_polkit + enable_network_manager + with_in_process_applets ++enable_initial_animation + with_x + with_html_dir + enable_gtk_doc +@@ -1199,8 +1156,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1226,8 +1182,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1431,8 +1386,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1448,8 +1402,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1479,17 +1432,17 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ++ -*) as_fn_error "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information." + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. +- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 +- { (exit 1); exit 1; }; } ++ case $ac_envvar in #( ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) ++ as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + +@@ -1506,15 +1459,13 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { $as_echo "$as_me: error: missing argument to $ac_option" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 +- { (exit 1); exit 1; }; } ;; ++ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1537,8 +1488,7 @@ + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1568,11 +1518,9 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { $as_echo "$as_me: error: working directory cannot be determined" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1611,13 +1559,11 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 +- { (exit 1); exit 1; }; } ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1746,11 +1692,14 @@ + --enable-polkit Enable PolicyKit support (auto) + --enable-network-manager + Enable NetworkManager support (auto) ++ --disable-initial-animation ++ disable the initial slide-in animation of panels + --enable-gtk-doc use gtk-doc to build documentation [default=no] + --enable-gtk-doc-html build documentation in html format [default=yes] + --enable-gtk-doc-pdf build documentation in pdf format [default=no] + --disable-scrollkeeper do not make updates to the scrollkeeper database +- --disable-schemas-install Disable the schemas installation ++ --disable-schemas-install ++ Disable the schemas installation + --disable-rebuilds disable all source autogeneration rules + + Optional Packages: +@@ -1886,21 +1835,378 @@ + if $ac_init_version; then + cat <<\_ACEOF + gnome-panel configure 2.27.92 +-generated by GNU Autoconf 2.63 ++generated by GNU Autoconf 2.64 + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 2009 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF + exit + fi ++ ++## ------------------------ ## ++## Autoconf initialization. ## ++## ------------------------ ## ++ ++# ac_fn_c_try_compile LINENO ++# -------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_compile ++ ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_link ++ ++# ac_fn_c_check_func LINENO FUNC VAR ++# ---------------------------------- ++# Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_c_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case declares $2. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $2 innocuous_$2 ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $2 ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* 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_$2 || defined __stub___$2 ++choke me ++#endif ++ ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_func ++ ++# ac_fn_c_try_cpp LINENO ++# ---------------------- ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_cpp ++ ++# ac_fn_c_try_run LINENO ++# ---------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes ++# that executables *can* be run. ++ac_fn_c_try_run () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: program exited with status $ac_status" >&5 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=$ac_status ++fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ return $ac_retval ++ ++} # ac_fn_c_try_run ++ ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_header_compile ++ ++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists, giving a warning if it cannot be compiled using ++# the include files in INCLUDES and setting the cache variable VAR ++# accordingly. ++ac_fn_c_check_header_mongrel () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_header_compiler=yes ++else ++ ac_header_compiler=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <$2> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes ++else ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++( cat <<\_ASBOX ++## -------------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ## ++## -------------------------------------------------------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=\$ac_header_compiler" ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_header_mongrel + cat >config.log <<_ACEOF + 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 $as_me 2.27.92, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.64. Invocation command line was + + $ $0 $@ + +@@ -1936,8 +2242,8 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- $as_echo "PATH: $as_dir" +-done ++ $as_echo "PATH: $as_dir" ++ done + IFS=$as_save_IFS + + } >&5 +@@ -1974,9 +2280,9 @@ + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in +- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) +- ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else +@@ -1992,13 +2298,13 @@ + -* ) ac_must_keep_next=true ;; + esac + fi +- ac_configure_args="$ac_configure_args '$ac_arg'" ++ as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done + done +-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++{ ac_configure_args0=; unset ac_configure_args0;} ++{ ac_configure_args1=; unset ac_configure_args1;} + + # When interrupted or exit'd, cleanup temporary files, and complete + # config.log. We remove comments because anyway the quotes in there +@@ -2023,13 +2329,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -2101,39 +2407,41 @@ + exit $exit_status + ' 0 + for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal ++ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal + done + ac_signal=0 + + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -f -r conftest* confdefs.h + ++$as_echo "/* confdefs.h */" > confdefs.h ++ + # Predefined preprocessor variables. + + cat >>confdefs.h <<_ACEOF + #define PACKAGE_NAME "$PACKAGE_NAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_TARNAME "$PACKAGE_TARNAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_VERSION "$PACKAGE_VERSION" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_STRING "$PACKAGE_STRING" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" + _ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_URL "$PACKAGE_URL" ++_ACEOF ++ + + # Let the site file select an alternate cache file if it wants to. + # Prefer an explicitly selected file to automatically selected ones. +@@ -2152,7 +2460,7 @@ + do + test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then +- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" +@@ -2163,7 +2471,7 @@ + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then +- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; +@@ -2171,7 +2479,7 @@ + esac + fi + else +- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 + $as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -2186,11 +2494,11 @@ + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 + $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; +@@ -2200,17 +2508,17 @@ + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 + $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else +- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi +- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 + $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} +- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 + $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac +@@ -2222,43 +2530,20 @@ + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi + done + if $ac_cache_corrupted; then +- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 + $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + fi +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -2273,24 +2558,16 @@ + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- if test -f "$ac_dir/install-sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f "$ac_dir/install.sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- elif test -f "$ac_dir/shtool"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/shtool install -c" +- break +- fi ++ for ac_t in install-sh install.sh shtool; do ++ if test -f "$ac_dir/$ac_t"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/$ac_t -c" ++ break 2 ++ fi ++ done + done + if test -z "$ac_aux_dir"; then +- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -2316,10 +2593,10 @@ + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. + # Reject install programs that cannot install multiple files. +-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 + $as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then ++if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2327,11 +2604,11 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in +- ./ | .// | /cC/* | \ ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in #(( ++ ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. +@@ -2368,7 +2645,7 @@ + ;; + esac + +-done ++ done + IFS=$as_save_IFS + + rm -rf conftest.one conftest.two conftest.dir +@@ -2384,7 +2661,7 @@ + INSTALL=$ac_install_sh + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 + $as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2395,7 +2672,7 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 + $as_echo_n "checking whether build environment is sane... " >&6; } + # Just in case + sleep 1 +@@ -2406,15 +2683,11 @@ + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) +- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 +-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 +-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + esac + + # Do `set' in a subshell so we don't clobber the current shell's +@@ -2436,11 +2709,8 @@ + # 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". +- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&5 +-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "ls -t appears to fail. Make sure there is not a broken ++alias in your environment" "$LINENO" 5 + fi + + test "$2" = conftest.file +@@ -2449,13 +2719,10 @@ + # Ok. + : + else +- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! +-Check your system clock" >&5 +-$as_echo "$as_me: error: newly created file is older than distributed files! +-Check your system clock" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "newly created file is older than distributed files! ++Check your system clock" "$LINENO" 5 + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +@@ -2483,7 +2750,7 @@ + am_missing_run="$MISSING --run " + else + am_missing_run= +- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 + $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +@@ -2504,9 +2771,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -2517,24 +2784,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 + $as_echo "$STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2544,9 +2811,9 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -2557,24 +2824,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 + $as_echo "$ac_ct_STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2583,7 +2850,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2596,10 +2863,10 @@ + fi + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 + $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + if test -z "$MKDIR_P"; then +- if test "${ac_cv_path_mkdir+set}" = set; then ++ if test "${ac_cv_path_mkdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2607,7 +2874,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in mkdir gmkdir; do ++ for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( +@@ -2619,7 +2886,7 @@ + esac + done + done +-done ++ done + IFS=$as_save_IFS + + fi +@@ -2635,7 +2902,7 @@ + MKDIR_P="$ac_install_sh -d" + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 + $as_echo "$MKDIR_P" >&6; } + + mkdir_p="$MKDIR_P" +@@ -2648,9 +2915,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AWK+set}" = set; then ++if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then +@@ -2661,24 +2928,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 + $as_echo "$AWK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2686,11 +2953,11 @@ + test -n "$AWK" && break + done + +-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -2708,11 +2975,11 @@ + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + SET_MAKE= + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -2732,9 +2999,7 @@ + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then +- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi + fi + +@@ -2791,7 +3056,7 @@ + + + # Check whether --enable-silent-rules was given. +-if test "${enable_silent_rules+set}" = set; then ++if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; + fi + +@@ -2827,16 +3092,16 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +-if test "${enable_maintainer_mode+set}" = set; then ++if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval + else + USE_MAINTAINER_MODE=no + fi + +- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 + $as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= +@@ -2852,28 +3117,25 @@ + + + +- DISABLE_DEPRECATED="" + if test $USE_MAINTAINER_MODE = yes; then +- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" +- for DOMAIN in $DOMAINS; do +- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" +- done ++ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED" ++ else ++ DISABLE_DEPRECATED="" + fi + + + + +- +- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 + $as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +-if test "${enable_nls+set}" = set; then ++if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval + else + USE_NLS=yes + fi + +- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 + $as_echo "$USE_NLS" >&6; } + + +@@ -2889,7 +3151,7 @@ + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 + $as_echo_n "checking for style of include used by $am_make... " >&6; } + am__include="#" + am__quote= +@@ -2917,12 +3179,12 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 + $as_echo "$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +-if test "${enable_dependency_tracking+set}" = set; then ++if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; + fi + +@@ -2947,9 +3209,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -2960,24 +3222,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2987,9 +3249,9 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3000,24 +3262,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3026,7 +3288,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -3040,9 +3302,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3053,24 +3315,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3080,9 +3342,9 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3094,18 +3356,18 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then +@@ -3124,10 +3386,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3139,9 +3401,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3152,24 +3414,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3183,9 +3445,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3196,24 +3458,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3226,7 +3488,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -3237,73 +3499,55 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "no acceptable C compiler found in \$PATH ++See \`config.log' for more details." "$LINENO" 5; } + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ rm -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +- ++#include + int + main () + { ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 + $as_echo_n "checking for C compiler default output file name... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +@@ -3320,17 +3564,17 @@ + done + rm -f $ac_rmfiles + +-if { (ac_try="$ac_link_default" ++if { { ac_try="$ac_link_default" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # in a Makefile. We should not override ac_cv_exeext if it was cached, +@@ -3347,7 +3591,7 @@ + # certainly right. + break;; + *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi +@@ -3366,84 +3610,75 @@ + else + ac_file='' + fi +- +-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 + $as_echo "$ac_file" >&6; } +-if test -z "$ac_file"; then ++if test -z "$ac_file"; then : + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } ++{ as_fn_set_status 77 ++as_fn_error "C compiler cannot create executables ++See \`config.log' for more details." "$LINENO" 5; }; } + fi +- + ac_exeext=$ac_cv_exeext + + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 + $as_echo_n "checking whether the C compiler works... " >&6; } +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' +- { (case "(($ac_try" in ++ { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run C compiled programs. ++as_fn_error "cannot run C compiled programs. + If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + fi + fi + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out + ac_clean_files=$ac_clean_files_save + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 + $as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 + $as_echo "$cross_compiling" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } +-if { (ac_try="$ac_link" ++if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with +@@ -3458,32 +3693,24 @@ + esac + done + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." "$LINENO" 5; } + fi +- + rm -f conftest$ac_cv_exeext +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if test "${ac_cv_objext+set}" = set; then ++if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3495,17 +3722,17 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" ++if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +@@ -3518,31 +3745,23 @@ + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." "$LINENO" 5; } + fi +- + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 + $as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3556,37 +3775,16 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 + $as_echo "$ac_cv_c_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GCC=yes +@@ -3595,20 +3793,16 @@ + fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then ++if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3619,35 +3813,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3658,36 +3828,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3698,42 +3844,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -3750,18 +3871,14 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then ++if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -3818,32 +3935,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -3854,17 +3948,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + $as_echo "none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + $as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -3874,9 +3970,9 @@ + + depcc="$CC" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -3984,7 +4080,7 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +@@ -4004,35 +4100,31 @@ + + case "$am__api_version" in + 1.01234) +- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 +-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + ;; + *) + ;; + esac + + if test -n "0.40.0"; then +- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5 + $as_echo_n "checking for intltool >= 0.40.0... " >&6; } + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 + $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || +- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5 +-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5 + fi + + # Extract the first word of "intltool-update", so it can be a program name with args. + set dummy intltool-update; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_UPDATE in +@@ -4045,14 +4137,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4060,19 +4152,19 @@ + fi + INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE + if test -n "$INTLTOOL_UPDATE"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 + $as_echo "$INTLTOOL_UPDATE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "intltool-merge", so it can be a program name with args. + set dummy intltool-merge; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_MERGE in +@@ -4085,14 +4177,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4100,19 +4192,19 @@ + fi + INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE + if test -n "$INTLTOOL_MERGE"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 + $as_echo "$INTLTOOL_MERGE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "intltool-extract", so it can be a program name with args. + set dummy intltool-extract; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_EXTRACT in +@@ -4125,14 +4217,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4140,18 +4232,16 @@ + fi + INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT + if test -n "$INTLTOOL_EXTRACT"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 + $as_echo "$INTLTOOL_EXTRACT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then +- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 +-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + fi + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +@@ -4197,9 +4287,9 @@ + # Check the gettext tools to make sure they are GNU + # Extract the first word of "xgettext", so it can be a program name with args. + set dummy xgettext; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_XGETTEXT+set}" = set; then ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $XGETTEXT in +@@ -4212,14 +4302,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4227,19 +4317,19 @@ + fi + XGETTEXT=$ac_cv_path_XGETTEXT + if test -n "$XGETTEXT"; then +- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 + $as_echo "$XGETTEXT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "msgmerge", so it can be a program name with args. + set dummy msgmerge; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_MSGMERGE+set}" = set; then ++if test "${ac_cv_path_MSGMERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MSGMERGE in +@@ -4252,14 +4342,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4267,19 +4357,19 @@ + fi + MSGMERGE=$ac_cv_path_MSGMERGE + if test -n "$MSGMERGE"; then +- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 + $as_echo "$MSGMERGE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_MSGFMT+set}" = set; then ++if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MSGFMT in +@@ -4292,14 +4382,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4307,19 +4397,19 @@ + fi + MSGFMT=$ac_cv_path_MSGFMT + if test -n "$MSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 + $as_echo "$MSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GMSGFMT+set}" = set; then ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in +@@ -4332,14 +4422,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" +@@ -4348,33 +4438,29 @@ + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 + $as_echo "$GMSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then +- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + fi + xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" + mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" + mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" + if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then +- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 +-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + fi + + # Extract the first word of "perl", so it can be a program name with args. + set dummy perl; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then ++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_PERL in +@@ -4387,14 +4473,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -4402,34 +4488,28 @@ + fi + INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL + if test -n "$INTLTOOL_PERL"; then +- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 + $as_echo "$INTLTOOL_PERL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + if test -z "$INTLTOOL_PERL"; then +- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 +-$as_echo "$as_me: error: perl not found; required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "perl not found; required for intltool" "$LINENO" 5 + fi + if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then +- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 +-$as_echo "$as_me: error: perl 5.x required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "perl 5.x required for intltool" "$LINENO" 5 + fi + if test "x" != "xno-xml"; then +- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 + $as_echo_n "checking for XML::Parser... " >&6; } + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then +- { $as_echo "$as_me:$LINENO: result: ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + $as_echo "ok" >&6; } + else +- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 +-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 + fi + fi + +@@ -4439,11 +4519,7 @@ + # Set DATADIRNAME correctly if it is not set yet + # (copied from glib-gettext.m4) + if test -z "$DATADIRNAME"; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -4455,120 +4531,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + DATADIRNAME=share + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- case $host in ++ case $host in + *-*-solaris*) +- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-$as_echo_n "checking for bind_textdomain_codeset... " >&6; } +-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then +- $as_echo_n "(cached) " >&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 bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. +- For example, HP-UX 11i declares gettimeofday. */ +-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char bind_textdomain_codeset (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef bind_textdomain_codeset +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char bind_textdomain_codeset (); +-/* 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_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +-choke me +-#endif +- +-int +-main () +-{ +-return bind_textdomain_codeset (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_bind_textdomain_codeset=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_bind_textdomain_codeset=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + DATADIRNAME=share + else + DATADIRNAME=lib +@@ -4580,10 +4549,8 @@ + ;; + esac + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi + + +@@ -4591,17 +4558,13 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 + $as_echo_n "checking for library containing strerror... " >&6; } +-if test "${ac_cv_search_strerror+set}" = set; then ++if test "${ac_cv_search_strerror+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -4626,54 +4589,27 @@ + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi +- rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_strerror=$ac_res +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- if test "${ac_cv_search_strerror+set}" = set; then ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_strerror+set}" = set; then : + break + fi + done +-if test "${ac_cv_search_strerror+set}" = set; then +- : ++if test "${ac_cv_search_strerror+set}" = set; then : ++ + else + ac_cv_search_strerror=no + fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 + $as_echo "$ac_cv_search_strerror" >&6; } + ac_res=$ac_cv_search_strerror +-if test "$ac_res" != no; then ++if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi +@@ -4686,9 +4622,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -4699,24 +4635,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4726,9 +4662,9 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -4739,24 +4675,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4765,7 +4701,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -4779,9 +4715,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -4792,24 +4728,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4819,9 +4755,9 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -4833,18 +4769,18 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then +@@ -4863,10 +4799,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4878,9 +4814,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -4891,24 +4827,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4922,9 +4858,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -4935,24 +4871,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4965,7 +4901,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -4976,62 +4912,42 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "no acceptable C compiler found in \$PATH ++See \`config.log' for more details." "$LINENO" 5; } + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ rm -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -5045,37 +4961,16 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 + $as_echo "$ac_cv_c_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GCC=yes +@@ -5084,20 +4979,16 @@ + fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then ++if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -5108,35 +4999,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -5147,36 +5014,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -5187,42 +5030,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -5239,18 +5057,14 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then ++if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -5307,32 +5121,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -5343,17 +5134,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + $as_echo "none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + $as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -5363,9 +5156,9 @@ + + depcc="$CC" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -5473,7 +5266,7 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +@@ -5493,14 +5286,14 @@ + 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 +-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 + $as_echo_n "checking how to run the C preprocessor... " >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then ++ if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -5515,11 +5308,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -5528,78 +5317,34 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++if $ac_preproc_ok; then : + break + fi + +@@ -5611,7 +5356,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 + $as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -5622,11 +5367,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -5635,87 +5376,40 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : ++if $ac_preproc_ok; then : ++ + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." "$LINENO" 5; } + fi + + ac_ext=c +@@ -5725,9 +5419,9 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then ++if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -5738,7 +5432,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in grep ggrep; do ++ for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +@@ -5758,7 +5452,7 @@ + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" +@@ -5773,26 +5467,24 @@ + $ac_path_GREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 + $as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then ++if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -5806,7 +5498,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do ++ for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +@@ -5826,7 +5518,7 @@ + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" +@@ -5841,12 +5533,10 @@ + $ac_path_EGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -5854,21 +5544,17 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 + $as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -5883,48 +5569,23 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -5934,18 +5595,14 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -5955,14 +5612,10 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -5989,85 +5642,48 @@ + return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_run "$LINENO"; then : + +-( exit $ac_status ) +-ac_cv_header_stdc=no ++else ++ ac_cv_header_stdc=no + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 + $as_echo "$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +-{ $as_echo "$as_me:$LINENO: checking build system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +-if test "${ac_cv_build+set}" = set; then ++if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_build_alias=$build_alias + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +-$as_echo "$as_me: error: invalid value of canonical build" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -6083,28 +5699,24 @@ + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:$LINENO: checking host system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 + $as_echo_n "checking host system type... " >&6; } +-if test "${ac_cv_host+set}" = set; then ++if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +-$as_echo "$as_me: error: invalid value of canonical host" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -6127,9 +5739,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. + set dummy ${ac_tool_prefix}as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AS+set}" = set; then ++if test "${ac_cv_prog_AS+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AS"; then +@@ -6140,24 +5752,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS="${ac_tool_prefix}as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AS=$ac_cv_prog_AS + if test -n "$AS"; then +- { $as_echo "$as_me:$LINENO: result: $AS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 + $as_echo "$AS" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6167,9 +5779,9 @@ + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. + set dummy as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then ++if test "${ac_cv_prog_ac_ct_AS+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AS"; then +@@ -6180,24 +5792,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AS="as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_AS=$ac_cv_prog_ac_ct_AS + if test -n "$ac_ct_AS"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 + $as_echo "$ac_ct_AS" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6206,7 +5818,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6219,9 +5831,9 @@ + 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. + set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DLLTOOL+set}" = set; then ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DLLTOOL"; then +@@ -6232,24 +5844,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DLLTOOL=$ac_cv_prog_DLLTOOL + if test -n "$DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 + $as_echo "$DLLTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6259,9 +5871,9 @@ + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. + set dummy dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DLLTOOL"; then +@@ -6272,24 +5884,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL + if test -n "$ac_ct_DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 + $as_echo "$ac_ct_DLLTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6298,7 +5910,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6311,9 +5923,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then +@@ -6324,24 +5936,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 + $as_echo "$OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6351,9 +5963,9 @@ + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then +@@ -6364,24 +5976,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 + $as_echo "$ac_ct_OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6390,7 +6002,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6425,7 +6037,7 @@ + + case `pwd` in + *\ * | *\ *) +- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + esac + +@@ -6448,9 +6060,9 @@ + + ltmain="$ac_aux_dir/ltmain.sh" + +-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 + $as_echo_n "checking for a sed that does not truncate output... " >&6; } +-if test "${ac_cv_path_SED+set}" = set; then ++if test "${ac_cv_path_SED+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +@@ -6458,7 +6070,7 @@ + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed +- $as_unset ac_script || ac_script= ++ { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST +@@ -6467,7 +6079,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in sed gsed; do ++ for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +@@ -6487,7 +6099,7 @@ + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" +@@ -6502,19 +6114,17 @@ + $ac_path_SED_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi + else + ac_cv_path_SED=$SED + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 + $as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed +@@ -6532,9 +6142,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 + $as_echo_n "checking for fgrep... " >&6; } +-if test "${ac_cv_path_FGREP+set}" = set; then ++if test "${ac_cv_path_FGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 +@@ -6548,7 +6158,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in fgrep; do ++ for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +@@ -6568,7 +6178,7 @@ + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" +@@ -6583,12 +6193,10 @@ + $ac_path_FGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_FGREP=$FGREP +@@ -6596,7 +6204,7 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 + $as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + +@@ -6622,7 +6230,7 @@ + + + # Check whether --with-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then ++if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no +@@ -6631,7 +6239,7 @@ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 + $as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) +@@ -6661,13 +6269,13 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 + $as_echo_n "checking for GNU ld... " >&6; } + else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 + $as_echo_n "checking for non-GNU ld... " >&6; } + fi +-if test "${lt_cv_path_LD+set}" = set; then ++if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then +@@ -6698,18 +6306,16 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 + $as_echo "$LD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi +-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 + $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +-if test "${lt_cv_prog_gnu_ld+set}" = set; then ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +@@ -6722,7 +6328,7 @@ + ;; + esac + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 + $as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + +@@ -6734,9 +6340,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 + $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +-if test "${lt_cv_path_NM+set}" = set; then ++if test "${lt_cv_path_NM+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NM"; then +@@ -6783,7 +6389,7 @@ + : ${lt_cv_path_NM=no} + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 + $as_echo "$lt_cv_path_NM" >&6; } + if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +@@ -6794,9 +6400,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DUMPBIN+set}" = set; then ++if test "${ac_cv_prog_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DUMPBIN"; then +@@ -6807,24 +6413,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DUMPBIN=$ac_cv_prog_DUMPBIN + if test -n "$DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 + $as_echo "$DUMPBIN" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6838,9 +6444,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DUMPBIN"; then +@@ -6851,24 +6457,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN + if test -n "$ac_ct_DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 + $as_echo "$ac_ct_DUMPBIN" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6881,7 +6487,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6901,44 +6507,44 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 + $as_echo_n "checking the name lister ($NM) interface... " >&6; } +-if test "${lt_cv_nm_interface+set}" = set; then ++if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:6911: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6517: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6914: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6520: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6917: output\"" >&5) ++ (eval echo "\"\$as_me:6523: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 + $as_echo "$lt_cv_nm_interface" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 + $as_echo_n "checking whether ln -s works... " >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 + $as_echo "no, using $LN_S" >&6; } + fi + + # find the maximum length of command line arguments +-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 + $as_echo_n "checking the maximum length of command line arguments... " >&6; } +-if test "${lt_cv_sys_max_cmd_len+set}" = set; then ++if test "${lt_cv_sys_max_cmd_len+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + i=0 +@@ -7056,10 +6662,10 @@ + fi + + if test -n $lt_cv_sys_max_cmd_len ; then +- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 + $as_echo "$lt_cv_sys_max_cmd_len" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: none" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 + $as_echo "none" >&6; } + fi + max_cmd_len=$lt_cv_sys_max_cmd_len +@@ -7073,7 +6679,7 @@ + : ${MV="mv -f"} + : ${RM="rm -f"} + +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 + $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } + # Try some XSI features + xsi_shell=no +@@ -7083,17 +6689,17 @@ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 + $as_echo "$xsi_shell" >&6; } + + +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 + $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } + lt_shell_append=no + ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 + $as_echo "$lt_shell_append" >&6; } + + +@@ -7128,14 +6734,14 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 + $as_echo_n "checking for $LD option to reload object files... " >&6; } +-if test "${lt_cv_ld_reload_flag+set}" = set; then ++if test "${lt_cv_ld_reload_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_reload_flag='-r' + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 + $as_echo "$lt_cv_ld_reload_flag" >&6; } + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in +@@ -7164,9 +6770,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then +@@ -7177,24 +6783,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 + $as_echo "$OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7204,9 +6810,9 @@ + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then +@@ -7217,24 +6823,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 + $as_echo "$ac_ct_OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7243,7 +6849,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -7260,9 +6866,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 + $as_echo_n "checking how to recognize dependent libraries... " >&6; } +-if test "${lt_cv_deplibs_check_method+set}" = set; then ++if test "${lt_cv_deplibs_check_method+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' +@@ -7456,7 +7062,7 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 + $as_echo "$lt_cv_deplibs_check_method" >&6; } + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method +@@ -7476,9 +7082,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AR+set}" = set; then ++if test "${ac_cv_prog_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AR"; then +@@ -7489,24 +7095,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- { $as_echo "$as_me:$LINENO: result: $AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 + $as_echo "$AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7516,9 +7122,9 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then ++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AR"; then +@@ -7529,24 +7135,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 + $as_echo "$ac_ct_AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7555,7 +7161,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -7581,9 +7187,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -7594,24 +7200,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 + $as_echo "$STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7621,9 +7227,9 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -7634,24 +7240,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 + $as_echo "$ac_ct_STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7660,7 +7266,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -7680,9 +7286,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_RANLIB+set}" = set; then ++if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then +@@ -7693,24 +7299,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 + $as_echo "$RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7720,9 +7326,9 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then +@@ -7733,24 +7339,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 + $as_echo "$ac_ct_RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7759,7 +7365,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -7837,9 +7443,9 @@ + + + # Check for command to grab the raw symbol name followed by C symbol from nm. +-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 + $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then ++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7955,18 +7561,18 @@ + int main(){nm_test_var='a';nm_test_func();return(0);} + _LT_EOF + +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm +- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s "$nlist"; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" +@@ -8019,11 +7625,11 @@ + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext}; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" +@@ -8057,10 +7663,10 @@ + 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 +- { $as_echo "$as_me:$LINENO: result: failed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 + $as_echo "failed" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + $as_echo "ok" >&6; } + fi + +@@ -8086,7 +7692,7 @@ + + + # Check whether --enable-libtool-lock was given. +-if test "${enable_libtool_lock+set}" = set; then ++if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; + fi + +@@ -8098,11 +7704,11 @@ + ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" +@@ -8116,12 +7722,12 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 8119 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ echo '#line 7725 "configure"' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) +@@ -8155,11 +7761,11 @@ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in +@@ -8208,9 +7814,9 @@ + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" +- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 + $as_echo_n "checking whether the C compiler needs -belf... " >&6; } +-if test "${lt_cv_cc_needs_belf+set}" = set; then ++if test "${lt_cv_cc_needs_belf+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=c +@@ -8219,11 +7825,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -8234,38 +7836,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_cc_needs_belf=no ++ lt_cv_cc_needs_belf=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -8273,7 +7850,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 + $as_echo "$lt_cv_cc_needs_belf" >&6; } + 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 +@@ -8283,11 +7860,11 @@ + sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in +@@ -8313,9 +7890,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DSYMUTIL"; then +@@ -8326,24 +7903,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 + $as_echo "$DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8353,9 +7930,9 @@ + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. + set dummy dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DSYMUTIL"; then +@@ -8366,24 +7943,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL + if test -n "$ac_ct_DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 + $as_echo "$ac_ct_DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8392,7 +7969,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -8405,9 +7982,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_NMEDIT+set}" = set; then ++if test "${ac_cv_prog_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NMEDIT"; then +@@ -8418,24 +7995,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + NMEDIT=$ac_cv_prog_NMEDIT + if test -n "$NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 + $as_echo "$NMEDIT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8445,9 +8022,9 @@ + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. + set dummy nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_NMEDIT"; then +@@ -8458,24 +8035,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT + if test -n "$ac_ct_NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 + $as_echo "$ac_ct_NMEDIT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8484,7 +8061,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -8497,9 +8074,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. + set dummy ${ac_tool_prefix}lipo; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_LIPO+set}" = set; then ++if test "${ac_cv_prog_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$LIPO"; then +@@ -8510,24 +8087,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + LIPO=$ac_cv_prog_LIPO + if test -n "$LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 + $as_echo "$LIPO" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8537,9 +8114,9 @@ + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. + set dummy lipo; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then ++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_LIPO"; then +@@ -8550,24 +8127,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_LIPO="lipo" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO + if test -n "$ac_ct_LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 + $as_echo "$ac_ct_LIPO" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8576,7 +8153,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -8589,9 +8166,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OTOOL+set}" = set; then ++if test "${ac_cv_prog_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL"; then +@@ -8602,24 +8179,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OTOOL=$ac_cv_prog_OTOOL + if test -n "$OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 + $as_echo "$OTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8629,9 +8206,9 @@ + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. + set dummy otool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL"; then +@@ -8642,24 +8219,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL="otool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL + if test -n "$ac_ct_OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 + $as_echo "$ac_ct_OTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8668,7 +8245,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -8681,9 +8258,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool64; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OTOOL64+set}" = set; then ++if test "${ac_cv_prog_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL64"; then +@@ -8694,24 +8271,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OTOOL64=$ac_cv_prog_OTOOL64 + if test -n "$OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 + $as_echo "$OTOOL64" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8721,9 +8298,9 @@ + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. + set dummy otool64; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL64"; then +@@ -8734,24 +8311,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL64="otool64" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 + if test -n "$ac_ct_OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 + $as_echo "$ac_ct_OTOOL64" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -8760,7 +8337,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -8796,9 +8373,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 + $as_echo_n "checking for -single_module linker flag... " >&6; } +-if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_apple_cc_single_mod=no +@@ -8823,22 +8400,18 @@ + rm -f conftest.* + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 + $as_echo "$lt_cv_apple_cc_single_mod" >&6; } +- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 + $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -8849,42 +8422,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_ld_exported_symbols_list=no ++ lt_cv_ld_exported_symbols_list=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 + $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) +@@ -8922,69 +8470,14 @@ + esac + + # On IRIX 5.3, sys/types and inttypes.h are conflicting. +- +- +- +- +- +- +- +- +- + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -8994,62 +8487,13 @@ + done + + +- + for ac_header in dlfcn.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++do : ++ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default ++" ++if test "x$ac_cv_header_dlfcn_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_DLFCN_H 1 + _ACEOF + + fi +@@ -9067,7 +8511,7 @@ + + + # Check whether --enable-shared was given. +-if test "${enable_shared+set}" = set; then ++if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; +@@ -9098,7 +8542,7 @@ + + + # Check whether --enable-static was given. +-if test "${enable_static+set}" = set; then ++if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; +@@ -9130,7 +8574,7 @@ + + + # Check whether --with-pic was given. +-if test "${with_pic+set}" = set; then ++if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" + else + pic_mode=default +@@ -9146,7 +8590,7 @@ + + + # Check whether --enable-fast-install was given. +-if test "${enable_fast_install+set}" = set; then ++if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; +@@ -9227,9 +8671,9 @@ + setopt NO_GLOB_SUBST + fi + +-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 + $as_echo_n "checking for objdir... " >&6; } +-if test "${lt_cv_objdir+set}" = set; then ++if test "${lt_cv_objdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + rm -f .libs 2>/dev/null +@@ -9242,7 +8686,7 @@ + fi + rmdir .libs 2>/dev/null + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 + $as_echo "$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + +@@ -9335,9 +8779,9 @@ + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 + $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -9388,10 +8832,10 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -9401,9 +8845,9 @@ + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- { $as_echo "$as_me:$LINENO: checking for file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 + $as_echo_n "checking for file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -9454,10 +8898,10 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -9538,9 +8982,9 @@ + if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no +@@ -9556,11 +9000,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9559: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9003: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9563: \$? = $ac_status" >&5 ++ echo "$as_me:9007: \$? = $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. +@@ -9573,7 +9017,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 + $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +@@ -9593,7 +9037,7 @@ + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 + $as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then +@@ -9865,7 +9309,7 @@ + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 + $as_echo "$lt_prog_compiler_pic" >&6; } + + +@@ -9877,9 +9321,9 @@ + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then +- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_pic_works=no +@@ -9895,11 +9339,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9898: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9342: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9902: \$? = $ac_status" >&5 ++ echo "$as_me:9346: \$? = $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. +@@ -9912,7 +9356,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 + $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +@@ -9936,9 +9380,9 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if test "${lt_cv_prog_compiler_static_works+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_static_works=no +@@ -9964,7 +9408,7 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 + $as_echo "$lt_cv_prog_compiler_static_works" >&6; } + + if test x"$lt_cv_prog_compiler_static_works" = xyes; then +@@ -9979,9 +9423,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -10000,11 +9444,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10003: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9447: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:10007: \$? = $ac_status" >&5 ++ echo "$as_me:9451: \$? = $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 +@@ -10026,7 +9470,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 + $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + +@@ -10034,9 +9478,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -10055,11 +9499,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10058: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9502: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:10062: \$? = $ac_status" >&5 ++ echo "$as_me:9506: \$? = $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 +@@ -10081,7 +9525,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 + $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + +@@ -10090,7 +9534,7 @@ + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 + $as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* +@@ -10098,10 +9542,10 @@ + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 + $as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +@@ -10114,7 +9558,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= +@@ -10556,11 +10000,7 @@ + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10571,27 +10011,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -10605,16 +10025,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core 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='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -10627,11 +10040,7 @@ + else + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10642,27 +10051,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -10676,16 +10065,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core 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='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -10897,42 +10279,16 @@ + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat >conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + int foo(void) {} + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +@@ -11188,7 +10544,7 @@ + fi + fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 + $as_echo "$ld_shlibs" >&6; } + test "$ld_shlibs" = no && can_build_shared=no + +@@ -11225,16 +10581,16 @@ + # 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. +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 + $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext +@@ -11248,11 +10604,11 @@ + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } + then + archive_cmds_need_lc=no + else +@@ -11263,7 +10619,7 @@ + cat conftest.err 1>&5 + fi + $RM conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 + $as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac +@@ -11427,7 +10783,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 + $as_echo_n "checking dynamic linker characteristics... " >&6; } + + if test "$GCC" = yes; then +@@ -11849,11 +11205,7 @@ + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -11864,41 +11216,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then ++if ac_fn_c_try_link "$LINENO"; then : ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + shlibpath_overrides_runpath=yes + fi +- +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +@@ -12110,7 +11434,7 @@ + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 + $as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +@@ -12212,7 +11536,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 + $as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || +@@ -12237,7 +11561,7 @@ + # directories. + hardcode_action=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 + $as_echo "$hardcode_action" >&6; } + + if test "$hardcode_action" = relink || +@@ -12282,18 +11606,14 @@ + + darwin*) + # if libdl is installed we need to link against it +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&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 ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -12311,43 +11631,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no ++ ac_cv_lib_dl_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else + +@@ -12360,33 +11655,19 @@ + ;; + + *) +- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 +-$as_echo_n "checking for shl_load... " >&6; } +-if test "${ac_cv_func_shl_load+set}" = set; then ++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" ++if test "x$ac_cv_func_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 ++$as_echo_n "checking for shl_load in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -12395,13 +11676,6 @@ + extern "C" + #endif + 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 +-#endif +- + int + main () + { +@@ -12410,56 +11684,32 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_shl_load=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dld_shl_load=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_shl_load=no ++ ac_cv_lib_dld_shl_load=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-$as_echo "$ac_cv_func_shl_load" >&6; } +-if test "x$ac_cv_func_shl_load" = x""yes; then +- lt_cv_dlopen="shl_load" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 ++$as_echo "$ac_cv_lib_dld_shl_load" >&6; } ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else +- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-$as_echo_n "checking for shl_load in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&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 ++LIBS="-ldl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -12468,222 +11718,37 @@ + #ifdef __cplusplus + extern "C" + #endif +-char shl_load (); ++char dlopen (); + int + main () + { +-return shl_load (); ++return dlopen (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dld_shl_load=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dld_shl_load=no ++ ac_cv_lib_dl_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 +-$as_echo_n "checking for dlopen... " >&6; } +-if test "${ac_cv_func_dlopen+set}" = set; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 ++$as_echo_n "checking for dlopen in -lsvld... " >&6; } ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&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 GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char 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 +-#endif +- +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-$as_echo "$ac_cv_func_dlopen" >&6; } +-if test "x$ac_cv_func_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" +-else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-$as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&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 GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dl_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-$as_echo_n "checking for dlopen in -lsvld... " >&6; } +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&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 ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsvld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -12701,57 +11766,28 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_svld_dlopen=no ++ ac_cv_lib_svld_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 + $as_echo "$ac_cv_lib_svld_dlopen" >&6; } +-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else +- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 + $as_echo_n "checking for dld_link in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&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 ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -12769,43 +11805,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dld_dld_link=no ++ ac_cv_lib_dld_dld_link=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 + $as_echo "$ac_cv_lib_dld_dld_link" >&6; } +-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then ++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + +@@ -12844,9 +11855,9 @@ + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + +- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 + $as_echo_n "checking whether a program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self+set}" = set; then ++if test "${lt_cv_dlopen_self+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -12855,7 +11866,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12858 "configure" ++#line 11869 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12914,11 +11925,11 @@ + return status; + } + _LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -12935,14 +11946,14 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 + $as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 + $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self_static+set}" = set; then ++if test "${lt_cv_dlopen_self_static+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -12951,7 +11962,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12954 "configure" ++#line 11965 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -13010,11 +12021,11 @@ + return status; + } + _LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -13031,7 +12042,7 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 + $as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + +@@ -13070,12 +12081,12 @@ + + striplib= + old_striplib= +-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&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" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else + # FIXME - insert some real tests, host_os isn't really good enough +@@ -13084,15 +12095,15 @@ + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + ;; + *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + ;; + esac +@@ -13110,12 +12121,12 @@ + + + # Report which library types will actually be built +- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 + $as_echo_n "checking if libtool supports shared libraries... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 + $as_echo "$can_build_shared" >&6; } + +- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 + $as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + +@@ -13136,14 +12147,14 @@ + fi + ;; + esac +- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 + $as_echo "$enable_shared" >&6; } + +- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 + $as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes +- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 + $as_echo "$enable_static" >&6; } + + +@@ -13180,22 +12191,18 @@ + + #AC_PROG_SED available in 2.59b + if test "x$CC" != xcc; then +- { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 + $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } + else +- { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 + $as_echo_n "checking whether cc understands -c and -o together... " >&6; } + fi + set dummy $CC; ac_cc=`$as_echo "$2" | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then ++if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -13211,63 +12218,63 @@ + # existing .o file with -o, though they will create one. + ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' + rm -f conftest2.* +-if { (case "(($ac_try" in ++if { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (case "(($ac_try" in ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && ++ test -f conftest2.$ac_objext && { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; + then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. + if { ac_try='cc -c conftest.$ac_ext >&5' +- { (case "(($ac_try" in ++ { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' + rm -f conftest2.* +- if { (case "(($ac_try" in ++ if { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (case "(($ac_try" in ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && ++ test -f conftest2.$ac_objext && { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; + then + # cc works too. + : +@@ -13284,15 +12291,13 @@ + + fi + if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + +-cat >>confdefs.h <<\_ACEOF +-#define NO_MINUS_C_MINUS_O 1 +-_ACEOF ++$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h + + fi + +@@ -13322,9 +12327,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PYTHON+set}" = set; then ++if test "${ac_cv_path_PYTHON+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $PYTHON in +@@ -13337,14 +12342,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -13352,10 +12357,10 @@ + fi + PYTHON=$ac_cv_path_PYTHON + if test -n "$PYTHON"; then +- { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 + $as_echo "$PYTHON" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -13369,20 +12374,18 @@ + + + if test "$PYTHON" = :; then +- { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 +-$as_echo "$as_me: error: no suitable Python interpreter found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no suitable Python interpreter found" "$LINENO" 5 + else + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 + $as_echo_n "checking for $am_display_PYTHON version... " >&6; } +-if test "${am_cv_python_version+set}" = set; then ++if test "${am_cv_python_version+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } + PYTHON_VERSION=$am_cv_python_version + +@@ -13394,23 +12397,23 @@ + + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 + $as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +-if test "${am_cv_python_platform+set}" = set; then ++if test "${am_cv_python_platform+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 + $as_echo "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform + + + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 + $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +-if test "${am_cv_python_pythondir+set}" = set; then ++if test "${am_cv_python_pythondir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$prefix" = xNONE +@@ -13429,7 +12432,7 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 + $as_echo "$am_cv_python_pythondir" >&6; } + pythondir=$am_cv_python_pythondir + +@@ -13438,9 +12441,9 @@ + pkgpythondir=\${pythondir}/$PACKAGE + + +- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 + $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +-if test "${am_cv_python_pyexecdir+set}" = set; then ++if test "${am_cv_python_pyexecdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$exec_prefix" = xNONE +@@ -13459,7 +12462,7 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 + $as_echo "$am_cv_python_pyexecdir" >&6; } + pyexecdir=$am_cv_python_pyexecdir + +@@ -13474,9 +12477,9 @@ + + # Extract the first word of "glib-genmarshal", so it can be a program name with args. + set dummy glib-genmarshal; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then ++if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GLIB_GENMARSHAL in +@@ -13489,14 +12492,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -13504,19 +12507,19 @@ + fi + GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL + if test -n "$GLIB_GENMARSHAL"; then +- { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 + $as_echo "$GLIB_GENMARSHAL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "gconftool-2", so it can be a program name with args. + set dummy gconftool-2; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GCONFTOOL+set}" = set; then ++if test "${ac_cv_path_GCONFTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GCONFTOOL in +@@ -13529,14 +12532,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -13544,10 +12547,10 @@ + fi + GCONFTOOL=$ac_cv_path_GCONFTOOL + if test -n "$GCONFTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5 + $as_echo "$GCONFTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -13556,7 +12559,7 @@ + + + # Check whether --enable-compile-warnings was given. +-if test "${enable_compile_warnings+set}" = set; then ++if test "${enable_compile_warnings+set}" = set; then : + enableval=$enable_compile_warnings; + else + enable_compile_warnings="maximum" +@@ -13587,13 +12590,9 @@ + for option in -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" +- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 + $as_echo_n "checking whether gcc understands $option... " >&6; } +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -13604,35 +12603,14 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + has_option=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- has_option=no ++ has_option=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" +- { $as_echo "$as_me:$LINENO: result: $has_option" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 + $as_echo "$has_option" >&6; } + if test $has_option = yes; then + warning_flags="$warning_flags $option" +@@ -13646,26 +12624,24 @@ + fi + ;; + *) +- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 + ;; + esac + CFLAGS="$realsave_CFLAGS" +- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 + $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5 + $as_echo "$warning_flags" >&6; } + + # Check whether --enable-iso-c was given. +-if test "${enable_iso_c+set}" = set; then ++if test "${enable_iso_c+set}" = set; then : + enableval=$enable_iso_c; + else + enable_iso_c=no + fi + + +- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5 + $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then +@@ -13680,7 +12656,7 @@ + esac + fi + fi +- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5 + $as_echo "$complCFLAGS" >&6; } + + WARN_CFLAGS="$warning_flags $complCFLAGS" +@@ -13688,7 +12664,7 @@ + + + # Check whether --enable-deprecations was given. +-if test "${enable_deprecations+set}" = set; then ++if test "${enable_deprecations+set}" = set; then : + enableval=$enable_deprecations; + else + enable_deprecations=no +@@ -13700,288 +12676,59 @@ + + fi + +- + for ac_header in crt_externs.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "crt_externs.h" "ac_cv_header_crt_externs_h" "$ac_includes_default" ++if test "x$ac_cv_header_crt_externs_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_CRT_EXTERNS_H 1 + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++done + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> ++for ac_func in _NSGetEnviron ++do : ++ ac_fn_c_check_func "$LINENO" "_NSGetEnviron" "ac_cv_func__NSGetEnviron" ++if test "x$ac_cv_func__NSGetEnviron" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE__NSGETENVIRON 1 + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no + fi ++done + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## -------------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ## +-## -------------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF ++LIBGNOME_DESKTOP_REQUIRED=2.11.1 ++GDK_PIXBUF_REQUIRED=2.7.1 ++PANGO_REQUIRED=1.15.4 ++GLIB_REQUIRED=2.18.0 ++GTK_REQUIRED=2.15.1 ++LIBGNOME_REQUIRED=2.13.0 ++LIBGNOMEUI_REQUIRED=2.5.4 ++LIBBONOBOUI_REQUIRED=2.1.1 ++ORBIT_REQUIRED=2.4.0 ++LIBWNCK_REQUIRED=2.19.5 ++GCONF_REQUIRED=2.6.1 ++LIBGNOME_MENU_REQUIRED=2.27.92 ++LIBECAL_REQUIRED=1.6.0 ++LIBEDATASERVER_REQUIRED=1.2.0 ++LIBEDATASERVERUI_REQUIRED=1.2.0 ++CAIRO_REQUIRED=1.0.0 ++DBUS_GLIB_REQUIRED=0.60 ++GWEATHER_REQUIRED=2.27.90 + +-fi + +-done + + +-for ac_func in _NSGetEnviron +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&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 $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* 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_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +-done +- +- +-LIBGNOME_DESKTOP_REQUIRED=2.11.1 +-GDK_PIXBUF_REQUIRED=2.7.1 +-PANGO_REQUIRED=1.15.4 +-GLIB_REQUIRED=2.18.0 +-GTK_REQUIRED=2.15.1 +-LIBGNOME_REQUIRED=2.13.0 +-LIBGNOMEUI_REQUIRED=2.5.4 +-LIBBONOBOUI_REQUIRED=2.1.1 +-ORBIT_REQUIRED=2.4.0 +-LIBWNCK_REQUIRED=2.19.5 +-GCONF_REQUIRED=2.6.1 +-LIBGNOME_MENU_REQUIRED=2.27.92 +-LIBECAL_REQUIRED=1.6.0 +-LIBEDATASERVER_REQUIRED=1.2.0 +-LIBEDATASERVERUI_REQUIRED=1.2.0 +-CAIRO_REQUIRED=1.0.0 +-DBUS_GLIB_REQUIRED=0.60 +-GWEATHER_REQUIRED=2.27.90 +- +- +- +- +-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $PKG_CONFIG in +@@ -13994,14 +12741,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -14009,10 +12756,10 @@ + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 + $as_echo "$PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -14022,9 +12769,9 @@ + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $ac_pt_PKG_CONFIG in +@@ -14037,14 +12784,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -14052,10 +12799,10 @@ + fi + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + if test -n "$ac_pt_PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 + $as_echo "$ac_pt_PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -14064,7 +12811,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -14077,13 +12824,13 @@ + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 +- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 + $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + PKG_CONFIG="" + fi +@@ -14091,40 +12838,44 @@ + fi + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for PANEL" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANEL" >&5 + $as_echo_n "checking for PANEL... " >&6; } + +-if test -n "$PANEL_CFLAGS"; then +- pkg_cv_PANEL_CFLAGS="$PANEL_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$PANEL_CFLAGS"; then ++ pkg_cv_PANEL_CFLAGS="$PANEL_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_PANEL_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$PANEL_LIBS"; then +- pkg_cv_PANEL_LIBS="$PANEL_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$PANEL_LIBS"; then ++ pkg_cv_PANEL_LIBS="$PANEL_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -14137,25 +12888,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` ++ PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` + else +- PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` ++ PANEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$PANEL_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) 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 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 +-$as_echo "$as_me: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: ++ as_fn_error "Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: + + $PANEL_PKG_ERRORS + +@@ -14165,22 +12905,11 @@ + 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; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_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 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 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_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. + +@@ -14189,12 +12918,11 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS + PANEL_LIBS=$pkg_cv_PANEL_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -14203,40 +12931,44 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for LIBPANEL_APPLET" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPANEL_APPLET" >&5 + $as_echo_n "checking for LIBPANEL_APPLET... " >&6; } + +-if test -n "$LIBPANEL_APPLET_CFLAGS"; then +- pkg_cv_LIBPANEL_APPLET_CFLAGS="$LIBPANEL_APPLET_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\"") >&5 ++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" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_LIBPANEL_APPLET_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$LIBPANEL_APPLET_LIBS"; then +- pkg_cv_LIBPANEL_APPLET_LIBS="$LIBPANEL_APPLET_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\"") >&5 ++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" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_LIBPANEL_APPLET_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -14249,25 +12981,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>&1` ++ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED"` + else +- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>&1` ++ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBPANEL_APPLET_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_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 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 +-$as_echo "$as_me: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED) were not met: ++ as_fn_error "Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED) were not met: + + $LIBPANEL_APPLET_PKG_ERRORS + +@@ -14277,22 +12998,11 @@ + 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; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_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 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 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_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. + +@@ -14301,12 +13011,11 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + LIBPANEL_APPLET_CFLAGS=$pkg_cv_LIBPANEL_APPLET_CFLAGS + LIBPANEL_APPLET_LIBS=$pkg_cv_LIBPANEL_APPLET_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -14315,40 +13024,44 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for FISH" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FISH" >&5 + $as_echo_n "checking for FISH... " >&6; } + +-if test -n "$FISH_CFLAGS"; then +- pkg_cv_FISH_CFLAGS="$FISH_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$FISH_CFLAGS"; then ++ pkg_cv_FISH_CFLAGS="$FISH_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_FISH_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$FISH_LIBS"; then +- pkg_cv_FISH_LIBS="$FISH_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$FISH_LIBS"; then ++ pkg_cv_FISH_LIBS="$FISH_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_FISH_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -14361,25 +13074,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- FISH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>&1` ++ FISH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED"` + else +- FISH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>&1` ++ FISH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$FISH_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_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 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 +-$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met: ++ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met: + + $FISH_PKG_ERRORS + +@@ -14389,22 +13091,11 @@ + 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; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_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 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 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_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. + +@@ -14413,12 +13104,11 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + FISH_CFLAGS=$pkg_cv_FISH_CFLAGS + FISH_LIBS=$pkg_cv_FISH_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -14427,40 +13117,44 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for NOTIFICATION_AREA" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFICATION_AREA" >&5 + $as_echo_n "checking for NOTIFICATION_AREA... " >&6; } + +-if test -n "$NOTIFICATION_AREA_CFLAGS"; then +- pkg_cv_NOTIFICATION_AREA_CFLAGS="$NOTIFICATION_AREA_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NOTIFICATION_AREA_CFLAGS"; then ++ pkg_cv_NOTIFICATION_AREA_CFLAGS="$NOTIFICATION_AREA_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_NOTIFICATION_AREA_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$NOTIFICATION_AREA_LIBS"; then +- pkg_cv_NOTIFICATION_AREA_LIBS="$NOTIFICATION_AREA_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NOTIFICATION_AREA_LIBS"; then ++ pkg_cv_NOTIFICATION_AREA_LIBS="$NOTIFICATION_AREA_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_NOTIFICATION_AREA_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -14473,25 +13167,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- NOTIFICATION_AREA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED" 2>&1` ++ NOTIFICATION_AREA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED"` + else +- NOTIFICATION_AREA_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED" 2>&1` ++ NOTIFICATION_AREA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$NOTIFICATION_AREA_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met: +- +-$NOTIFICATION_AREA_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables NOTIFICATION_AREA_CFLAGS +-and NOTIFICATION_AREA_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met: ++ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met: + + $NOTIFICATION_AREA_PKG_ERRORS + +@@ -14501,22 +13184,11 @@ + Alternatively, you may set the environment variables NOTIFICATION_AREA_CFLAGS + and NOTIFICATION_AREA_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_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 environment variables NOTIFICATION_AREA_CFLAGS +-and NOTIFICATION_AREA_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 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_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. + +@@ -14525,12 +13197,11 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + NOTIFICATION_AREA_CFLAGS=$pkg_cv_NOTIFICATION_AREA_CFLAGS + NOTIFICATION_AREA_LIBS=$pkg_cv_NOTIFICATION_AREA_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -14539,40 +13210,44 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for WNCKLET" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WNCKLET" >&5 + $as_echo_n "checking for WNCKLET... " >&6; } + +-if test -n "$WNCKLET_CFLAGS"; then +- pkg_cv_WNCKLET_CFLAGS="$WNCKLET_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$WNCKLET_CFLAGS"; then ++ pkg_cv_WNCKLET_CFLAGS="$WNCKLET_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_WNCKLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$WNCKLET_LIBS"; then +- pkg_cv_WNCKLET_LIBS="$WNCKLET_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$WNCKLET_LIBS"; then ++ pkg_cv_WNCKLET_LIBS="$WNCKLET_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_WNCKLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -14585,25 +13260,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- WNCKLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED" 2>&1` ++ WNCKLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED"` + else +- WNCKLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED" 2>&1` ++ WNCKLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$WNCKLET_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED) 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 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 +-$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED) were not met: ++ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED) were not met: + + $WNCKLET_PKG_ERRORS + +@@ -14613,22 +13277,11 @@ + 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; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_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 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 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_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. + +@@ -14637,265 +13290,35 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + WNCKLET_CFLAGS=$pkg_cv_WNCKLET_CFLAGS + WNCKLET_LIBS=$pkg_cv_WNCKLET_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi + + + +- + for ac_header in langinfo.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default" ++if test "x$ac_cv_header_langinfo_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LANGINFO_H 1 + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++done + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## -------------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ## +-## -------------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +-for ac_func in nl_langinfo +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&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 $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* 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_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++for ac_func in nl_langinfo ++do : ++ ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" ++if test "x$ac_cv_func_nl_langinfo" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_NL_LANGINFO 1 + _ACEOF + + fi +@@ -14903,7 +13326,7 @@ + + + # Check whether --enable-eds was given. +-if test "${enable_eds+set}" = set; then ++if test "${enable_eds+set}" = set; then : + enableval=$enable_eds; + else + enable_eds=auto +@@ -14915,24 +13338,22 @@ + CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server + else + if test "x$enable_eds" != "xno"; then +- { $as_echo "$as_me:$LINENO: checking for evolution-data-server" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for evolution-data-server" >&5 + $as_echo_n "checking for evolution-data-server... " >&6; } + if $PKG_CONFIG --exists libecal-1.2 libedataserverui-1.2 evolution-data-server-1.2; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + LIBECAL_REQUIREMENT="libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-1.2 >= $LIBEDATASERVERUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" + CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + fi + fi + if test -n "$LIBECAL_REQUIREMENT"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LIBECAL 1 +-_ACEOF ++$as_echo "#define HAVE_LIBECAL 1" >>confdefs.h + + fi + if test -n "$LIBECAL_REQUIREMENT"; then +@@ -14947,40 +13368,44 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for CLOCK" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK" >&5 + $as_echo_n "checking for CLOCK... " >&6; } + +-if test -n "$CLOCK_CFLAGS"; then +- pkg_cv_CLOCK_CFLAGS="$CLOCK_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$CLOCK_CFLAGS"; then ++ pkg_cv_CLOCK_CFLAGS="$CLOCK_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$CLOCK_LIBS"; then +- pkg_cv_CLOCK_LIBS="$CLOCK_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$CLOCK_LIBS"; then ++ pkg_cv_CLOCK_LIBS="$CLOCK_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -14993,25 +13418,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1` ++ CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED"` + else +- CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1` ++ CLOCK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$CLOCK_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) 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 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 +-$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met: ++ as_fn_error "Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met: + + $CLOCK_PKG_ERRORS + +@@ -15021,22 +13435,11 @@ + 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; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_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 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 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_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. + +@@ -15045,12 +13448,11 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + CLOCK_CFLAGS=$pkg_cv_CLOCK_CFLAGS + CLOCK_LIBS=$pkg_cv_CLOCK_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -15059,40 +13461,44 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for CLOCK_MECHANISM" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_MECHANISM" >&5 + $as_echo_n "checking for CLOCK_MECHANISM... " >&6; } + +-if test -n "$CLOCK_MECHANISM_CFLAGS"; then +- pkg_cv_CLOCK_MECHANISM_CFLAGS="$CLOCK_MECHANISM_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" gthread-2.0 gio-2.0 dbus-glib-1 \"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$CLOCK_MECHANISM_CFLAGS"; then ++ pkg_cv_CLOCK_MECHANISM_CFLAGS="$CLOCK_MECHANISM_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gthread-2.0 gio-2.0 dbus-glib-1 \""; } >&5 + ($PKG_CONFIG --exists --print-errors " gthread-2.0 gio-2.0 dbus-glib-1 ") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_CLOCK_MECHANISM_CFLAGS=`$PKG_CONFIG --cflags " gthread-2.0 gio-2.0 dbus-glib-1 " 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$CLOCK_MECHANISM_LIBS"; then +- pkg_cv_CLOCK_MECHANISM_LIBS="$CLOCK_MECHANISM_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" gthread-2.0 gio-2.0 dbus-glib-1 \"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$CLOCK_MECHANISM_LIBS"; then ++ pkg_cv_CLOCK_MECHANISM_LIBS="$CLOCK_MECHANISM_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gthread-2.0 gio-2.0 dbus-glib-1 \""; } >&5 + ($PKG_CONFIG --exists --print-errors " gthread-2.0 gio-2.0 dbus-glib-1 ") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_CLOCK_MECHANISM_LIBS=`$PKG_CONFIG --libs " gthread-2.0 gio-2.0 dbus-glib-1 " 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -15105,25 +13511,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- CLOCK_MECHANISM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gthread-2.0 gio-2.0 dbus-glib-1 " 2>&1` ++ CLOCK_MECHANISM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " gthread-2.0 gio-2.0 dbus-glib-1 "` + else +- CLOCK_MECHANISM_PKG_ERRORS=`$PKG_CONFIG --print-errors " gthread-2.0 gio-2.0 dbus-glib-1 " 2>&1` ++ CLOCK_MECHANISM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " gthread-2.0 gio-2.0 dbus-glib-1 "` + fi + # Put the nasty error message in config.log where it belongs + echo "$CLOCK_MECHANISM_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements ( gthread-2.0 gio-2.0 dbus-glib-1 ) were not met: +- +-$CLOCK_MECHANISM_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables CLOCK_MECHANISM_CFLAGS +-and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements ( gthread-2.0 gio-2.0 dbus-glib-1 ) were not met: ++ as_fn_error "Package requirements ( gthread-2.0 gio-2.0 dbus-glib-1 ) were not met: + + $CLOCK_MECHANISM_PKG_ERRORS + +@@ -15133,22 +13528,11 @@ + Alternatively, you may set the environment variables CLOCK_MECHANISM_CFLAGS + and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_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 environment variables CLOCK_MECHANISM_CFLAGS +-and CLOCK_MECHANISM_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 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++as_fn_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. + +@@ -15157,12 +13541,11 @@ + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++See \`config.log' for more details." "$LINENO" 5; } + else + CLOCK_MECHANISM_CFLAGS=$pkg_cv_CLOCK_MECHANISM_CFLAGS + CLOCK_MECHANISM_LIBS=$pkg_cv_CLOCK_MECHANISM_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -15179,7 +13562,7 @@ + POLKIT_CFLAGS= + POLKIT_LIBS= + # Check whether --enable-polkit was given. +-if test "${enable_polkit+set}" = set; then ++if test "${enable_polkit+set}" = set; then : + enableval=$enable_polkit; enable_polkit=$enableval + else + enable_polkit=auto +@@ -15191,40 +13574,44 @@ + HAVE_POLKIT=no + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for POLKIT" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POLKIT" >&5 + $as_echo_n "checking for POLKIT... " >&6; } + +-if test -n "$POLKIT_CFLAGS"; then +- pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED dbus-1 >= \$DBUS_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$POLKIT_CFLAGS"; then ++ pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED dbus-1 >= \$DBUS_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-1 >= $DBUS_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-1 >= $DBUS_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$POLKIT_LIBS"; then +- pkg_cv_POLKIT_LIBS="$POLKIT_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED dbus-1 >= \$DBUS_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$POLKIT_LIBS"; then ++ pkg_cv_POLKIT_LIBS="$POLKIT_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED dbus-1 >= \$DBUS_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-1 >= $DBUS_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-1 >= $DBUS_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -15237,14 +13624,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-1 >= $DBUS_REQUIRED" 2>&1` ++ POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-1 >= $DBUS_REQUIRED"` + else +- POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-1 >= $DBUS_REQUIRED" 2>&1` ++ POLKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-1 >= $DBUS_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$POLKIT_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + HAVE_POLKIT=no + elif test $pkg_failed = untried; then +@@ -15252,22 +13639,18 @@ + else + POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS + POLKIT_LIBS=$pkg_cv_POLKIT_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + HAVE_POLKIT=yes + fi + + if test "x$enable_polkit" = "xyes" -a "x$HAVE_POLKIT" = "xno" ; then +- { { $as_echo "$as_me:$LINENO: error: PolicyKit support explicity enabled but not available" >&5 +-$as_echo "$as_me: error: PolicyKit support explicity enabled but not available" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "PolicyKit support explicity enabled but not available" "$LINENO" 5 + fi + + if test "x$HAVE_POLKIT" = "xyes" ; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_POLKIT 1 +-_ACEOF ++$as_echo "#define HAVE_POLKIT 1" >>confdefs.h + + fi + fi +@@ -15283,7 +13666,7 @@ + + + # Check whether --enable-network_manager was given. +-if test "${enable_network_manager+set}" = set; then ++if test "${enable_network_manager+set}" = set; then : + enableval=$enable_network_manager; enable_network_manager=$enableval + else + enable_network_manager=auto +@@ -15294,40 +13677,44 @@ + else + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for NETWORK_MANAGER" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORK_MANAGER" >&5 + $as_echo_n "checking for NETWORK_MANAGER... " >&6; } + +-if test -n "$NETWORK_MANAGER_CFLAGS"; then +- pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= \$NETWORK_MANAGER_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NETWORK_MANAGER_CFLAGS"; then ++ pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= \$NETWORK_MANAGER_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "NetworkManager >= $NETWORK_MANAGER_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= $NETWORK_MANAGER_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$NETWORK_MANAGER_LIBS"; then +- pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= \$NETWORK_MANAGER_REQUIRED\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NETWORK_MANAGER_LIBS"; then ++ pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= \$NETWORK_MANAGER_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "NetworkManager >= $NETWORK_MANAGER_REQUIRED") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "NetworkManager >= $NETWORK_MANAGER_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -15340,14 +13727,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= $NETWORK_MANAGER_REQUIRED" 2>&1` ++ NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "NetworkManager >= $NETWORK_MANAGER_REQUIRED"` + else +- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= $NETWORK_MANAGER_REQUIRED" 2>&1` ++ NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "NetworkManager >= $NETWORK_MANAGER_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$NETWORK_MANAGER_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + HAVE_NETWORK_MANAGER=no + elif test $pkg_failed = untried; then +@@ -15355,16 +13742,14 @@ + else + NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS + NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + HAVE_NETWORK_MANAGER=yes + fi + fi + if test "x$HAVE_NETWORK_MANAGER" = "xyes" ; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_NETWORK_MANAGER 1 +-_ACEOF ++$as_echo "#define HAVE_NETWORK_MANAGER 1" >>confdefs.h + + fi + +@@ -15374,7 +13759,7 @@ + PANEL_INPROCESS_APPLETS= + + # Check whether --with-in-process-applets was given. +-if test "${with_in_process_applets+set}" = set; then ++if test "${with_in_process_applets+set}" = set; then : + withval=$with_in_process_applets; for i in `echo $withval | tr , ' '`; do + if test $i = "none"; then + PANEL_INPROCESS_NONE=1 +@@ -15405,34 +13790,37 @@ + if test $i = "clock"; then + CLOCK_COMPILE_INPROCESS=1 + +-cat >>confdefs.h <<\_ACEOF +-#define CLOCK_INPROCESS 1 +-_ACEOF ++$as_echo "#define CLOCK_INPROCESS 1" >>confdefs.h + + else if test $i = "fish"; then + FISH_COMPILE_INPROCESS=1 + +-cat >>confdefs.h <<\_ACEOF +-#define FISH_INPROCESS 1 +-_ACEOF ++$as_echo "#define FISH_INPROCESS 1" >>confdefs.h + + else if test $i = "notification-area"; then + NOTIFICATION_AREA_COMPILE_INPROCESS=1 + +-cat >>confdefs.h <<\_ACEOF +-#define NOTIFICATION_AREA_INPROCESS 1 +-_ACEOF ++$as_echo "#define NOTIFICATION_AREA_INPROCESS 1" >>confdefs.h + + else if test $i = "wncklet"; then + WNCKLET_COMPILE_INPROCESS=1 + +-cat >>confdefs.h <<\_ACEOF +-#define WNCKLET_INPROCESS 1 +-_ACEOF ++$as_echo "#define WNCKLET_INPROCESS 1" >>confdefs.h + + fi; fi; fi; fi + done + ++# Make it possible to disable initial slide-in animation ++# Check whether --enable-initial-animation was given. ++if test "${enable_initial_animation+set}" = set; then : ++ enableval=$enable_initial_animation; if test "x$enable_initial_animation" = xno; then : ++ ++$as_echo "#define DISABLE_INITIAL_ANIMATION 1" >>confdefs.h ++ ++fi ++fi ++ ++ + if test -n "$CLOCK_COMPILE_INPROCESS"; then + CLOCK_INPROCESS_TRUE= + CLOCK_INPROCESS_FALSE='#' +@@ -15467,24 +13855,15 @@ + + + # For the run dialog +- +- +- +- +- + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 + $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include <$ac_hdr> +@@ -15498,41 +13877,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_ac_Header=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" ++ eval "$as_ac_Header=no" + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++eval ac_res=\$$as_ac_Header ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 + _ACEOF +@@ -15543,17 +13899,13 @@ + done + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then +- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 + $as_echo_n "checking for library containing opendir... " >&6; } +-if test "${ac_cv_search_opendir+set}" = set; then ++if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -15578,70 +13930,39 @@ + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi +- rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_opendir=$ac_res +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- if test "${ac_cv_search_opendir+set}" = set; then ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_opendir+set}" = set; then : + break + fi + done +-if test "${ac_cv_search_opendir+set}" = set; then +- : ++if test "${ac_cv_search_opendir+set}" = set; then : ++ + else + ac_cv_search_opendir=no + fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 + $as_echo "$ac_cv_search_opendir" >&6; } + ac_res=$ac_cv_search_opendir +-if test "$ac_res" != no; then ++if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + + else +- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 + $as_echo_n "checking for library containing opendir... " >&6; } +-if test "${ac_cv_search_opendir+set}" = set; then ++if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -15666,70 +13987,39 @@ + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi +- rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_opendir=$ac_res +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- if test "${ac_cv_search_opendir+set}" = set; then ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_opendir+set}" = set; then : + break + fi + done +-if test "${ac_cv_search_opendir+set}" = set; then +- : ++if test "${ac_cv_search_opendir+set}" = set; then : ++ + else + ac_cv_search_opendir=no + fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 + $as_echo "$ac_cv_search_opendir" >&6; } + ac_res=$ac_cv_search_opendir +-if test "$ac_res" != no; then ++if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + + fi + +- { $as_echo "$as_me:$LINENO: checking for d_type member in directory struct" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_type member in directory struct" >&5 + $as_echo_n "checking for d_type member in directory struct... " >&6; } +-if test "${jm_cv_struct_dirent_d_type+set}" = set; then ++if test "${jm_cv_struct_dirent_d_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -15756,60 +14046,33 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + jm_cv_struct_dirent_d_type=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- jm_cv_struct_dirent_d_type=no ++ jm_cv_struct_dirent_d_type=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + + fi +-{ $as_echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $jm_cv_struct_dirent_d_type" >&5 + $as_echo "$jm_cv_struct_dirent_d_type" >&6; } + if test $jm_cv_struct_dirent_d_type = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_DIRENT_D_TYPE 1 +-_ACEOF ++$as_echo "#define HAVE_STRUCT_DIRENT_D_TYPE 1" >>confdefs.h + + fi + + + + +-{ $as_echo "$as_me:$LINENO: checking for X" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 + $as_echo_n "checking for X... " >&6; } + + + # Check whether --with-x was given. +-if test "${with_x+set}" = set; then ++if test "${with_x+set}" = set; then : + withval=$with_x; + fi + +@@ -15819,10 +14082,8 @@ + have_x=disabled + else + case $x_includes,$x_libraries in #( +- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 +-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} +- { (exit 1); exit 1; }; };; #( +- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then ++ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( ++ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # One or both of the vars are not set, and there is no cached value. +@@ -15870,21 +14131,25 @@ + # Check X11 before X11Rn because it is often a symlink to the current release. + ac_x_header_dirs=' + /usr/X11/include ++/usr/X11R7/include + /usr/X11R6/include + /usr/X11R5/include + /usr/X11R4/include + + /usr/include/X11 ++/usr/include/X11R7 + /usr/include/X11R6 + /usr/include/X11R5 + /usr/include/X11R4 + + /usr/local/X11/include ++/usr/local/X11R7/include + /usr/local/X11R6/include + /usr/local/X11R5/include + /usr/local/X11R4/include + + /usr/local/include/X11 ++/usr/local/include/X11R7 + /usr/local/include/X11R6 + /usr/local/include/X11R5 + /usr/local/include/X11R4 +@@ -15906,37 +14171,14 @@ + if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # We can compile using X headers with no special include directory. + ac_x_includes= + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir +@@ -15944,7 +14186,6 @@ + fi + done + fi +- + rm -f conftest.err conftest.$ac_ext + fi # $ac_x_includes = no + +@@ -15954,11 +14195,7 @@ + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS + LIBS="-lX11 $LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -15969,35 +14206,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + ac_x_libraries= + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- LIBS=$ac_save_LIBS ++ LIBS=$ac_save_LIBS + for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` + do + # Don't even attempt the hair of trying to link an X program! +@@ -16009,10 +14223,8 @@ + done + done + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi # $ac_x_libraries = no + + case $ac_x_includes,$ac_x_libraries in #( +@@ -16033,7 +14245,7 @@ + fi # $with_x != no + + if test "$have_x" != yes; then +- { $as_echo "$as_me:$LINENO: result: $have_x" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 + $as_echo "$have_x" >&6; } + no_x=yes + else +@@ -16044,46 +14256,50 @@ + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" +- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 + $as_echo "libraries $x_libraries, headers $x_includes" >&6; } + fi + + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for X" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 + $as_echo_n "checking for X... " >&6; } + +-if test -n "$X_CFLAGS"; then +- pkg_cv_X_CFLAGS="$X_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xau\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$X_CFLAGS"; then ++ pkg_cv_X_CFLAGS="$X_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xau\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11 xau") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_X_CFLAGS=`$PKG_CONFIG --cflags "x11 xau" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$X_LIBS"; then +- pkg_cv_X_LIBS="$X_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xau\"") >&5 ++if test -n "$PKG_CONFIG"; then ++ if test -n "$X_LIBS"; then ++ pkg_cv_X_LIBS="$X_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xau\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11 xau") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + pkg_cv_X_LIBS=`$PKG_CONFIG --libs "x11 xau" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -16096,14 +14312,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- X_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xau" 2>&1` ++ X_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xau"` + else +- X_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xau" 2>&1` ++ X_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xau"` + fi + # Put the nasty error message in config.log where it belongs + echo "$X_PKG_ERRORS" >&5 + +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + + # pkg-config modules not found (only present since X11R7 aka Xorg); use +@@ -16111,9 +14327,7 @@ + if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + +-cat >>confdefs.h <<\_ACEOF +-#define X_DISPLAY_MISSING 1 +-_ACEOF ++$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h + + X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= + else +@@ -16126,16 +14340,12 @@ + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . +- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 + $as_echo_n "checking whether -R must be followed by a space... " >&6; } + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + ac_xsave_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -16146,40 +14356,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++if ac_fn_c_try_link "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- LIBS="$ac_xsave_LIBS -R $x_libraries" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ LIBS="$ac_xsave_LIBS -R $x_libraries" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -16190,46 +14373,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++if ac_fn_c_try_link "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + X_LIBS="$X_LIBS -R $x_libraries" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- { $as_echo "$as_me:$LINENO: result: neither works" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 + $as_echo "neither works" >&6; } + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag + LIBS=$ac_xsave_LIBS + fi +@@ -16245,11 +14401,7 @@ + # libraries were built with DECnet support. And Karl Berry says + # the Alpha needs dnet_stub (dnet does not exist). + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16267,44 +14419,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_link "$LINENO"; then : + +- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 + $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } +-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then ++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16322,59 +14447,30 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dnet_dnet_ntoa=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dnet_dnet_ntoa=no ++ ac_cv_lib_dnet_dnet_ntoa=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 + $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then ++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 + $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } +-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then ++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16392,52 +14488,25 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dnet_stub_dnet_ntoa=no ++ ac_cv_lib_dnet_stub_dnet_ntoa=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 + $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then ++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" + fi + + fi + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" + + # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, +@@ -16448,105 +14517,20 @@ + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. +- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 +-$as_echo_n "checking for gethostbyname... " >&6; } +-if test "${ac_cv_func_gethostbyname+set}" = set; then +- $as_echo_n "(cached) " >&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 gethostbyname to an innocuous variant, in case declares gethostbyname. +- For example, HP-UX 11i declares gettimeofday. */ +-#define gethostbyname innocuous_gethostbyname +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char gethostbyname (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef gethostbyname +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char gethostbyname (); +-/* 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_gethostbyname || defined __stub___gethostbyname +-choke me +-#endif +- +-int +-main () +-{ +-return gethostbyname (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_gethostbyname=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_gethostbyname=no +-fi ++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" ++if test "x$ac_cv_func_gethostbyname" = x""yes; then : + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +-$as_echo "$ac_cv_func_gethostbyname" >&6; } + + if test $ac_cv_func_gethostbyname = no; then +- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 + $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then ++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16564,59 +14548,30 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl_gethostbyname=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_nsl_gethostbyname=no ++ ac_cv_lib_nsl_gethostbyname=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 + $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then ++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then +- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 + $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } +-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then ++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16634,43 +14589,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bsd_gethostbyname=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_bsd_gethostbyname=no ++ ac_cv_lib_bsd_gethostbyname=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 + $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then ++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" + fi + +@@ -16684,33 +14614,21 @@ + # variants that don't use the name server (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. +- { $as_echo "$as_me:$LINENO: checking for connect" >&5 +-$as_echo_n "checking for connect... " >&6; } +-if test "${ac_cv_func_connect+set}" = set; then ++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" ++if test "x$ac_cv_func_connect" = x""yes; then : ++ ++fi ++ ++ if test $ac_cv_func_connect = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 ++$as_echo_n "checking for connect in -lsocket... " >&6; } ++if test "${ac_cv_lib_socket_connect+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsocket $X_EXTRA_LIBS $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define connect to an innocuous variant, in case declares connect. +- For example, HP-UX 11i declares gettimeofday. */ +-#define connect innocuous_connect +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char connect (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef connect + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -16719,13 +14637,6 @@ + extern "C" + #endif + char connect (); +-/* 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_connect || defined __stub___connect +-choke me +-#endif +- + int + main () + { +@@ -16734,214 +14645,38 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_connect=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_connect=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +-$as_echo "$ac_cv_func_connect" >&6; } +- +- if test $ac_cv_func_connect = no; then +- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +-$as_echo_n "checking for connect in -lsocket... " >&6; } +-if test "${ac_cv_lib_socket_connect+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char connect (); +-int +-main () +-{ +-return connect (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_connect=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_socket_connect=no ++ ac_cv_lib_socket_connect=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 + $as_echo "$ac_cv_lib_socket_connect" >&6; } +-if test "x$ac_cv_lib_socket_connect" = x""yes; then ++if test "x$ac_cv_lib_socket_connect" = x""yes; then : + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" + fi + + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. +- { $as_echo "$as_me:$LINENO: checking for remove" >&5 +-$as_echo_n "checking for remove... " >&6; } +-if test "${ac_cv_func_remove+set}" = set; then +- $as_echo_n "(cached) " >&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 remove to an innocuous variant, in case declares remove. +- For example, HP-UX 11i declares gettimeofday. */ +-#define remove innocuous_remove +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char remove (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef remove +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char remove (); +-/* 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_remove || defined __stub___remove +-choke me +-#endif +- +-int +-main () +-{ +-return remove (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_remove=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_remove=no +-fi ++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" ++if test "x$ac_cv_func_remove" = x""yes; then : + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +-$as_echo "$ac_cv_func_remove" >&6; } + + if test $ac_cv_func_remove = no; then +- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 + $as_echo_n "checking for remove in -lposix... " >&6; } +-if test "${ac_cv_lib_posix_remove+set}" = set; then ++if test "${ac_cv_lib_posix_remove+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lposix $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16959,148 +14694,38 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_posix_remove=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_posix_remove=no ++ ac_cv_lib_posix_remove=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 + $as_echo "$ac_cv_lib_posix_remove" >&6; } +-if test "x$ac_cv_lib_posix_remove" = x""yes; then ++if test "x$ac_cv_lib_posix_remove" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" + fi + + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- { $as_echo "$as_me:$LINENO: checking for shmat" >&5 +-$as_echo_n "checking for shmat... " >&6; } +-if test "${ac_cv_func_shmat+set}" = set; then +- $as_echo_n "(cached) " >&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 shmat to an innocuous variant, in case declares shmat. +- For example, HP-UX 11i declares gettimeofday. */ +-#define shmat innocuous_shmat +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shmat (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef shmat +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char shmat (); +-/* 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_shmat || defined __stub___shmat +-choke me +-#endif +- +-int +-main () +-{ +-return shmat (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_shmat=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_shmat=no +-fi ++ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" ++if test "x$ac_cv_func_shmat" = x""yes; then : + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +-$as_echo "$ac_cv_func_shmat" >&6; } + + if test $ac_cv_func_shmat = no; then +- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 + $as_echo_n "checking for shmat in -lipc... " >&6; } +-if test "${ac_cv_lib_ipc_shmat+set}" = set; then ++if test "${ac_cv_lib_ipc_shmat+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lipc $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -17118,43 +14743,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ipc_shmat=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_ipc_shmat=no ++ ac_cv_lib_ipc_shmat=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 + $as_echo "$ac_cv_lib_ipc_shmat" >&6; } +-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then ++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" + fi + +@@ -17170,18 +14770,14 @@ + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # John Interrante, Karl Berry +- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 + $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then ++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -17199,43 +14795,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ICE_IceConnectionNumber=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_ICE_IceConnectionNumber=no ++ ac_cv_lib_ICE_IceConnectionNumber=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 + $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then ++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" + fi + +@@ -17245,28 +14816,21 @@ + + # X not found + if test x$no_x = xyes ; then +- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5 +-$as_echo "$as_me: error: X development libraries not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "X development libraries not found" "$LINENO" 5 + fi + + gp_save_cflags="$CFLAGS" + gp_save_libs="$LIBS" + CFLAGS="$X_CFLAGS" + LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" +- +-{ $as_echo "$as_me:$LINENO: checking for XFree in -lX11" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFree in -lX11" >&5 + $as_echo_n "checking for XFree in -lX11... " >&6; } +-if test "${ac_cv_lib_X11_XFree+set}" = set; then ++if test "${ac_cv_lib_X11_XFree+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lX11 $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -17284,43 +14848,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_X11_XFree=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_X11_XFree=no ++ ac_cv_lib_X11_XFree=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XFree" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XFree" >&5 + $as_echo "$ac_cv_lib_X11_XFree" >&6; } +-if test "x$ac_cv_lib_X11_XFree" = x""yes; then ++if test "x$ac_cv_lib_X11_XFree" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBX11 1 + _ACEOF +@@ -17328,24 +14867,17 @@ + LIBS="-lX11 $LIBS" + + else +- { { $as_echo "$as_me:$LINENO: error: libX11 not found" >&5 +-$as_echo "$as_me: error: libX11 not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "libX11 not found" "$LINENO" 5 + fi + +- +-{ $as_echo "$as_me:$LINENO: checking for XauFileName in -lXau" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauFileName in -lXau" >&5 + $as_echo_n "checking for XauFileName in -lXau... " >&6; } +-if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then ++if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXau $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -17363,43 +14895,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xau_XauFileName=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_Xau_XauFileName=no ++ ac_cv_lib_Xau_XauFileName=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauFileName" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauFileName" >&5 + $as_echo "$ac_cv_lib_Xau_XauFileName" >&6; } +-if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then ++if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBXAU 1 + _ACEOF +@@ -17407,9 +14914,7 @@ + LIBS="-lXau $LIBS" + + else +- { { $as_echo "$as_me:$LINENO: error: libXau not found" >&5 +-$as_echo "$as_me: error: libXau not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "libXau not found" "$LINENO" 5 + fi + + CFLAGS="$gp_save_cflags" +@@ -17424,9 +14929,7 @@ + if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + +-cat >>confdefs.h <<\_ACEOF +-#define X_DISPLAY_MISSING 1 +-_ACEOF ++$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h + + X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= + else +@@ -17439,16 +14942,12 @@ + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . +- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 + $as_echo_n "checking whether -R must be followed by a space... " >&6; } + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + ac_xsave_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -17459,40 +14958,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++if ac_fn_c_try_link "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- LIBS="$ac_xsave_LIBS -R $x_libraries" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ LIBS="$ac_xsave_LIBS -R $x_libraries" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -17503,46 +14975,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++if ac_fn_c_try_link "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + X_LIBS="$X_LIBS -R $x_libraries" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- { $as_echo "$as_me:$LINENO: result: neither works" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 + $as_echo "neither works" >&6; } + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag + LIBS=$ac_xsave_LIBS + fi +@@ -17558,11 +15003,7 @@ + # libraries were built with DECnet support. And Karl Berry says + # the Alpha needs dnet_stub (dnet does not exist). + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -17580,44 +15021,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_link "$LINENO"; then : + +- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 + $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } +-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then ++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -17635,59 +15049,30 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dnet_dnet_ntoa=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dnet_dnet_ntoa=no ++ ac_cv_lib_dnet_dnet_ntoa=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 + $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then ++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 + $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } +-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then ++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -17705,52 +15090,25 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dnet_stub_dnet_ntoa=no ++ ac_cv_lib_dnet_stub_dnet_ntoa=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 + $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then ++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" + fi + + fi + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" + + # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, +@@ -17761,105 +15119,20 @@ + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. +- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 +-$as_echo_n "checking for gethostbyname... " >&6; } +-if test "${ac_cv_func_gethostbyname+set}" = set; then +- $as_echo_n "(cached) " >&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 gethostbyname to an innocuous variant, in case declares gethostbyname. +- For example, HP-UX 11i declares gettimeofday. */ +-#define gethostbyname innocuous_gethostbyname +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char gethostbyname (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef gethostbyname +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char gethostbyname (); +-/* 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_gethostbyname || defined __stub___gethostbyname +-choke me +-#endif +- +-int +-main () +-{ +-return gethostbyname (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_gethostbyname=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" ++if test "x$ac_cv_func_gethostbyname" = x""yes; then : + +- ac_cv_func_gethostbyname=no + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +-$as_echo "$ac_cv_func_gethostbyname" >&6; } +- + if test $ac_cv_func_gethostbyname = no; then +- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 + $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then ++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -17877,59 +15150,30 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl_gethostbyname=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_nsl_gethostbyname=no ++ ac_cv_lib_nsl_gethostbyname=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 + $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then ++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then +- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 + $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } +-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then ++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -17947,43 +15191,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bsd_gethostbyname=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_bsd_gethostbyname=no ++ ac_cv_lib_bsd_gethostbyname=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 + $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then ++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" + fi + +@@ -17997,33 +15216,21 @@ + # variants that don't use the name server (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. +- { $as_echo "$as_me:$LINENO: checking for connect" >&5 +-$as_echo_n "checking for connect... " >&6; } +-if test "${ac_cv_func_connect+set}" = set; then ++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" ++if test "x$ac_cv_func_connect" = x""yes; then : ++ ++fi ++ ++ if test $ac_cv_func_connect = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 ++$as_echo_n "checking for connect in -lsocket... " >&6; } ++if test "${ac_cv_lib_socket_connect+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsocket $X_EXTRA_LIBS $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define connect to an innocuous variant, in case declares connect. +- For example, HP-UX 11i declares gettimeofday. */ +-#define connect innocuous_connect +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char connect (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef connect + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -18032,13 +15239,6 @@ + extern "C" + #endif + char connect (); +-/* 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_connect || defined __stub___connect +-choke me +-#endif +- + int + main () + { +@@ -18047,55 +15247,38 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_connect=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_socket_connect=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_connect=no ++ ac_cv_lib_socket_connect=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 ++$as_echo "$ac_cv_lib_socket_connect" >&6; } ++if test "x$ac_cv_lib_socket_connect" = x""yes; then : ++ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++ fi ++ ++ # Guillermo Gomez says -lposix is necessary on A/UX. ++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" ++if test "x$ac_cv_func_remove" = x""yes; then : ++ + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +-$as_echo "$ac_cv_func_connect" >&6; } + +- if test $ac_cv_func_connect = no; then +- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +-$as_echo_n "checking for connect in -lsocket... " >&6; } +-if test "${ac_cv_lib_socket_connect+set}" = set; then ++ if test $ac_cv_func_remove = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 ++$as_echo_n "checking for remove in -lposix... " >&6; } ++if test "${ac_cv_lib_posix_remove+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++LIBS="-lposix $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -18104,244 +15287,48 @@ + #ifdef __cplusplus + extern "C" + #endif +-char connect (); ++char remove (); + int + main () + { +-return connect (); ++return remove (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_socket_connect=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_posix_remove=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_socket_connect=no ++ ac_cv_lib_posix_remove=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +-$as_echo "$ac_cv_lib_socket_connect" >&6; } +-if test "x$ac_cv_lib_socket_connect" = x""yes; then +- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 ++$as_echo "$ac_cv_lib_posix_remove" >&6; } ++if test "x$ac_cv_lib_posix_remove" = x""yes; then : ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" + fi + + fi + +- # Guillermo Gomez says -lposix is necessary on A/UX. +- { $as_echo "$as_me:$LINENO: checking for remove" >&5 +-$as_echo_n "checking for remove... " >&6; } +-if test "${ac_cv_func_remove+set}" = set; then ++ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. ++ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" ++if test "x$ac_cv_func_shmat" = x""yes; then : ++ ++fi ++ ++ if test $ac_cv_func_shmat = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 ++$as_echo_n "checking for shmat in -lipc... " >&6; } ++if test "${ac_cv_lib_ipc_shmat+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lipc $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define remove to an innocuous variant, in case declares remove. +- For example, HP-UX 11i declares gettimeofday. */ +-#define remove innocuous_remove +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char remove (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef remove +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char remove (); +-/* 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_remove || defined __stub___remove +-choke me +-#endif +- +-int +-main () +-{ +-return remove (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_remove=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_remove=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +-$as_echo "$ac_cv_func_remove" >&6; } +- +- if test $ac_cv_func_remove = no; then +- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +-$as_echo_n "checking for remove in -lposix... " >&6; } +-if test "${ac_cv_lib_posix_remove+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lposix $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char remove (); +-int +-main () +-{ +-return remove (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_posix_remove=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_posix_remove=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +-$as_echo "$ac_cv_lib_posix_remove" >&6; } +-if test "x$ac_cv_lib_posix_remove" = x""yes; then +- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +-fi +- +- fi +- +- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- { $as_echo "$as_me:$LINENO: checking for shmat" >&5 +-$as_echo_n "checking for shmat... " >&6; } +-if test "${ac_cv_func_shmat+set}" = set; then +- $as_echo_n "(cached) " >&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 shmat to an innocuous variant, in case declares shmat. +- For example, HP-UX 11i declares gettimeofday. */ +-#define shmat innocuous_shmat +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shmat (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef shmat + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -18350,13 +15337,6 @@ + extern "C" + #endif + char shmat (); +-/* 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_shmat || defined __stub___shmat +-choke me +-#endif +- + int + main () + { +@@ -18365,109 +15345,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_shmat=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_shmat=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +-$as_echo "$ac_cv_func_shmat" >&6; } +- +- if test $ac_cv_func_shmat = no; then +- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +-$as_echo_n "checking for shmat in -lipc... " >&6; } +-if test "${ac_cv_lib_ipc_shmat+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lipc $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char shmat (); +-int +-main () +-{ +-return shmat (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ipc_shmat=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_ipc_shmat=no ++ ac_cv_lib_ipc_shmat=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 + $as_echo "$ac_cv_lib_ipc_shmat" >&6; } +-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then ++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" + fi + +@@ -18483,18 +15372,14 @@ + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # John Interrante, Karl Berry +- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 + $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then ++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -18512,43 +15397,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ICE_IceConnectionNumber=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_ICE_IceConnectionNumber=no ++ ac_cv_lib_ICE_IceConnectionNumber=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 + $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then ++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" + fi + +@@ -18558,28 +15418,21 @@ + + # X not found + if test x$no_x = xyes ; then +- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5 +-$as_echo "$as_me: error: X development libraries not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "X development libraries not found" "$LINENO" 5 + fi + + gp_save_cflags="$CFLAGS" + gp_save_libs="$LIBS" + CFLAGS="$X_CFLAGS" + LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" +- +-{ $as_echo "$as_me:$LINENO: checking for XFree in -lX11" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFree in -lX11" >&5 + $as_echo_n "checking for XFree in -lX11... " >&6; } +-if test "${ac_cv_lib_X11_XFree+set}" = set; then ++if test "${ac_cv_lib_X11_XFree+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lX11 $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -18597,43 +15450,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_X11_XFree=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_X11_XFree=no ++ ac_cv_lib_X11_XFree=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XFree" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XFree" >&5 + $as_echo "$ac_cv_lib_X11_XFree" >&6; } +-if test "x$ac_cv_lib_X11_XFree" = x""yes; then ++if test "x$ac_cv_lib_X11_XFree" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBX11 1 + _ACEOF +@@ -18641,24 +15469,17 @@ + LIBS="-lX11 $LIBS" + + else +- { { $as_echo "$as_me:$LINENO: error: libX11 not found" >&5 +-$as_echo "$as_me: error: libX11 not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "libX11 not found" "$LINENO" 5 + fi + +- +-{ $as_echo "$as_me:$LINENO: checking for XauFileName in -lXau" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauFileName in -lXau" >&5 + $as_echo_n "checking for XauFileName in -lXau... " >&6; } +-if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then ++if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXau $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -18676,43 +15497,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xau_XauFileName=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_Xau_XauFileName=no ++ ac_cv_lib_Xau_XauFileName=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauFileName" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauFileName" >&5 + $as_echo "$ac_cv_lib_Xau_XauFileName" >&6; } +-if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then ++if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBXAU 1 + _ACEOF +@@ -18720,9 +15516,7 @@ + LIBS="-lXau $LIBS" + + else +- { { $as_echo "$as_me:$LINENO: error: libXau not found" >&5 +-$as_echo "$as_me: error: libXau not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "libXau not found" "$LINENO" 5 + fi + + CFLAGS="$gp_save_cflags" +@@ -18733,7 +15527,7 @@ + else + X_CFLAGS=$pkg_cv_X_CFLAGS + X_LIBS=$pkg_cv_X_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : + fi +@@ -18743,9 +15537,7 @@ + + if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_RANDR 1 +-_ACEOF ++$as_echo "#define HAVE_RANDR 1" >>confdefs.h + + fi + +@@ -18769,151 +15561,12 @@ + + + +- +-for ac_header in locale.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## -------------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ## +-## -------------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_header in locale.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" ++if test "x$ac_cv_header_locale_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_LOCALE_H 1 + _ACEOF + + fi +@@ -18921,16 +15574,12 @@ + done + + if test $ac_cv_header_locale_h = yes; then +- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 + $as_echo_n "checking for LC_MESSAGES... " >&6; } +-if test "${am_cv_val_LC_MESSAGES+set}" = set; then ++if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -18941,46 +15590,19 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + am_cv_val_LC_MESSAGES=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- am_cv_val_LC_MESSAGES=no ++ am_cv_val_LC_MESSAGES=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 + $as_echo "$am_cv_val_LC_MESSAGES" >&6; } + if test $am_cv_val_LC_MESSAGES = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LC_MESSAGES 1 +-_ACEOF ++$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h + + fi + fi +@@ -18993,155 +15615,20 @@ + XGETTEXT=: + INTLLIBS= + +- if test "${ac_cv_header_libintl_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +-$as_echo_n "checking for libintl.h... " >&6; } +-if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 +-$as_echo_n "checking libintl.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 +-$as_echo_n "checking libintl.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## -------------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ## +-## -------------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +-$as_echo_n "checking for libintl.h... " >&6; } +-if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_header_libintl_h=$ac_header_preproc +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } +- +-fi +-if test "x$ac_cv_header_libintl_h" = x""yes; then ++ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" ++if test "x$ac_cv_header_libintl_h" = x""yes; then : + gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + + # + # First check in libc + # +- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 + $as_echo_n "checking for ngettext in libc... " >&6; } +-if test "${gt_cv_func_ngettext_libc+set}" = set; then ++if test "${gt_cv_func_ngettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -19154,54 +15641,25 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_ngettext_libc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gt_cv_func_ngettext_libc=no ++ gt_cv_func_ngettext_libc=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 + $as_echo "$gt_cv_func_ngettext_libc" >&6; } + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 + $as_echo_n "checking for dgettext in libc... " >&6; } +-if test "${gt_cv_func_dgettext_libc+set}" = set; then ++if test "${gt_cv_func_dgettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -19214,141 +15672,26 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_dgettext_libc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gt_cv_func_dgettext_libc=no ++ gt_cv_func_dgettext_libc=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 + $as_echo "$gt_cv_func_dgettext_libc" >&6; } + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- +-for ac_func in bind_textdomain_codeset +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&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 $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* 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_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + _ACEOF + + fi +@@ -19363,18 +15706,14 @@ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + +- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 + $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then ++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -19384,63 +15723,34 @@ + extern "C" + #endif + char bindtextdomain (); +-int +-main () +-{ +-return bindtextdomain (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++int ++main () ++{ ++return bindtextdomain (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_bindtextdomain=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_bindtextdomain=no ++ ac_cv_lib_intl_bindtextdomain=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 + $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 + $as_echo_n "checking for ngettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_ngettext+set}" = set; then ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -19458,55 +15768,26 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_ngettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_ngettext=no ++ ac_cv_lib_intl_ngettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 + $as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 + $as_echo_n "checking for dgettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_dgettext+set}" = set; then ++if test "${ac_cv_lib_intl_dgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -19524,43 +15805,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_dgettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_dgettext=no ++ ac_cv_lib_intl_dgettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 + $as_echo "$ac_cv_lib_intl_dgettext" >&6; } +-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then ++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : + gt_cv_func_dgettext_libintl=yes + fi + +@@ -19570,22 +15826,18 @@ + + + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 + $as_echo_n "checking if -liconv is needed to use gettext... " >&6; } +- { $as_echo "$as_me:$LINENO: result: " >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 + $as_echo "" >&6; } +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 + $as_echo_n "checking for ngettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_ngettext+set}" = set; then ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -19603,55 +15855,26 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_ngettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_ngettext=no ++ ac_cv_lib_intl_ngettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 + $as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 + $as_echo_n "checking for dcgettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then ++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -19669,43 +15892,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_dcgettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_dcgettext=no ++ ac_cv_lib_intl_dcgettext=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 + $as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then ++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : + gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv + else +@@ -19727,102 +15925,12 @@ + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset +- +-for ac_func in bind_textdomain_codeset +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&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 $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* 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_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + _ACEOF + + fi +@@ -19852,15 +15960,13 @@ + + if test "$gt_cv_have_gettext" = "yes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_GETTEXT 1 +-_ACEOF ++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_MSGFMT+set}" = set; then ++if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case "$MSGFMT" in +@@ -19885,118 +15991,28 @@ + fi + MSGFMT="$ac_cv_path_MSGFMT" + if test "$MSGFMT" != "no"; then +- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 + $as_echo "$MSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" +- +-for ac_func in dcgettext +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&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 $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* 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_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ for ac_func in dcgettext ++do : ++ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" ++if test "x$ac_cv_func_dcgettext" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_DCGETTEXT 1 + _ACEOF + + fi + done + + MSGFMT_OPTS= +- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 + $as_echo_n "checking if msgfmt accepts -c... " >&6; } + cat >conftest.foo <<_ACEOF + +@@ -20011,14 +16027,14 @@ + "Content-Transfer-Encoding: 8bit\n" + + _ACEOF +-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 ++if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 + ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +-else { $as_echo "$as_me:$LINENO: result: no" >&5 ++else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + echo "$as_me: failed input was:" >&5 + sed 's/^/| /' conftest.foo >&5 +@@ -20026,9 +16042,9 @@ + + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GMSGFMT+set}" = set; then ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in +@@ -20041,14 +16057,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" +@@ -20057,19 +16073,19 @@ + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 + $as_echo "$GMSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + + # Extract the first word of "xgettext", so it can be a program name with args. + set dummy xgettext; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_XGETTEXT+set}" = set; then ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case "$XGETTEXT" in +@@ -20094,144 +16110,33 @@ + fi + XGETTEXT="$ac_cv_path_XGETTEXT" + if test "$XGETTEXT" != ":"; then +- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 + $as_echo "$XGETTEXT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +-extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- CATOBJEXT=.gmo +- DATADIRNAME=share +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- case $host in +- *-*-solaris*) +- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-$as_echo_n "checking for bind_textdomain_codeset... " >&6; } +-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then +- $as_echo_n "(cached) " >&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 bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. +- For example, HP-UX 11i declares gettimeofday. */ +-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char bind_textdomain_codeset (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef bind_textdomain_codeset +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char bind_textdomain_codeset (); +-/* 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_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +-choke me +-#endif ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + + int + main () + { +-return bind_textdomain_codeset (); ++extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_bind_textdomain_codeset=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ CATOBJEXT=.gmo ++ DATADIRNAME=share + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_bind_textdomain_codeset=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then ++ case $host in ++ *-*-solaris*) ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + CATOBJEXT=.gmo + DATADIRNAME=share + else +@@ -20246,10 +16151,8 @@ + ;; + esac + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else +@@ -20263,9 +16166,7 @@ + + if test "$gt_cv_have_gettext" = "yes" ; then + +-cat >>confdefs.h <<\_ACEOF +-#define ENABLE_NLS 1 +-_ACEOF ++$as_echo "#define ENABLE_NLS 1" >>confdefs.h + + fi + +@@ -20273,7 +16174,7 @@ + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else +- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 + $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=":" + fi +@@ -20306,7 +16207,7 @@ + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else +- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 + $as_echo_n "checking for catalogs to be installed... " >&6; } + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do +@@ -20331,7 +16232,7 @@ + fi + done + LINGUAS=$NEW_LINGUAS +- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 + $as_echo "$LINGUAS" >&6; } + fi + +@@ -20369,9 +16270,9 @@ + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. + set dummy gtkdoc-check; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then ++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GTKDOC_CHECK in +@@ -20384,14 +16285,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -20399,10 +16300,10 @@ + fi + GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK + if test -n "$GTKDOC_CHECK"; then +- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 + $as_echo "$GTKDOC_CHECK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -20411,9 +16312,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then ++if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GTKDOC_REBASE in +@@ -20426,14 +16327,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -20441,10 +16342,10 @@ + fi + GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE + if test -n "$GTKDOC_REBASE"; then +- { $as_echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 + $as_echo "$GTKDOC_REBASE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -20455,9 +16356,9 @@ + + # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. + set dummy gtkdoc-mkpdf; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then ++if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GTKDOC_MKPDF in +@@ -20470,14 +16371,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -20485,10 +16386,10 @@ + fi + GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF + if test -n "$GTKDOC_MKPDF"; then +- { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 + $as_echo "$GTKDOC_MKPDF" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -20496,7 +16397,7 @@ + + + # Check whether --with-html-dir was given. +-if test "${with_html_dir+set}" = set; then ++if test "${with_html_dir+set}" = set; then : + withval=$with_html_dir; + else + with_html_dir='${datadir}/gtk-doc/html' +@@ -20506,7 +16407,7 @@ + + + # Check whether --enable-gtk-doc was given. +-if test "${enable_gtk_doc+set}" = set; then ++if test "${enable_gtk_doc+set}" = set; then : + enableval=$enable_gtk_doc; + else + enable_gtk_doc=no +@@ -20515,33 +16416,31 @@ + + if test x$enable_gtk_doc = xyes; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\"") >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + : + else +- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" >&5 +-$as_echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5 + fi + fi + +- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 + $as_echo_n "checking whether to build gtk-doc documentation... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 + $as_echo "$enable_gtk_doc" >&6; } + + # Check whether --enable-gtk-doc-html was given. +-if test "${enable_gtk_doc_html+set}" = set; then ++if test "${enable_gtk_doc_html+set}" = set; then : + enableval=$enable_gtk_doc_html; + else + enable_gtk_doc_html=yes + fi + + # Check whether --enable-gtk-doc-pdf was given. +-if test "${enable_gtk_doc_pdf+set}" = set; then ++if test "${enable_gtk_doc_pdf+set}" = set; then : + enableval=$enable_gtk_doc_pdf; + else + enable_gtk_doc_pdf=no +@@ -20600,11 +16499,11 @@ + gdu_cv_version_required=0.3.2 + + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + gdu_cv_have_gdu=yes + else + gdu_cv_have_gdu=no +@@ -20613,15 +16512,13 @@ + if test "$gdu_cv_have_gdu" = "yes"; then + : + else +- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5 +-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5 + fi + + + + # Check whether --with-help-dir was given. +-if test "${with_help_dir+set}" = set; then ++if test "${with_help_dir+set}" = set; then : + withval=$with_help_dir; + else + with_help_dir='${datadir}/gnome/help' +@@ -20632,7 +16529,7 @@ + + + # Check whether --with-omf-dir was given. +-if test "${with_omf_dir+set}" = set; then ++if test "${with_omf_dir+set}" = set; then : + withval=$with_omf_dir; + else + with_omf_dir='${datadir}/omf' +@@ -20643,7 +16540,7 @@ + + + # Check whether --with-help-formats was given. +-if test "${with_help_formats+set}" = set; then ++if test "${with_help_formats+set}" = set; then : + withval=$with_help_formats; + else + with_help_formats='' +@@ -20653,7 +16550,7 @@ + + + # Check whether --enable-scrollkeeper was given. +-if test "${enable_scrollkeeper+set}" = set; then ++if test "${enable_scrollkeeper+set}" = set; then : + enableval=$enable_scrollkeeper; + else + enable_scrollkeeper=yes +@@ -20691,13 +16588,13 @@ + + + # Check whether --with-gconf-source was given. +-if test "${with_gconf_source+set}" = set; then ++if test "${with_gconf_source+set}" = set; then : + withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" + fi + + + +- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 + $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } + + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +@@ -20706,22 +16603,20 @@ + + + # Check whether --with-gconf-schema-file-dir was given. +-if test "${with_gconf_schema_file_dir+set}" = set; then ++if test "${with_gconf_schema_file_dir+set}" = set; then : + withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval" + fi + + + +- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 + $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } + + # Check whether --enable-schemas-install was given. +-if test "${enable_schemas_install+set}" = set; then ++if test "${enable_schemas_install+set}" = set; then : + enableval=$enable_schemas_install; case ${enableval} in + yes|no) ;; +- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5 +-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;} +- { (exit 1); exit 1; }; } ;; ++ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; + esac + fi + +@@ -20739,9 +16634,7 @@ + *-*-solaris*) + ostype=solaris + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_SOLARIS 1 +-_ACEOF ++$as_echo "#define HAVE_SOLARIS 1" >>confdefs.h + + ;; + esac +@@ -20750,9 +16643,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_AWK+set}" = set; then ++if test "${ac_cv_path_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $AWK in +@@ -20765,14 +16658,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -20780,10 +16673,10 @@ + fi + AWK=$ac_cv_path_AWK + if test -n "$AWK"; then +- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 + $as_echo "$AWK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -20795,9 +16688,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PERL+set}" = set; then ++if test "${ac_cv_path_PERL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $PERL in +@@ -20810,14 +16703,14 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + ;; +@@ -20825,10 +16718,10 @@ + fi + PERL=$ac_cv_path_PERL + if test -n "$PERL"; then +- { $as_echo "$as_me:$LINENO: result: $PERL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 + $as_echo "$PERL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -20838,7 +16731,7 @@ + + + # Check whether --enable-rebuilds was given. +-if test "${enable_rebuilds+set}" = set; then ++if test "${enable_rebuilds+set}" = set; then : + enableval=$enable_rebuilds; + else + enable_rebuilds=yes +@@ -20882,13 +16775,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -20896,8 +16789,8 @@ + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +@@ -20920,11 +16813,11 @@ + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && +- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + $as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi +@@ -20944,8 +16837,8 @@ + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. +- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' ++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + +@@ -20961,143 +16854,90 @@ + fi + + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + ac_config_commands="$ac_config_commands po/stamp-it" + + + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_LIBECAL_TRUE}" && test -z "${HAVE_LIBECAL_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBECAL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_LIBECAL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_LIBECAL\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_POLKIT\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_POLKIT\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_POLKIT\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CLOCK_INPROCESS_TRUE}" && test -z "${CLOCK_INPROCESS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"CLOCK_INPROCESS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"CLOCK_INPROCESS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CLOCK_INPROCESS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${FISH_INPROCESS_TRUE}" && test -z "${FISH_INPROCESS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"FISH_INPROCESS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"FISH_INPROCESS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"FISH_INPROCESS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${NOTIFICATION_AREA_INPROCESS_TRUE}" && test -z "${NOTIFICATION_AREA_INPROCESS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"NOTIFICATION_AREA_INPROCESS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"NOTIFICATION_AREA_INPROCESS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"NOTIFICATION_AREA_INPROCESS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${WNCKLET_INPROCESS_TRUE}" && test -z "${WNCKLET_INPROCESS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"WNCKLET_INPROCESS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"WNCKLET_INPROCESS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"WNCKLET_INPROCESS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_REBASE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_REBASE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_SK\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + : ${CONFIG_STATUS=./config.status} + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 + $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++as_write_fail=0 ++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -21107,17 +16947,18 @@ + debug=false + ac_cs_recheck=false + ac_cs_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +-_ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++SHELL=\${CONFIG_SHELL-$SHELL} ++export SHELL ++_ASEOF ++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +@@ -21125,23 +16966,15 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- + as_nl=' + ' + export as_nl +@@ -21149,7 +16982,13 @@ + as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' + else +@@ -21160,7 +16999,7 @@ + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; +- case $arg in ++ case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +@@ -21183,13 +17022,6 @@ + } + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- + + # IFS + # We need space, tab and new line, in precisely that order. Quoting is +@@ -21199,15 +17031,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -21219,12 +17051,16 @@ + fi + if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' +@@ -21236,7 +17072,89 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++# as_fn_error ERROR [LINENO LOG_FD] ++# --------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with status $?, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -21250,8 +17168,12 @@ + as_basename=false + fi + ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi + +-# Name of the executable. + as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +@@ -21271,76 +17193,25 @@ + } + s/.*/./; q'` + +-# CDPATH. +-$as_unset CDPATH +- +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then +@@ -21369,8 +17240,56 @@ + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null + ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ ++ ++} # as_fn_mkdir_p + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +@@ -21389,10 +17308,10 @@ + if test -d "$1"; then + test -d "$1/."; + else +- case $1 in ++ case $1 in #( + -*)set "./$1";; + esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +@@ -21407,13 +17326,19 @@ + + + exec 6>&1 ++## ----------------------------------- ## ++## Main body of $CONFIG_STATUS script. ## ++## ----------------------------------- ## ++_ASEOF ++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +-# Save the log message, to keep $[0] and so on meaningful, and to ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# Save the log message, to keep $0 and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" + This file was extended by gnome-panel $as_me 2.27.92, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.64. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -21445,10 +17370,11 @@ + + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ +-\`$as_me' instantiates files from templates according to the +-current configuration. ++\`$as_me' instantiates files and other configuration actions ++from templates according to the current configuration. Unless the files ++and actions are specified as TAGs, all are instantiated by default. + +-Usage: $0 [OPTION]... [FILE]... ++Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit +@@ -21470,16 +17396,16 @@ + Configuration commands: + $config_commands + +-Report bugs to ." ++Report bugs to ." + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ + gnome-panel config.status 2.27.92 +-configured by $0, generated by GNU Autoconf 2.63, ++configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +-Copyright (C) 2008 Free Software Foundation, Inc. ++Copyright (C) 2009 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -21522,20 +17448,19 @@ + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ++ as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" ++ as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- { $as_echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; };; ++ as_fn_error "ambiguous option: \`$1' ++Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +@@ -21543,11 +17468,10 @@ + ac_cs_silent=: ;; + + # This is an error. +- -*) { $as_echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ;; ++ -*) as_fn_error "unrecognized option: \`$1' ++Try \`$0 --help' for more information." ;; + +- *) ac_config_targets="$ac_config_targets $1" ++ *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac +@@ -21890,9 +17814,7 @@ + "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; + +- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +- { (exit 1); exit 1; }; };; ++ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +@@ -21919,7 +17841,7 @@ + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + ' 0 +- trap '{ (exit 1); exit 1; }' 1 2 13 15 ++ trap 'as_fn_exit 1' 1 2 13 15 + } + # Create a (secure) tmp directory for tmp files. + +@@ -21930,11 +17852,7 @@ + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || +-{ +- $as_echo "$as_me: cannot create a temporary directory in ." >&2 +- { (exit 1); exit 1; } +-} ++} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -21942,10 +17860,16 @@ + if test -n "$CONFIG_FILES"; then + + +-ac_cr=' ' ++ac_cr=`echo X | tr X '\015'` ++# On cygwin, bash can eat \r inside `` if the user requested igncr. ++# But we know of no other shell where ac_cr would be empty at this ++# point, so we can use a bashism as a fallback. ++if test "x$ac_cr" = x; then ++ eval ac_cr=\$\'\\r\' ++fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\\r' ++ ac_cs_awk_cr='\r' + else + ac_cs_awk_cr=$ac_cr + fi +@@ -21959,24 +17883,18 @@ + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -22065,9 +17983,7 @@ + else + cat + fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +-$as_echo "$as_me: error: could not setup config files machinery" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not setup config files machinery" "$LINENO" 5 + _ACEOF + + # VPATH may cause trouble with some makes, so we remove $(srcdir), +@@ -22108,9 +18024,7 @@ + if test -z "$ac_t"; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -22195,9 +18109,7 @@ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +-$as_echo "$as_me: error: could not setup config headers machinery" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -22210,9 +18122,7 @@ + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} +- { (exit 1); exit 1; }; };; ++ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -22240,12 +18150,10 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac +- ac_file_inputs="$ac_file_inputs '$ac_f'" ++ as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't +@@ -22256,7 +18164,7 @@ + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 + $as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. +@@ -22269,9 +18177,7 @@ + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ;; ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -22299,47 +18205,7 @@ + q + } + s/.*/./; q'` +- { as_dir="$ac_dir" +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + + case "$ac_dir" in +@@ -22396,7 +18262,6 @@ + # If the template does not know about datarootdir, expand it. + # FIXME: This hack should be removed a few years after 2.60. + ac_datarootdir_hack=; ac_datarootdir_seen= +- + ac_sed_dataroot=' + /datarootdir/ { + p +@@ -22406,12 +18271,11 @@ + /@docdir@/p + /@infodir@/p + /@localedir@/p +-/@mandir@/p +-' ++/@mandir@/p' + case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +@@ -22421,7 +18285,7 @@ + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g +- s&\\\${datarootdir}&$datarootdir&g' ;; ++ s&\\\${datarootdir}&$datarootdir&g' ;; + esac + _ACEOF + +@@ -22450,14 +18314,12 @@ + $ac_datarootdir_hack + " + eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&2;} +@@ -22467,9 +18329,7 @@ + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -22480,25 +18340,19 @@ + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then +- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 +-$as_echo "$as_me: error: could not create -" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create -" "$LINENO" 5 + fi + # Compute "$ac_file"'s index in $config_headers. + _am_arg="$ac_file" +@@ -22536,7 +18390,7 @@ + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + +- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 + $as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac +@@ -22631,47 +18485,7 @@ + q + } + s/.*/./; q'` +- { as_dir=$dirpart/$fdir +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +@@ -23324,9 +19138,7 @@ + esac ;; + "po/stamp-it":C) + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then +- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 +-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + fi + rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" + >"po/stamp-it.tmp" +@@ -23349,15 +19161,12 @@ + done # for ac_tag + + +-{ (exit 0); exit 0; } ++as_fn_exit 0 + _ACEOF +-chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -23378,10 +19187,10 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || { (exit 1); exit 1; } ++ $ac_cs_success || as_fn_exit $? + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then +- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + +diff -Nur gnome-panel-2.27.92/doc/Makefile.in gnome-panel-2.27.92.ubuntu/doc/Makefile.in +--- gnome-panel-2.27.92/doc/Makefile.in 2009-09-09 02:26:39.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/doc/Makefile.in 2009-09-09 13:08:25.000000000 +0200 +@@ -219,6 +219,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/doc/reference/Makefile.in gnome-panel-2.27.92.ubuntu/doc/reference/Makefile.in +--- gnome-panel-2.27.92/doc/reference/Makefile.in 2009-09-09 02:26:40.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/doc/reference/Makefile.in 2009-09-09 13:08:25.000000000 +0200 +@@ -219,6 +219,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/doc/reference/panel-applet/Makefile.in gnome-panel-2.27.92.ubuntu/doc/reference/panel-applet/Makefile.in +--- gnome-panel-2.27.92/doc/reference/panel-applet/Makefile.in 2009-09-09 02:26:40.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/doc/reference/panel-applet/Makefile.in 2009-09-09 13:08:25.000000000 +0200 +@@ -186,6 +186,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/gnome-panel/libpanel-util/Makefile.in gnome-panel-2.27.92.ubuntu/gnome-panel/libpanel-util/Makefile.in +--- gnome-panel-2.27.92/gnome-panel/libpanel-util/Makefile.in 2009-09-09 02:26:40.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/gnome-panel/libpanel-util/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -213,6 +213,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/gnome-panel/Makefile.in gnome-panel-2.27.92.ubuntu/gnome-panel/Makefile.in +--- gnome-panel-2.27.92/gnome-panel/Makefile.in 2009-09-09 02:26:40.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/gnome-panel/Makefile.in 2009-09-09 13:08:25.000000000 +0200 +@@ -82,10 +82,11 @@ + main.$(OBJEXT) panel-widget.$(OBJEXT) button-widget.$(OBJEXT) \ + xstuff.$(OBJEXT) panel-session.$(OBJEXT) \ + panel-compatibility.$(OBJEXT) panel.$(OBJEXT) applet.$(OBJEXT) \ +- drawer.$(OBJEXT) panel-config-global.$(OBJEXT) \ +- panel-util.$(OBJEXT) panel-gconf.$(OBJEXT) \ +- panel-properties-dialog.$(OBJEXT) panel-run-dialog.$(OBJEXT) \ +- menu.$(OBJEXT) panel-context-menu.$(OBJEXT) launcher.$(OBJEXT) \ ++ applet-signaler.$(OBJEXT) drawer.$(OBJEXT) \ ++ panel-config-global.$(OBJEXT) panel-util.$(OBJEXT) \ ++ panel-gconf.$(OBJEXT) panel-properties-dialog.$(OBJEXT) \ ++ panel-run-dialog.$(OBJEXT) menu.$(OBJEXT) \ ++ panel-context-menu.$(OBJEXT) launcher.$(OBJEXT) \ + panel-applet-frame.$(OBJEXT) panel-shell.$(OBJEXT) \ + panel-background.$(OBJEXT) panel-background-monitor.$(OBJEXT) \ + panel-stock-icons.$(OBJEXT) panel-action-button.$(OBJEXT) \ +@@ -325,6 +326,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +@@ -471,6 +473,7 @@ + panel-compatibility.c \ + panel.c \ + applet.c \ ++ applet-signaler.c \ + drawer.c \ + panel-config-global.c \ + panel-util.c \ +@@ -516,6 +519,7 @@ + panel-compatibility.h \ + panel.h \ + applet.h \ ++ applet-signaler.h \ + drawer.h \ + panel-util.h \ + panel-properties-dialog.h \ +@@ -757,6 +761,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GNOME_Panel-common.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GNOME_Panel-skels.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GNOME_Panel-stubs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/applet-signaler.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/applet.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/button-widget.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawer.Po@am__quote@ +diff -Nur gnome-panel-2.27.92/help/clock/Makefile.in gnome-panel-2.27.92.ubuntu/help/clock/Makefile.in +--- gnome-panel-2.27.92/help/clock/Makefile.in 2009-09-09 02:26:40.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/help/clock/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -204,6 +204,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/help/fish/Makefile.in gnome-panel-2.27.92.ubuntu/help/fish/Makefile.in +--- gnome-panel-2.27.92/help/fish/Makefile.in 2009-09-09 02:26:41.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/help/fish/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -204,6 +204,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/help/Makefile.in gnome-panel-2.27.92.ubuntu/help/Makefile.in +--- gnome-panel-2.27.92/help/Makefile.in 2009-09-09 02:26:40.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/help/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -219,6 +219,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/icons/16x16/Makefile.in gnome-panel-2.27.92.ubuntu/icons/16x16/Makefile.in +--- gnome-panel-2.27.92/icons/16x16/Makefile.in 2009-09-09 02:26:41.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/icons/16x16/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -203,6 +203,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/icons/22x22/Makefile.in gnome-panel-2.27.92.ubuntu/icons/22x22/Makefile.in +--- gnome-panel-2.27.92/icons/22x22/Makefile.in 2009-09-09 02:26:41.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/icons/22x22/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -203,6 +203,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/icons/24x24/Makefile.in gnome-panel-2.27.92.ubuntu/icons/24x24/Makefile.in +--- gnome-panel-2.27.92/icons/24x24/Makefile.in 2009-09-09 02:26:41.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/icons/24x24/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -203,6 +203,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/icons/32x32/Makefile.in gnome-panel-2.27.92.ubuntu/icons/32x32/Makefile.in +--- gnome-panel-2.27.92/icons/32x32/Makefile.in 2009-09-09 02:26:41.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/icons/32x32/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -203,6 +203,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/icons/48x48/Makefile.in gnome-panel-2.27.92.ubuntu/icons/48x48/Makefile.in +--- gnome-panel-2.27.92/icons/48x48/Makefile.in 2009-09-09 02:26:41.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/icons/48x48/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -203,6 +203,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/icons/Makefile.in gnome-panel-2.27.92.ubuntu/icons/Makefile.in +--- gnome-panel-2.27.92/icons/Makefile.in 2009-09-09 02:26:41.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/icons/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -243,6 +243,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/icons/scalable/Makefile.in gnome-panel-2.27.92.ubuntu/icons/scalable/Makefile.in +--- gnome-panel-2.27.92/icons/scalable/Makefile.in 2009-09-09 02:26:41.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/icons/scalable/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -203,6 +203,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/idl/Makefile.in gnome-panel-2.27.92.ubuntu/idl/Makefile.in +--- gnome-panel-2.27.92/idl/Makefile.in 2009-09-09 02:26:42.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/idl/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -203,6 +203,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/libpanel-applet/Makefile.in gnome-panel-2.27.92.ubuntu/libpanel-applet/Makefile.in +--- gnome-panel-2.27.92/libpanel-applet/Makefile.in 2009-09-09 02:26:42.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/libpanel-applet/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -269,6 +269,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/Makefile.in gnome-panel-2.27.92.ubuntu/Makefile.in +--- gnome-panel-2.27.92/Makefile.in 2009-09-09 02:26:42.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/Makefile.in 2009-09-09 13:08:27.000000000 +0200 +@@ -235,6 +235,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ +diff -Nur gnome-panel-2.27.92/man/Makefile.in gnome-panel-2.27.92.ubuntu/man/Makefile.in +--- gnome-panel-2.27.92/man/Makefile.in 2009-09-09 02:26:42.000000000 +0200 ++++ gnome-panel-2.27.92.ubuntu/man/Makefile.in 2009-09-09 13:08:26.000000000 +0200 +@@ -204,6 +204,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PANEL_CFLAGS = @PANEL_CFLAGS@ + PANEL_LIBS = @PANEL_LIBS@ --- gnome-panel-2.27.92.orig/debian/patches/25_dynamic_fusa_detection.patch +++ gnome-panel-2.27.92/debian/patches/25_dynamic_fusa_detection.patch @@ -0,0 +1,580 @@ +Index: gnome-panel-2.27.92/gnome-panel/applet.c +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/applet.c 2009-08-11 22:39:33.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/applet.c 2009-09-09 13:06:13.000000000 +0200 +@@ -34,6 +34,7 @@ + #include "panel-globals.h" + #include "panel-properties-dialog.h" + #include "panel-lockdown.h" ++#include "applet-signaler.h" + + #define SMALL_ICON_SIZE 20 + +@@ -734,6 +735,7 @@ + info->widget = NULL; + + registered_applets = g_slist_remove (registered_applets, info); ++ panel_applet_signaler_remove_applet(info); + + queued_position_saves = + g_slist_remove (queued_position_saves, info); +@@ -1173,6 +1175,26 @@ + return info->id; + } + ++/** \brief Get the Bonobo IID of the Applet ++ \param info The AppletInfo struct representing the applet ++ \return Either the IID of the applet or NULL if the applet does ++ not have an IID. ++*/ ++const char * ++panel_applet_get_iid (AppletInfo *info) ++{ ++ if (!info) ++ return NULL; ++ if (info->type != PANEL_OBJECT_BONOBO) ++ return NULL; ++ ++ PanelAppletFrame * frame = PANEL_APPLET_FRAME(info->data); ++ if (frame == NULL) ++ return NULL; /* This should never happen, but just in case */ ++ ++ return panel_applet_frame_get_iid(frame); ++} ++ + const char * + panel_applet_get_id_by_widget (GtkWidget *applet_widget) + { +@@ -1196,6 +1218,9 @@ + { + GSList *l; + ++ if (id == NULL) ++ return NULL; ++ + for (l = registered_applets; l; l = l->next) { + AppletInfo *info = l->data; + +@@ -1206,6 +1231,33 @@ + return NULL; + } + ++/** \brief Will find an applet by looking for it's IID ++ \param iid The IID to look for in an applet ++ \return Either the AppletInfo structure representing the applet or ++ NULL if an applet with that IID can not be found. ++*/ ++AppletInfo * ++panel_applet_get_by_iid (const char *iid) ++{ ++ GSList *l; ++ ++ if (iid == NULL) ++ return NULL; ++ ++ for (l = registered_applets; l; l = l->next) { ++ AppletInfo *info = l->data; ++ const char *applet_iid = panel_applet_get_iid(info); ++ ++ if (applet_iid == NULL) ++ continue; ++ ++ if (!strcmp (applet_iid, iid)) ++ return info; ++ } ++ ++ return NULL; ++} ++ + GSList * + panel_applet_list_applets (void) + { +@@ -1341,6 +1393,7 @@ + else + gtk_widget_child_focus (applet, GTK_DIR_TAB_FORWARD); + ++ panel_applet_signaler_add_applet(info); + return info; + } + +Index: gnome-panel-2.27.92/gnome-panel/applet.h +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/applet.h 2009-04-19 19:45:09.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/applet.h 2009-09-09 13:06:13.000000000 +0200 +@@ -56,8 +56,10 @@ + void panel_applet_stop_loading (const char *id); + + const char *panel_applet_get_id (AppletInfo *info); ++const char *panel_applet_get_iid (AppletInfo *info); + const char *panel_applet_get_id_by_widget (GtkWidget *widget); + AppletInfo *panel_applet_get_by_id (const char *id); ++AppletInfo *panel_applet_get_by_iid (const char *iid); + AppletInfo *panel_applet_get_by_type (PanelObjectType object_type, GdkScreen *screen); + + GSList *panel_applet_list_applets (void); +Index: gnome-panel-2.27.92/gnome-panel/applet-signaler.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-panel-2.27.92/gnome-panel/applet-signaler.c 2009-09-09 13:06:13.000000000 +0200 +@@ -0,0 +1,139 @@ ++/* ++ * Fast User Switch Applet: status-manager.c ++ * ++ * Copyright (C) 2008 Canonical, Ltd. ++ * Authors: ++ * Ted Gould ++ * ++ * 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 ++ */ ++ ++#include "applet-signaler.h" ++ ++#define PANEL_APPLET_SIGNALER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PANEL_TYPE_APPLET_SIGNALER, PanelAppletSignalerClass)) ++#define PANEL_IS_APPLET_SIGNALER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PANEL_TYPE_APPLET_SIGNALER)) ++#define PANEL_APPLET_SIGNALER_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), PANEL_TYPE_APPLET_SIGNALER, PanelAppletSignalerClass)) ++ ++/* Signals */ ++enum { ++ APPLET_ADDED, ++ APPLET_REMOVED, ++ LAST_SIGNAL ++}; ++ ++struct _PanelAppletSignaler ++{ ++ GObject parent; ++}; ++ ++typedef struct _PanelAppletSignalerClass ++{ ++ GObjectClass parent_class; ++ ++ PanelAppletSignalerFunc applet_added; ++ PanelAppletSignalerFunc applet_removed; ++} ++PanelAppletSignalerClass; ++ ++guint signals[LAST_SIGNAL] = {0}; ++ ++G_DEFINE_TYPE (PanelAppletSignaler, panel_applet_signaler, G_TYPE_OBJECT); ++ ++static void ++panel_applet_signaler_finalize (GObject * obj) ++{ ++ return; ++} ++ ++static void ++panel_applet_signaler_class_init (PanelAppletSignalerClass * class) ++{ ++ GObjectClass * gobj; ++ gobj = G_OBJECT_CLASS(class); ++ ++ gobj->finalize = panel_applet_signaler_finalize; ++ ++ /* Signals */ ++ signals[APPLET_ADDED] = g_signal_new (PANEL_APPLET_SIGNALER_SIGNAL_APPLET_ADDED, ++ G_TYPE_FROM_CLASS(class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET(PanelAppletSignalerClass, applet_added), ++ NULL, NULL, /* accumulator */ ++ g_cclosure_marshal_VOID__POINTER, ++ G_TYPE_NONE, /* Return value */ ++ 1, G_TYPE_POINTER); /* Parameters */ ++ ++ signals[APPLET_REMOVED] = g_signal_new (PANEL_APPLET_SIGNALER_SIGNAL_APPLET_REMOVED, ++ G_TYPE_FROM_CLASS(class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET(PanelAppletSignalerClass, applet_removed), ++ NULL, NULL, /* accumulator */ ++ g_cclosure_marshal_VOID__POINTER, ++ G_TYPE_NONE, /* Return value */ ++ 1, G_TYPE_POINTER); /* Parameters */ ++ ++ return; ++} ++ ++static void ++panel_applet_signaler_init (PanelAppletSignaler * pas) ++{ ++ ++ g_debug("Initialized Panel Applet Signaler."); ++ return; ++} ++ ++static PanelAppletSignaler * default_signaler = NULL; ++ ++PanelAppletSignaler * ++panel_applet_signaler_get_default (void) ++{ ++ if (default_signaler == NULL) { ++ default_signaler = g_object_new(PANEL_TYPE_APPLET_SIGNALER, NULL); ++ g_object_add_weak_pointer(G_OBJECT(default_signaler), ++ (gpointer *)&default_signaler); ++ } ++ ++ return default_signaler; ++} ++ ++static guint applet_count = 0; ++ ++void ++panel_applet_signaler_add_applet (AppletInfo * applet) ++{ ++ g_debug("Adding applet %d.", applet_count++); ++ ++ /* Ensure that one is created */ ++ PanelAppletSignaler * signaler = panel_applet_signaler_get_default(); ++ ++ g_signal_emit(signaler, signals[APPLET_ADDED], NULL, applet); ++ ++ return; ++} ++ ++void ++panel_applet_signaler_remove_applet (AppletInfo * applet) ++{ ++ g_debug("Removing applet %d.", --applet_count); ++ ++ /* Ensure that one is created */ ++ PanelAppletSignaler * signaler = panel_applet_signaler_get_default(); ++ ++ g_signal_emit(signaler, signals[APPLET_REMOVED], NULL, applet); ++ ++ return; ++} ++ +Index: gnome-panel-2.27.92/gnome-panel/applet-signaler.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-panel-2.27.92/gnome-panel/applet-signaler.h 2009-09-09 13:06:13.000000000 +0200 +@@ -0,0 +1,52 @@ ++/* ++ * Fast User Switch Applet: status-manager.c ++ * ++ * Copyright (C) 2008 Canonical, Ltd. ++ * Authors: ++ * Ted Gould ++ * ++ * 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 ++ */ ++ ++#ifndef APPLET_SIGNALER_H ++#define APPLET_SIGNALER_H ++ ++#include ++#include "applet.h" ++ ++G_BEGIN_DECLS ++ ++/* Applet Signaler */ ++/* Singleton Object to handle the world of applets */ ++ ++#define PANEL_TYPE_APPLET_SIGNALER (panel_applet_signaler_get_type()) ++#define PANEL_APPLET_SIGNALER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANEL_TYPE_APPLET_SIGNALER, PanelAppletSignaler)) ++#define PANEL_IS_APPLET_SIGNALER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANEL_TYPE_APPLET_SIGNALER)) ++ ++#define PANEL_APPLET_SIGNALER_SIGNAL_APPLET_ADDED "applet-added" ++#define PANEL_APPLET_SIGNALER_SIGNAL_APPLET_REMOVED "applet-removed" ++ ++typedef struct _PanelAppletSignaler PanelAppletSignaler; ++typedef void (*PanelAppletSignalerFunc)(PanelAppletSignaler * pas, AppletInfo * info, gpointer data); ++ ++GType panel_applet_signaler_get_type (void) G_GNUC_CONST; ++PanelAppletSignaler * panel_applet_signaler_get_default (void); ++ ++void panel_applet_signaler_add_applet (AppletInfo * applet); ++void panel_applet_signaler_remove_applet (AppletInfo * applet); ++ ++G_END_DECLS ++ ++#endif /* APPLET_SIGNALER_H */ +Index: gnome-panel-2.27.92/gnome-panel/Makefile.am +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/Makefile.am 2009-08-29 00:08:47.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/Makefile.am 2009-09-09 13:06:13.000000000 +0200 +@@ -65,6 +65,7 @@ + panel-compatibility.c \ + panel.c \ + applet.c \ ++ applet-signaler.c \ + drawer.c \ + panel-config-global.c \ + panel-util.c \ +@@ -110,6 +111,7 @@ + panel-compatibility.h \ + panel.h \ + applet.h \ ++ applet-signaler.h \ + drawer.h \ + panel-util.h \ + panel-properties-dialog.h \ +Index: gnome-panel-2.27.92/gnome-panel/panel-applet-frame.c +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/panel-applet-frame.c 2009-08-11 22:39:33.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/panel-applet-frame.c 2009-09-09 13:06:13.000000000 +0200 +@@ -1442,3 +1442,15 @@ + + frame->priv->panel = panel; + } ++ ++/** \brief Gets the IID for a panel applet frame ++ \param frame Applet frame ++ \return The IID of the applet or NULL on error ++*/ ++const gchar * ++panel_applet_frame_get_iid (PanelAppletFrame * frame) ++{ ++ g_return_val_if_fail (PANEL_IS_APPLET_FRAME (frame), NULL); ++ ++ return frame->priv->iid; ++} +Index: gnome-panel-2.27.92/gnome-panel/panel-applet-frame.h +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/panel-applet-frame.h 2009-08-11 22:39:33.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/panel-applet-frame.h 2009-09-09 13:06:13.000000000 +0200 +@@ -78,6 +78,8 @@ + void panel_applet_frame_set_panel (PanelAppletFrame *frame, + PanelWidget *panel); + ++const gchar * panel_applet_frame_get_iid (PanelAppletFrame * frame); ++ + G_END_DECLS + + #endif /* __PANEL_APPLET_FRAME_H__ */ +Index: gnome-panel-2.27.92/gnome-panel/panel-menu-bar.c +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/panel-menu-bar.c 2009-09-09 13:06:10.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/panel-menu-bar.c 2009-09-09 13:06:13.000000000 +0200 +@@ -47,6 +47,7 @@ + #include "panel-stock-icons.h" + #include "panel-typebuiltins.h" + #include "panel-icon-names.h" ++#include "applet-signaler.h" + + G_DEFINE_TYPE (PanelMenuBar, panel_menu_bar, GTK_TYPE_MENU_BAR) + +@@ -99,6 +100,36 @@ + return FALSE; + } + ++#define FUSA_APPLET_IID "OAFIID:GNOME_FastUserSwitchApplet" ++ ++static void ++panel_menu_bar_set_tooltip_remove (PanelAppletSignaler * pas, AppletInfo * info, GtkWidget * widget) ++{ ++ const char * iid = panel_applet_get_iid(info); ++ if (iid == NULL) ++ return; ++ ++ if (!strcmp(iid, FUSA_APPLET_IID)) ++ panel_util_set_tooltip_text (widget, ++ _("Change desktop appearance and behavior, get help, or log out")); ++ ++ return; ++} ++ ++static void ++panel_menu_bar_set_tooltip_add (PanelAppletSignaler * pas, AppletInfo * info, GtkWidget * widget) ++{ ++ const char * iid = panel_applet_get_iid(info); ++ if (iid == NULL) ++ return; ++ ++ if (!strcmp(iid, FUSA_APPLET_IID)) ++ panel_util_set_tooltip_text (widget, ++ _("Change system appearance and behavior, or get help")); ++ ++ return; ++} ++ + static void + panel_menu_bar_setup_tooltip (PanelMenuBar *menubar) + { +@@ -109,6 +140,12 @@ + panel_util_set_tooltip_text (menubar->priv->desktop_item, + _("Change desktop appearance and behavior, get help, or log out")); + ++ g_signal_connect(panel_applet_signaler_get_default(), PANEL_APPLET_SIGNALER_SIGNAL_APPLET_ADDED, ++ G_CALLBACK(panel_menu_bar_set_tooltip_add), menubar->priv->desktop_item); ++ g_signal_connect(panel_applet_signaler_get_default(), PANEL_APPLET_SIGNALER_SIGNAL_APPLET_REMOVED, ++ G_CALLBACK(panel_menu_bar_set_tooltip_remove), menubar->priv->desktop_item); ++ ++ + //FIXME: this doesn't handle the right-click case. Sigh. + /* Hide tooltip if a menu is activated */ + g_signal_connect (menubar->priv->applications_item, +Index: gnome-panel-2.27.92/gnome-panel/panel-menu-items.c +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/panel-menu-items.c 2009-09-09 13:06:05.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/panel-menu-items.c 2009-09-09 13:06:13.000000000 +0200 +@@ -54,6 +54,7 @@ + #include "panel-recent.h" + #include "panel-stock-icons.h" + #include "panel-util.h" ++#include "applet-signaler.h" + + #define BOOKMARKS_FILENAME ".gtk-bookmarks" + #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences" +@@ -1502,6 +1503,34 @@ + "menu_panel", panel); + } + ++#define FUSA_APPLET_IID "OAFIID:GNOME_FastUserSwitchApplet" ++ ++static void ++panel_menu_items_hide_on_fusa (PanelAppletSignaler * pas, AppletInfo * info, GtkWidget * widget) ++{ ++ const char * iid = panel_applet_get_iid(info); ++ if (iid == NULL) ++ return; ++ ++ if (!strcmp(iid, FUSA_APPLET_IID)) ++ gtk_widget_hide(widget); ++ ++ return; ++} ++ ++static void ++panel_menu_items_show_on_fusa (PanelAppletSignaler * pas, AppletInfo * info, GtkWidget * widget) ++{ ++ const char * iid = panel_applet_get_iid(info); ++ if (iid == NULL) ++ return; ++ ++ if (!strcmp(iid, FUSA_APPLET_IID)) ++ gtk_widget_show(widget); ++ ++ return; ++} ++ + void + panel_menu_items_append_lock_logout (GtkWidget *menu) + { +@@ -1512,6 +1541,10 @@ + const char *translate; + char *label; + char *tooltip; ++ GtkWidget *separator = NULL; ++ AppletInfo *fusa = NULL; ++ ++ fusa = panel_applet_get_by_iid(FUSA_APPLET_IID); + + separator_inserted = FALSE; + children = gtk_container_get_children (GTK_CONTAINER (menu)); +@@ -1519,17 +1552,34 @@ + if (last != NULL) { + separator_inserted = GTK_IS_SEPARATOR (GTK_WIDGET (last->data)); + } ++ if (separator_inserted) { ++ g_signal_connect(panel_applet_signaler_get_default(), PANEL_APPLET_SIGNALER_SIGNAL_APPLET_ADDED, ++ G_CALLBACK(panel_menu_items_hide_on_fusa), last->data); ++ g_signal_connect(panel_applet_signaler_get_default(), PANEL_APPLET_SIGNALER_SIGNAL_APPLET_REMOVED, ++ G_CALLBACK(panel_menu_items_show_on_fusa), last->data); ++ if (fusa != NULL) { ++ gtk_widget_hide(GTK_WIDGET(last->data)); ++ } ++ } + g_list_free (children); + + if (panel_lock_screen_action_available ("lock")) { + item = panel_menu_items_create_action_item (PANEL_ACTION_LOCK); + if (item != NULL) { + if (!separator_inserted) { +- add_menu_separator (menu); ++ separator = add_menu_separator (menu); + separator_inserted = TRUE; + } + + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ ++ g_signal_connect(panel_applet_signaler_get_default(), PANEL_APPLET_SIGNALER_SIGNAL_APPLET_ADDED, ++ G_CALLBACK(panel_menu_items_hide_on_fusa), item); ++ g_signal_connect(panel_applet_signaler_get_default(), PANEL_APPLET_SIGNALER_SIGNAL_APPLET_REMOVED, ++ G_CALLBACK(panel_menu_items_show_on_fusa), item); ++ if (fusa != NULL) { ++ gtk_widget_hide(GTK_WIDGET(item)); ++ } + } + } + +@@ -1572,19 +1622,53 @@ + + if (item != NULL) { + if (!separator_inserted) { +- add_menu_separator (menu); ++ separator = add_menu_separator (menu); + separator_inserted = TRUE; + } + + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ ++ g_signal_connect(panel_applet_signaler_get_default(), PANEL_APPLET_SIGNALER_SIGNAL_APPLET_ADDED, ++ G_CALLBACK(panel_menu_items_hide_on_fusa), item); ++ g_signal_connect(panel_applet_signaler_get_default(), PANEL_APPLET_SIGNALER_SIGNAL_APPLET_REMOVED, ++ G_CALLBACK(panel_menu_items_show_on_fusa), item); ++ if (fusa != NULL) { ++ gtk_widget_hide(GTK_WIDGET(item)); ++ } + } + + item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN); + if (item != NULL) { + if (!separator_inserted) +- add_menu_separator (menu); ++ separator = add_menu_separator (menu); + + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ ++ g_signal_connect(panel_applet_signaler_get_default(), PANEL_APPLET_SIGNALER_SIGNAL_APPLET_ADDED, ++ G_CALLBACK(panel_menu_items_hide_on_fusa), item); ++ g_signal_connect(panel_applet_signaler_get_default(), PANEL_APPLET_SIGNALER_SIGNAL_APPLET_REMOVED, ++ G_CALLBACK(panel_menu_items_show_on_fusa), item); ++ if (fusa != NULL) { ++ gtk_widget_hide(GTK_WIDGET(item)); ++ } ++ } ++ ++ /* Okay, this is confusing, but required to make the patch ++ * smaller. Basically if the seperator was created externally it ++ * gets the signal handlers added when it is detected, but the ++ * local variable remains NULL. This allows the return in the ++ * middle to still work. But, if the seperator gets built in the ++ * remainder of this function then the signal handlers get added ++ * on here as the local variable becomes a pointer to that created ++ * seperator. Whew. */ ++ if (separator != NULL) { ++ g_signal_connect(panel_applet_signaler_get_default(), PANEL_APPLET_SIGNALER_SIGNAL_APPLET_ADDED, ++ G_CALLBACK(panel_menu_items_hide_on_fusa), separator); ++ g_signal_connect(panel_applet_signaler_get_default(), PANEL_APPLET_SIGNALER_SIGNAL_APPLET_REMOVED, ++ G_CALLBACK(panel_menu_items_show_on_fusa), separator); ++ if (fusa != NULL) { ++ gtk_widget_hide(GTK_WIDGET(separator)); ++ } + } + } + --- gnome-panel-2.27.92.orig/debian/patches/85_disable_shutdown_on_ltsp.patch +++ gnome-panel-2.27.92/debian/patches/85_disable_shutdown_on_ltsp.patch @@ -0,0 +1,13 @@ +Index: gnome-panel-2.27.91/gnome-panel/panel-menu-items.c +=================================================================== +--- gnome-panel-2.27.91.orig/gnome-panel/panel-menu-items.c 2009-08-26 12:33:59.000000000 +1000 ++++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-26 12:40:06.000000000 +1000 +@@ -1580,7 +1580,7 @@ + } + + item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN); +- if (item != NULL) { ++ if (item != NULL && !g_getenv("LTSP_CLIENT")){ + if (!separator_inserted) + add_menu_separator (menu); + --- gnome-panel-2.27.92.orig/debian/patches/99_ltmain_as-needed.patch +++ gnome-panel-2.27.92/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,32 @@ +Index: gnome-panel-2.27.91/ltmain.sh +=================================================================== +--- gnome-panel-2.27.91.orig/ltmain.sh 2009-08-25 23:45:11.000000000 +1000 ++++ gnome-panel-2.27.91/ltmain.sh 2009-08-26 12:41:40.000000000 +1000 +@@ -4716,6 +4716,11 @@ + arg=$func_stripname_result + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result +@@ -5067,6 +5072,15 @@ + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" --- gnome-panel-2.27.92.orig/debian/patches/16_compiz_workspace_switcher.patch +++ gnome-panel-2.27.92/debian/patches/16_compiz_workspace_switcher.patch @@ -0,0 +1,594 @@ +Index: gnome-panel-2.27.92/applets/wncklet/workspace-switcher.c +=================================================================== +--- gnome-panel-2.27.92.orig/applets/wncklet/workspace-switcher.c 2009-08-11 16:59:53.000000000 +0200 ++++ gnome-panel-2.27.92/applets/wncklet/workspace-switcher.c 2009-09-09 13:14:55.000000000 +0200 +@@ -34,6 +34,10 @@ + #define MAX_REASONABLE_ROWS 16 + #define DEFAULT_ROWS 1 + ++#define COMPIZ_OPTIONS "/apps/compiz/general/screen0/options" ++#define COMPIZ_HSIZE "/apps/compiz/general/screen0/options/hsize" ++#define COMPIZ_VSIZE "/apps/compiz/general/screen0/options/vsize" ++ + #define NEVER_SENSITIVE "never_sensitive" + #define NUM_WORKSPACES "/apps/metacity/general/num_workspaces" + #define WORKSPACE_NAME "/apps/metacity/workspace_names/name_1" +@@ -56,6 +60,7 @@ + + /* Properties: */ + GtkWidget *properties_dialog; ++ GtkWidget *switcher_frame; + GtkWidget *workspaces_frame; + GtkWidget *workspace_names_label; + GtkWidget *workspace_names_scroll; +@@ -67,6 +72,9 @@ + GtkWidget *num_workspaces_spin; + GtkWidget *workspaces_tree; + GtkListStore *workspaces_store; ++ GtkWidget *viewports_frame; ++ GtkWidget *hsize_spin; ++ GtkWidget *vsize_spin; + + GtkWidget *about; + +@@ -96,15 +104,18 @@ + pager->orientation); + wnck_pager_set_n_rows (WNCK_PAGER (pager->pager), + pager->n_rows); +- wnck_pager_set_show_all (WNCK_PAGER (pager->pager), +- pager->display_all); + +- if (pager->wm == PAGER_WM_METACITY) ++ if (pager->wm == PAGER_WM_METACITY) { ++ wnck_pager_set_show_all (WNCK_PAGER (pager->pager), ++ pager->display_all); + wnck_pager_set_display_mode (WNCK_PAGER (pager->pager), + pager->display_mode); +- else ++ } else { ++ wnck_pager_set_show_all (WNCK_PAGER (pager->pager), ++ FALSE); + wnck_pager_set_display_mode (WNCK_PAGER (pager->pager), + WNCK_PAGER_DISPLAY_CONTENT); ++ } + } + + static void +@@ -120,20 +131,28 @@ + gtk_widget_show (pager->workspace_names_scroll); + if (pager->display_workspaces_toggle) + gtk_widget_show (pager->display_workspaces_toggle); ++ if (pager->viewports_frame) ++ gtk_widget_hide (pager->viewports_frame); + break; + case PAGER_WM_COMPIZ: ++ if (pager->switcher_frame) ++ gtk_widget_hide (pager->switcher_frame); + if (pager->workspaces_frame) +- gtk_widget_show (pager->workspaces_frame); ++ gtk_widget_hide (pager->workspaces_frame); + if (pager->workspace_names_label) + gtk_widget_hide (pager->workspace_names_label); + if (pager->workspace_names_scroll) + gtk_widget_hide (pager->workspace_names_scroll); + if (pager->display_workspaces_toggle) + gtk_widget_hide (pager->display_workspaces_toggle); ++ if (pager->viewports_frame) ++ gtk_widget_show (pager->viewports_frame); + break; + case PAGER_WM_UNKNOWN: + if (pager->workspaces_frame) + gtk_widget_hide (pager->workspaces_frame); ++ if (pager->viewports_frame) ++ gtk_widget_hide (pager->viewports_frame); + break; + default: + g_assert_not_reached (); +@@ -155,7 +174,7 @@ + pager->wm = PAGER_WM_UNKNOWN; + else if (strcmp (wm_name, "Metacity") == 0) + pager->wm = PAGER_WM_METACITY; +- else if (strcmp (wm_name, "Compiz") == 0) ++ else if (strcmp (wm_name, "compiz") == 0) + pager->wm = PAGER_WM_COMPIZ; + else + pager->wm = PAGER_WM_UNKNOWN; +@@ -211,7 +230,8 @@ + pager->orientation = new_orient; + pager_update (pager); + if (pager->label_row_col) +- gtk_label_set_text (GTK_LABEL (pager->label_row_col), pager->orientation == GTK_ORIENTATION_HORIZONTAL ? _("rows") : _("columns")); ++ gtk_label_set_text (GTK_LABEL (pager->label_row_col), ++ pager->orientation == GTK_ORIENTATION_HORIZONTAL ? _("rows") : _("columns")); + } + + static void +@@ -663,6 +683,34 @@ + NULL); + } + ++/* compiz' "columns" */ ++static void ++hsize_value_changed (GtkSpinButton *button, ++ gpointer data) ++{ ++ GConfClient* client = gconf_client_get_default (); ++ ++ gconf_client_set_int (client, ++ COMPIZ_HSIZE, ++ gtk_spin_button_get_value_as_int (button), ++ NULL); ++ g_object_unref (client); ++} ++ ++/* compiz' "rows" */ ++static void ++vsize_value_changed (GtkSpinButton *button, ++ gpointer data) ++{ ++ GConfClient* client = gconf_client_get_default (); ++ ++ gconf_client_set_int (client, ++ COMPIZ_VSIZE, ++ gtk_spin_button_get_value_as_int (button), ++ NULL); ++ g_object_unref (client); ++} ++ + static void + update_workspaces_model (PagerData *pager) + { +@@ -787,6 +835,7 @@ + PagerData *pager) + { + pager->properties_dialog = NULL; ++ pager->switcher_frame = NULL; + pager->workspaces_frame = NULL; + pager->workspace_names_label = NULL; + pager->workspace_names_scroll = NULL; +@@ -798,6 +847,9 @@ + pager->num_workspaces_spin = NULL; + pager->workspaces_tree = NULL; + pager->workspaces_store = NULL; ++ pager->viewports_frame = NULL; ++ pager->hsize_spin = NULL; ++ pager->vsize_spin = NULL; + } + + static gboolean +@@ -900,13 +952,49 @@ + GtkTreeViewColumn *column; + GtkCellRenderer *cell; + int nr_ws, i; +- ++ GConfClient* client = NULL; ++ gint hsize; ++ gint vsize; ++ ++ pager->switcher_frame = WID ("switcher_frame"); + pager->workspaces_frame = WID ("workspaces_frame"); + pager->workspace_names_label = WID ("workspace_names_label"); + pager->workspace_names_scroll = WID ("workspace_names_scroll"); + ++ if (pager->wm == PAGER_WM_COMPIZ) ++ { ++ client = gconf_client_get_default (); ++ ++ pager->viewports_frame = WID ("viewports_frame"); ++ pager->hsize_spin = WID ("hsize_spin"); ++ pager->vsize_spin = WID ("vsize_spin"); ++ ++ g_signal_connect (G_OBJECT (pager->hsize_spin), ++ "value-changed", ++ (GCallback) hsize_value_changed, ++ NULL); ++ ++ g_signal_connect (G_OBJECT (pager->vsize_spin), ++ "value-changed", ++ (GCallback) vsize_value_changed, ++ NULL); ++ ++ /* set value for hsize (compiz's "columns") */ ++ hsize = gconf_client_get_int (client, COMPIZ_HSIZE, NULL); ++ gtk_spin_button_set_value (GTK_SPIN_BUTTON (pager->hsize_spin), ++ hsize); ++ ++ /* set value for vsize (compiz's "rows") */ ++ vsize = gconf_client_get_int (client, COMPIZ_VSIZE, NULL); ++ gtk_spin_button_set_value (GTK_SPIN_BUTTON (pager->vsize_spin), ++ vsize); ++ ++ g_object_unref (client); ++ } ++ + pager->display_workspaces_toggle = WID ("workspace_name_toggle"); +- setup_sensitivity (pager, builder, ++ setup_sensitivity (pager, ++ builder, + "workspace_name_toggle", + NULL, + NULL, +@@ -914,7 +1002,8 @@ + + pager->all_workspaces_radio = WID ("all_workspaces_radio"); + pager->current_only_radio = WID ("current_only_radio"); +- setup_sensitivity (pager, builder, ++ setup_sensitivity (pager, ++ builder, + "all_workspaces_radio", + "current_only_radio", + "label_row_col", +@@ -922,14 +1011,16 @@ + + pager->num_rows_spin = WID ("num_rows_spin"); + pager->label_row_col = WID("label_row_col"); +- setup_sensitivity (pager, builder, ++ setup_sensitivity (pager, ++ builder, + "num_rows_spin", + NULL, + NULL, + "num_rows" /* key */); + + pager->num_workspaces_spin = WID ("num_workspaces_spin"); +- setup_sensitivity (pager, builder, ++ setup_sensitivity (pager, ++ builder, + "num_workspaces_spin", + NULL, + NULL, +@@ -943,92 +1034,130 @@ + WORKSPACE_NAME /* key */); + + /* Display workspace names: */ +- +- g_signal_connect (G_OBJECT (pager->display_workspaces_toggle), "toggled", +- (GCallback) display_workspace_names_toggled, pager); ++ g_signal_connect (G_OBJECT (pager->display_workspaces_toggle), ++ "toggled", ++ (GCallback) display_workspace_names_toggled, ++ pager); + +- if (pager->display_mode == WNCK_PAGER_DISPLAY_NAME) { ++ if (pager->display_mode == WNCK_PAGER_DISPLAY_NAME) + value = TRUE; +- } else { ++ else + value = FALSE; +- } ++ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pager->display_workspaces_toggle), + value); + + /* Display all workspaces: */ +- g_signal_connect (G_OBJECT (pager->all_workspaces_radio), "toggled", +- (GCallback) all_workspaces_toggled, pager); ++ g_signal_connect (G_OBJECT (pager->all_workspaces_radio), ++ "toggled", ++ (GCallback) all_workspaces_toggled, ++ pager); + +- if (pager->display_all) { +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pager->all_workspaces_radio), TRUE); +- if ( ! g_object_get_data (G_OBJECT (pager->num_rows_spin), NEVER_SENSITIVE)) +- gtk_widget_set_sensitive (pager->num_rows_spin, TRUE); +- } else { +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pager->current_only_radio), TRUE); +- gtk_widget_set_sensitive (pager->num_rows_spin, FALSE); ++ if (pager->display_all) ++ { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pager->all_workspaces_radio), ++ TRUE); ++ ++ if (!g_object_get_data (G_OBJECT (pager->num_rows_spin), ++ NEVER_SENSITIVE)) ++ gtk_widget_set_sensitive (pager->num_rows_spin, ++ TRUE); + } +- ++ else ++ { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pager->current_only_radio), ++ TRUE); ++ gtk_widget_set_sensitive (pager->num_rows_spin, ++ FALSE); ++ } ++ + /* Num rows: */ +- g_signal_connect (G_OBJECT (pager->num_rows_spin), "value_changed", +- (GCallback) num_rows_value_changed, pager); ++ g_signal_connect (G_OBJECT (pager->num_rows_spin), ++ "value_changed", ++ (GCallback) num_rows_value_changed, ++ pager); + +- gtk_spin_button_set_value (GTK_SPIN_BUTTON (pager->num_rows_spin), pager->n_rows); +- gtk_label_set_text (GTK_LABEL (pager->label_row_col), pager->orientation == GTK_ORIENTATION_HORIZONTAL ? _("rows") : _("columns")); ++ gtk_spin_button_set_value (GTK_SPIN_BUTTON (pager->num_rows_spin), ++ pager->n_rows); ++ gtk_label_set_text (GTK_LABEL (pager->label_row_col), ++ pager->orientation == GTK_ORIENTATION_HORIZONTAL ? _("rows") : _("columns")); + +- g_signal_connect (pager->properties_dialog, "destroy", ++ g_signal_connect (pager->properties_dialog, ++ "destroy", + G_CALLBACK (properties_dialog_destroyed), + pager); +- g_signal_connect (pager->properties_dialog, "delete_event", ++ g_signal_connect (pager->properties_dialog, ++ "delete_event", + G_CALLBACK (delete_event), + pager); +- g_signal_connect (pager->properties_dialog, "response", ++ g_signal_connect (pager->properties_dialog, ++ "response", + G_CALLBACK (response_cb), + pager); +- +- g_signal_connect (WID ("done_button"), "clicked", +- (GCallback) close_dialog, pager); ++ ++ g_signal_connect (WID ("done_button"), ++ "clicked", ++ (GCallback) close_dialog, ++ pager); + + gtk_spin_button_set_value (GTK_SPIN_BUTTON (pager->num_workspaces_spin), + wnck_screen_get_workspace_count (pager->screen)); +- g_signal_connect (G_OBJECT (pager->num_workspaces_spin), "value_changed", +- (GCallback) num_workspaces_value_changed, pager); +- +- wncklet_connect_while_alive (pager->screen, "workspace_created", +- G_CALLBACK(workspace_created), ++ g_signal_connect (G_OBJECT (pager->num_workspaces_spin), ++ "value_changed", ++ (GCallback) num_workspaces_value_changed, ++ pager); ++ ++ wncklet_connect_while_alive (pager->screen, ++ "workspace_created", ++ G_CALLBACK (workspace_created), + pager, + pager->properties_dialog); + +- wncklet_connect_while_alive (pager->screen, "workspace_destroyed", +- G_CALLBACK(workspace_destroyed), ++ wncklet_connect_while_alive (pager->screen, ++ "workspace_destroyed", ++ G_CALLBACK (workspace_destroyed), + pager, + pager->properties_dialog); + +- g_signal_connect (G_OBJECT (pager->workspaces_tree), "focus_out_event", +- (GCallback) workspaces_tree_focused_out, pager); ++ g_signal_connect (G_OBJECT (pager->workspaces_tree), ++ "focus_out_event", ++ (GCallback) workspaces_tree_focused_out, ++ pager); + +- pager->workspaces_store = gtk_list_store_new (1, G_TYPE_STRING, NULL); ++ pager->workspaces_store = gtk_list_store_new (1, ++ G_TYPE_STRING, ++ NULL); + update_workspaces_model (pager); +- gtk_tree_view_set_model (GTK_TREE_VIEW (pager->workspaces_tree), GTK_TREE_MODEL (pager->workspaces_store)); ++ gtk_tree_view_set_model (GTK_TREE_VIEW (pager->workspaces_tree), ++ GTK_TREE_MODEL (pager->workspaces_store)); + + g_object_unref (pager->workspaces_store); + +- cell = g_object_new (GTK_TYPE_CELL_RENDERER_TEXT, "editable", TRUE, NULL); ++ cell = g_object_new (GTK_TYPE_CELL_RENDERER_TEXT, ++ "editable", ++ TRUE, ++ NULL); + column = gtk_tree_view_column_new_with_attributes ("workspace", + cell, +- "text", 0, ++ "text", ++ 0, + NULL); +- gtk_tree_view_append_column (GTK_TREE_VIEW (pager->workspaces_tree), column); +- g_signal_connect (cell, "edited", +- (GCallback) workspace_name_edited, pager); +- ++ gtk_tree_view_append_column (GTK_TREE_VIEW (pager->workspaces_tree), ++ column); ++ g_signal_connect (cell, ++ "edited", ++ (GCallback) workspace_name_edited, ++ pager); ++ + nr_ws = wnck_screen_get_workspace_count (pager->screen); +- for (i = 0; i < nr_ws; i++) { +- wncklet_connect_while_alive ( +- G_OBJECT (wnck_screen_get_workspace (pager->screen, i)), +- "name_changed", +- G_CALLBACK(workspace_renamed), +- pager, +- pager->properties_dialog); ++ for (i = 0; i < nr_ws; i++) ++ { ++ wncklet_connect_while_alive (G_OBJECT (wnck_screen_get_workspace (pager->screen, ++ i)), ++ "name_changed", ++ G_CALLBACK (workspace_renamed), ++ pager, ++ pager->properties_dialog); + } + + update_properties_for_wm (pager); +Index: gnome-panel-2.27.92/applets/wncklet/workspace-switcher.ui +=================================================================== +--- gnome-panel-2.27.92.orig/applets/wncklet/workspace-switcher.ui 2009-09-08 02:08:42.000000000 +0200 ++++ gnome-panel-2.27.92/applets/wncklet/workspace-switcher.ui 2009-09-09 13:18:08.000000000 +0200 +@@ -20,7 +20,7 @@ + vertical + 12 + +- ++ + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 +@@ -253,6 +253,114 @@ + 1 + + ++ ++ ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ 0 ++ none ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 12 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 2 ++ 2 ++ 6 ++ 6 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ Co_lumns: ++ True ++ hsize_spin ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ hsize_spin_adjustment ++ 1 ++ ++ ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ _Rows: ++ True ++ vsize_spin ++ ++ ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ vsize_spin_adjustment ++ 1 ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ <b>Workspaces</b> ++ True ++ ++ ++ ++ ++ 2 ++ ++ + + + 1 +@@ -320,4 +428,18 @@ + 1 + 10 + ++ ++ 1 ++ 1 ++ 16 ++ 1 ++ 10 ++ ++ ++ 1 ++ 1 ++ 16 ++ 1 ++ 10 ++ + +Index: gnome-panel-2.27.92/gnome-panel/main.c +=================================================================== +--- gnome-panel-2.27.92.orig/gnome-panel/main.c 2009-04-19 19:45:09.000000000 +0200 ++++ gnome-panel-2.27.92/gnome-panel/main.c 2009-09-09 13:14:55.000000000 +0200 +@@ -86,6 +86,11 @@ + GCONF_CLIENT_PRELOAD_NONE, + NULL); + ++ gconf_client_add_dir (panel_gconf_get_client (), ++ "/apps/compiz/general/screen0/options", ++ GCONF_CLIENT_PRELOAD_NONE, ++ NULL); ++ + panel_global_config_load (); + panel_lockdown_init (); + panel_profile_load (); +@@ -110,6 +115,10 @@ + panel_lockdown_finalize (); + + gconf_client_remove_dir (panel_gconf_get_client (), ++ "/apps/compiz/general/screen0/options", ++ NULL); ++ ++ gconf_client_remove_dir (panel_gconf_get_client (), + "/desktop/gnome/interface", + NULL); + --- gnome-panel-2.27.92.orig/debian/po-up/he.po +++ gnome-panel-2.27.92/debian/po-up/he.po @@ -0,0 +1,83 @@ +# translation of gnome-panel.HEAD.he.po to Hebrew +# translation of gnome-panel.gnome-2-10.he.po to +# translation of gnome-panel.gnome-2-10.he.po to Hebrew +# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER. +# Gil 'Dolfin' Osher , 2002-2004. +# Yuval Tanny , 2005. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD.he\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-20 18:37+0300\n" +"Last-Translator: Yair Hershkovitz <>\n" +"Language-Team: Hebrew \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"כרגע אתה מחובר כ-\"%s\".\n" +"תנותק באופן אוטומטי תוך שניה." +msgstr[1] "" +"כרגע אתה מחובר כ-\"%s\".\n" +"תנותק באופן אוטומטי תוך %d שניות." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"כרגע אתה מחובר כ-\"%s\".\n" +"המערכת תכבה באופן אוטומטי תוך שניה." +msgstr[1] "" +"כרגע אתה מחובר כ-\"%s\".\n" +"המערכת תכבה באופן אוטומטי תוך %d שניות." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "להתנתק מהמערכת?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "ה_חלף משתמש" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_התנתק" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "לכבות את המערכת?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "ה_שהה" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "מצב _שינה" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "ה_פעל מחדש" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_כבה" + --- gnome-panel-2.27.92.orig/debian/po-up/fur.po +++ gnome-panel-2.27.92/debian/po-up/fur.po @@ -0,0 +1,82 @@ +# Friulian Translation of gnome-panel. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-10 12:10+0100\n" +"Last-Translator: Massimo Furlani \n" +"Language-Team: FRIULIAN \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: Friulian\n" +"X-Poedit-Country: ITALY\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Cumò si è colegâts come \"%s\".\n" +"La session a vegnarâ sierade automaticamentri podopo %d seconds." +msgstr[1] "" +"Cumò si è colegâts come \"%s\".\n" +"Il sisteme al vegnarâ studât automaticamentri podopo %d seconds." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Cumò si è colegâts come \"%s\".\n" +"Il computer si studarâ automaticamentri podopo %d second." +msgstr[1] "" +"Cumò si è colegâts come \"%s\".\n" +"Il computer si studarâ automaticamentri podopo %d seconds." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Finî cheste session daûrman?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Gambîe utent" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Vâ fûr" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Studâ il sisteme cumò?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "S_ospent" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Iberne" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Torne a inviâ" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Stude" + --- gnome-panel-2.27.92.orig/debian/po-up/oc.po +++ gnome-panel-2.27.92/debian/po-up/oc.po @@ -0,0 +1,73 @@ +# Translation of oc.po to Occitan +# Occitan translation of gnome-panel. +# Copyright (C) 2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-panel package. +# +# Yannig Marchegay (Kokoyaya) , 2007. +msgid "" +msgstr "" +"Project-Id-Version: oc\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-26 22:55+0100\n" +"Last-Translator: Yannig Marchegay (Kokoyaya) \n" +"Language-Team: Occitan \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +msgstr[1] "" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +msgstr[1] "" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Se desconnectar del sistèma ara ?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Cambiar d'utilizaire" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Terminar la session" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Atudar lo sistèma ara ?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Suspendre" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Ibernacion" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "To_rnar lançar" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Atudar" + --- gnome-panel-2.27.92.orig/debian/po-up/pa.po +++ gnome-panel-2.27.92/debian/po-up/pa.po @@ -0,0 +1,88 @@ +# translation of gnome-panel.HEAD.po to Punjabi +# Amanpreet Singh Alam (amanlinux@netscape.net) +# KBST Punjab (kbstpunjab@netscape.net) +# KABHU NAA CHHADE KHAT +# +# +# Amanpreet Singh Alam , 2004, 2005, 2006. +# Amanpreet Singh Alam , 2005, 2006. +# A S Alam , 2006, 2007. +# A S Alam , 2007. +# Amanpreet Singh Alam , 2008. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-19 22:26+0530\n" +"Last-Translator: Amanpreet Singh Alam \n" +"Language-Team: Punjabi/Panjabi \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KAider 0.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"ਤੁਸੀਂ ਹੁਣ \"%s\" ਵਾਂਗ ਲਾਗ ਕੀਤਾ ਹੈ।\n" +"ਤੁਸੀਂ ਆਟੋਮੈਟਿਕ ਹੀ %d ਸਕਿੰਟ ਮਗਰੋਂ ਲਾਗਆਉਟ ਹੋ ਜਾਵੋਗੇ।" +msgstr[1] "" +"ਤੁਸੀਂ ਹੁਣ \"%s\" ਵਾਂਗ ਲਾਗ ਕੀਤਾ ਹੈ।\n" +"ਤੁਸੀਂ ਆਟੋਮੈਟਿਕ ਹੀ %d ਸਕਿੰਟਾਂ ਮਗਰੋਂ ਲਾਗਆਉਟ ਹੋ ਜਾਵੋਗੇ।" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"ਤੁਸੀਂ ਹੁਣ \"%s\" ਵਾਂਗ ਲਾਗ ਕੀਤਾ ਹੈ।\n" +"ਇਹ ਸਿਸਟਮ %d ਸਕਿੰਟ ਮਗਰੋਂ ਆਟੋਮੈਟਿਕ ਹੀ ਬੰਦ ਹੋ ਜਾਵੇਗਾ। " +msgstr[1] "" +"ਤੁਸੀਂ ਹੁਣ \"%s\" ਵਾਂਗ ਲਾਗ ਕੀਤਾ ਹੈ।\n" +"ਇਹ ਸਿਸਟਮ %d ਸਕਿੰਟਾਂ ਮਗਰੋਂ ਆਟੋਮੈਟਿਕ ਹੀ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "ਕੀ ਇਹ ਸਿਸਟਮ ਤੋਂ ਹੁਣੇ ਲਾਗ-ਆਉਟ ਕਰਨਾ ਹੈ?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "ਉਪਭੋਗੀ ਬਦਲੋ(_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "ਲਾਗ-ਆਉਟ(_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "ਕੀ ਇਹ ਸਿਸਟਮ ਹੁਣੇ ਬੰਦ ਕਰਨਾ ਹੈ?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "ਸਸਪੈਂਡ(_u)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "ਹਾਈਬਰਨੇਟ(_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "ਮੁੜ-ਚਾਲੂ(_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "ਬੰਦ ਕਰੋ(_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/bn.po +++ gnome-panel-2.27.92/debian/po-up/bn.po @@ -0,0 +1,80 @@ +# Bangla Translation of Gnome-Panel file. +# Copyright (C) 2005 Free Software Foundation. +# This file is distributed under the same license as the gnome-panel package. +# +# Runa Bhattacharjee, 2005. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2007-07-11 19:17+0530\n" +"Last-Translator: Runa Bhattacharjee \n" +"Language-Team: Bengali (India) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"\n" +"\n" +"\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"আপনি বর্তমানে \"%s\" পরিচয়ে লগ-ইন করেছেন।\n" +"%d সেকেন্ড অতিক্রান্ত হলে স্বয়ংক্রিয়রূপে আপনাকে লগ-আউট করা হবে।" +msgstr[1] "" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"আপনি বর্তমানে \"%s\" পরিচয়ে লগ-ইন করেছেন।\n" +"%d সেকেন্ড অতিক্রান্ত হলে স্বয়ংক্রিয়রূপে এই সিস্টেম বন্ধ করা হবে।" +msgstr[1] "" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "সিস্টেম থেকে এই মুহূর্তে লগ-আউট করা হবে কি?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "ব্যবহারকারী পরিবর্তন (_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "প্রস্থান (_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "সিস্টেম এই মুহূর্তে বন্ধ করা হবে কি?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "স্থগিত করুন (_u)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "নিদ্রিত অবস্থা (_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "পুনরাম্ভ (_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "বন্ধ করুন (_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/zh_TW.po +++ gnome-panel-2.27.92/debian/po-up/zh_TW.po @@ -0,0 +1,92 @@ +# Chinese (Taiwan) translation of gnome-panel. +# Copyright (C) 1999-2007 Free Software Foundation, Inc. +# gnome-core: +# Yuan-Chung Cheng , 1999. +# Jing-Jong SHYUE , 2000. +# Chih-Wei Huang , 2000. +# Abel Cheung , 2001-2002. +# gnome-panel: +# Kevin Kee , 2004 +# Abel Cheung , 2002-2004. +# Woodman Tuen , 2005-07 +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel 2.21.90\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-09 16:19+0800\n" +"Last-Translator: Woodman Tuen \n" +"Language-Team: Chinese (Taiwan) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"您目前以「%s」登入。\n" +"您會在 %d 秒後自動登出。您目前以「%s」登入。\n" +"您會在 %d 秒後自動登出。" +msgstr[1] "" +"您目前以「%s」登入。\n" +"您會在 %d 秒後自動登出。您目前以「%s」登入。\n" +"您會在 %d 秒後自動登出。" + +#: ../patches/02_panel_logout.patch:674 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"您目前以「%s」登入。\n" +"本系統會在 %d 秒後自動關閉。您目前以「%s」登入。\n" +"本系統會在 %d 秒後自動關閉。" +msgstr[1] "" +"您目前以「%s」登入。\n" +"本系統會在 %d 秒後自動關閉。您目前以「%s」登入。\n" +"本系統會在 %d 秒後自動關閉。" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "現在從本系統中登出？" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "切換使用者(_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "登出(_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "現在關閉本系統？" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "暫停(_S)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "休眠(_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "重新啟動(_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "關機(_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/uk.po +++ gnome-panel-2.27.92/debian/po-up/uk.po @@ -0,0 +1,87 @@ +# Ukrainian translation of gnome-core module +# Copyright (C) 1999-2002 Free Software Foundation, Inc. +# Yuri Syrota , 1999-2002. +# Maxim Dziumanenko , 2002-2008 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-07 10:45+0300\n" +"Last-Translator: Maxim Dziumanenko \n" +"Language-Team: Ukrainian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Наразі ви знаходитеся у сеансі як \"%s\".\n" +"Сеанс автоматично завершиться через %d секунду." +msgstr[1] "" +"Наразі ви знаходитеся у сеансі як \"%s\".\n" +"Сеанс автоматично завершиться через %d секунди." +msgstr[2] "" +"Наразі ви знаходитеся у сеансі як \"%s\".\n" +"Сеанс автоматично завершиться через %d секунд." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Наразі ви знаходитеся у сеансі як \"%s\".\n" +"Систему буде автоматично вимкнено через %d секунду." +msgstr[1] "" +"Наразі ви знаходитеся у сеансі як \"%s\".\n" +"Систему буде автоматично вимкнено через %d секунди." +msgstr[2] "" +"Наразі ви знаходитеся у сеансі як \"%s\".\n" +"Систему буде автоматично вимкнено через %d секунд." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Завершити сеанс?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Перемикнути користувача" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Завершити сеанс" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Вимкнути цей комп'ютер?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "Пр_изупинити" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "Режим _сну" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "Перезап_устити" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Вимкнути" + --- gnome-panel-2.27.92.orig/debian/po-up/be.po +++ gnome-panel-2.27.92/debian/po-up/be.po @@ -0,0 +1,89 @@ +# Беларускі пераклад gnome-panel.HEAD. +# SOME DESCRIPTIVE TITLE +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. +# Vital Khilko , 2003. +# Alexander Nyakhaychyk , 2004, 2005, 2008 +# Ihar Hrachyshka , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-10 02:38+0200\n" +"Last-Translator: Alexander Nyakhaychyk \n" +"Language-Team: Belarusian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Зараз вы ўвайшлі як \"%s\".\n" +"Ваш сэанс аўтаматычна завершыцца праз %d сэкунду" +msgstr[1] "" +"Зараз вы ўвайшлі як \"%s\".\n" +"Ваш сэанс аўтаматычна завершыцца праз %d сэкунды" +msgstr[2] "" +"Зараз вы ўвайшлі як \"%s\".\n" +"Ваш сэанс аўтаматычна завершыцца праз %d сэкундаў" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Зараз вы ўвайшлі як \"%s\".\n" +"Сыстэма будзе адключана праз %d сэкунду." +msgstr[1] "" +"Зараз вы ўвайшлі як \"%s\".\n" +"Сыстэма будзе адключана праз %d сэкунды." +msgstr[2] "" +"Зараз вы ўвайшлі як \"%s\".\n" +"Сыстэма будзе адключана праз %d сэкундаў." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Завяршыць сэанс?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "Пера_ключыць карыстальніка" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "В_ыйсьці" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Выключыць кампутар?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "Прыпы_ніць" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Заснуць" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Перазагрузка" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "Вык_лючыць" + --- gnome-panel-2.27.92.orig/debian/po-up/el.po +++ gnome-panel-2.27.92/debian/po-up/el.po @@ -0,0 +1,112 @@ +# translation of el.po to +# translation of el.po to +# translation of el.po to Greek +# gnome-panel Greek PO file. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# simos: 874 messages, 18Feb2001, (sgpbea). +# simos: 897 messages, 01Mar2001, (regmtsgpbea). +# simos: 959 messages, 04Jun2001, (micumple). +# simos: 959 messages, 06Jun2001, (fixed minor typo). +# simos: 897 messages, 28Nov2001, (feeling good to translate HEAD). +# simos: 272 messages, 20Apr2002, 118 messages remaining. +# kostas: 513 messages, 19Oct2002, completed translation. +# kostas: 531 messages, 07Jan2003, updated translation for Gnome 2.1x. +# kostas:update for Gnome 2.4, 49 strings remain 02Jun2003. +# kostas:03Aug2003, 599 messages, updated translation. +# Spiros Papadimitriou , 1999. +# Simos Xenitellis , 1999, 2000, 2001, 2002. +# Sarantis Paskalis , 2000. +# Kostas Papadimas , 2002,2003, 2004, 2005, 2006, 2007, 2008. +# Nikos Charonitakis , 2003, 2004. +# Nikos Charonitakis , 2005. +# Comment: Most of the work done by Spiros (around 600 messages). +# Comment: Simos/Sarantis did 12%. +# Comment: Simos/Sarantis did review. +# Comment: Simos did 10 new/unfuzzy 30. +# Comment: Simos did 3 new/unfuzzy 1. +# Comment: Simos did 2 new/unfuzzy 8. +# Comment: Simos did 6 new/unfuzzy 8. +# Comment: Simos did 2 new/unfuzzy 5. +# Rename of module to gnome-panel. +# Comment: Kostas unfuzzy 1 +# Nikos:29Aug2003, review tranlation +# kostas: 30Oct2003, update translation for Gnome 2.6 +# kostas: 12Nov2003, fixes +# kostas:27Jan2004, update +msgid "" +msgstr "" +"Project-Id-Version: el\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-23 12:38+0200\n" +"Last-Translator: nikosCharonitakis \n" +"Language-Team: Greek \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Έχετε συνδεθεί ως \"%s\".\n" +"Θα αποσυνδεθείτε αυτόματα σε %d δευτερόλεπτο." +msgstr[1] "" +"Έχετε συνδεθεί ως \"%s\".\n" +"Θα αποσυνδεθείτε αυτόματα σε %d δευτερόλεπτα." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Έχετε συνδεθεί ως \"%s\".\n" +"Το σύστημα θα τερματιστεί αυτόματα σε %d δευτερόλεπτο." +msgstr[1] "" +"Έχετε συνδεθεί ως \"%s\".\n" +"Το σύστημα θα τερματιστεί αυτόματα σε %d δευτερόλεπτα." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Να γίνει αποσύνδεση από το σύστημα τώρα;" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "Α_λλαγή χρήστη" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "Απο_σύνδεση" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Να κλείσει το σύστημα τώρα;" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "Α_ναστολή" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "Α_δρανοποίηση" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Επανεκκίνηση" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Κλείσιμο" + --- gnome-panel-2.27.92.orig/debian/po-up/ku.po +++ gnome-panel-2.27.92/debian/po-up/ku.po @@ -0,0 +1,72 @@ +# translation of gnome-panel.po to Kurdish +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER. +# +# Erdal Ronahi , 2005, 2006. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2006-08-16 21:59+0200\n" +"Last-Translator: ElîxanLoran \n" +"Language-Team: Kurdish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural= n != 1\n" + +#: ../patches/02_panel_logout.patch:663 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "Derketina we ya bixweber piştî %d çirkê pêk tê." +msgstr[1] "Derketina we ya bixweber piştî çirkekê pêk hat." + +#: ../patches/02_panel_logout.patch:674 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "Dê pergal bixweber were girtin piştî %d çirkan" +msgstr[1] "Dê pergal bixweber piştî çirkekê were girtin." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Derketina ji pergal, niha?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "Bikarhêner biguherîne" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Derkeve" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Girtina pergal, niha?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "Bixe _xewê" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Xewa kûr" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Ji nû ve bide dest pê kirin" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Bi tevahî bigire" + --- gnome-panel-2.27.92.orig/debian/po-up/be@latin.po +++ gnome-panel-2.27.92/debian/po-up/be@latin.po @@ -0,0 +1,89 @@ +# Biełaruski pierakład gnome-panel. +# Copyright (C) 2007 THE gnome-panel'S COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-panel package. +# Alaksandar Navicki , 2007. Łacinka.org +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-21 13:12+0200\n" +"Last-Translator: Ihar Hrachyshka \n" +"Language-Team: i18n@mova.org \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Belarusian latin\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Ty ŭvajšoŭ jak \"%s\".\n" +"Praz %d sekundu adbudziecca aŭtamatyčny vychad." +msgstr[1] "" +"Ty ŭvajšoŭ jak \"%s\".\n" +"Praz %d sekundy adbudziecca aŭtamatyčny vychad." +msgstr[2] "" +"Ty ŭvajšoŭ jak \"%s\".\n" +"Praz %d sekundaŭ adbudziecca aŭtamatyčny vychad." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Ty ŭvajšoŭ jak \"%s\".\n" +"Kamputar budzie aŭtamatyčna vyklučany praz %d sekundu." +msgstr[1] "" +"Ty ŭvajšoŭ jak \"%s\".\n" +"Kamputar budzie aŭtamatyčna vyklučany praz %d sekundy." +msgstr[2] "" +"Ty ŭvajšoŭ jak \"%s\".\n" +"Kamputar budzie aŭtamatyčna vyklučany praz %d sekundaŭ." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Ci vyjści ciapier?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Pieraklučy karystalnika" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Vyjdzi" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Vyklučyć kamputar ciapier?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Usypi" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernuj" + +# FIXME +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Restartuj" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Vykluč" + --- gnome-panel-2.27.92.orig/debian/po-up/br.po +++ gnome-panel-2.27.92/debian/po-up/br.po @@ -0,0 +1,70 @@ +# Breton translation for gnome-panel +# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 +# This file is distributed under the same license as the gnome-panel package. +# Jérémy Ar Floc'h , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2006-04-12 19:08+0000\n" +"Last-Translator: Jérémy Le Floc'h \n" +"Language-Team: Breton \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#: ../patches/02_panel_logout.patch:663 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "Diluget e viot a-benn %d eilenn" + +#: ../patches/02_panel_logout.patch:674 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "En em lazhañ a raio ar reizhiad a-benn %d eilenn." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Dilugañ bremañ?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Cheñch implijer" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Dilugañ" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Lazhañ ar reizhiad bremañ?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Adloc'hañ" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Lazhañ" + --- gnome-panel-2.27.92.orig/debian/po-up/POTFILES.in +++ gnome-panel-2.27.92/debian/po-up/POTFILES.in @@ -0,0 +1 @@ +patches/02_panel_logout.patch --- gnome-panel-2.27.92.orig/debian/po-up/it.po +++ gnome-panel-2.27.92/debian/po-up/it.po @@ -0,0 +1,85 @@ +# Italian Translation for gnome-panel +# Copyright (C) 1997-2006 Free Software Foundation, Inc. +# Christopher R. Gabriel +# Alessio Frusciante , 2003 +# Luca Ferretti , 2003-2008 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel 2.21.x\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-05 09:44+0100\n" +"Last-Translator: Luca Ferretti \n" +"Language-Team: Italiano \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +# GNOME-2-22 +# modificata parecchio.... +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"È stato effettuato l'accesso come «%s».\n" +"La sessione in corso verrà terminata automaticamente entro %d secondo." +msgstr[1] "" +"È stato effettuato l'accesso come «%s».\n" +"La sessione in corso verrà terminata automaticamente entro %d secondi." + +# GNOME-2-22 +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"È stato effettuato l'accesso come «%s».\n" +"Questo sistema verrà arrestato automaticamente entro %d secondo." +msgstr[1] "" +"È stato effettuato l'accesso come «%s».\n" +"Questo sistema verrà arrestato automaticamente entro %d secondi." + +# lo so che c'è system, ma in italiano non ha senso +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Terminare questa sessione adesso?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Cambia utente" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Termina sessione" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Arrestare questo sistema adesso?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Sospendi" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "I_berna" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "Ria_vvia" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "A_rresta" + --- gnome-panel-2.27.92.orig/debian/po-up/hi.po +++ gnome-panel-2.27.92/debian/po-up/hi.po @@ -0,0 +1,84 @@ +# translation of gnome-panel.HEAD.hi.po to Hindi +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# +# G Karunakar , 2003. +# Ravishankar Shrivastava , 2004. +# Rajesh Ranjan , 2005, 2006, 2008. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD.hi\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-10 12:56+0530\n" +"Last-Translator: Rajesh Ranjan \n" +"Language-Team: Hindi \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" + +#: ../patches/02_panel_logout.patch:663 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "आप स्वतः %d सेकेंड में लॉग आउट हो जायेंगे." +msgstr[1] "आप स्वतः %d सेकेंड में लॉग आउट हो जायेंगे" + +#: ../patches/02_panel_logout.patch:674 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "सिस्टम %d सेकेंड में स्वतः बंद हो जायेगा" +msgstr[1] "सिस्टम %d सेकेंड में स्वतः बंद हो जायेगा." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "अब इस सिस्टम से लॉग आउट करें?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "उपयोक्ता बदलें (_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "लॉग आउट (_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "अब इस सिस्टम को बंद करें?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "स्थगित करें (_S)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "सुप्तावस्था में ले जायें (_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "फिर आरंभ करें (_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "बंद करें (_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/dz.po +++ gnome-panel-2.27.92/debian/po-up/dz.po @@ -0,0 +1,82 @@ +# Dzongkha translation of gnome-panel. +# Copyright @ 2006 Free Software Foundation, Inc. +# Mindu Dorji. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD.dz\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2007-06-27 03:43+0530\n" +"Last-Translator: Tshewang Norbu \n" +"Language-Team: DZONGKHA \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2;plural=(n!=1);\n" +"X-Poedit-Language: Dzongkha\n" +"X-Poedit-Country: BHUTAN\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"ཁྱོད་ད་ལྟོ་\"%s\".\n" +"བཟུམ་སྦེ་ཕྱིར་བསྐྱོད་འབད་ཡོདཔཁྱོད་སྐར་ཆ་%d ཚུ་ནང་འཁོད་ལུ་ རང་བཞིན་གྱིས་ཕྱིར་བསྐྱོད་འབད་འོང་།" +msgstr[1] "" +"ཁྱོད་ད་ལྟོ་\"%s\".\n" +"བཟུམ་སྦེ་ཕྱིར་བསྐྱོད་འབད་ཡོདཔཁྱོད་སྐར་ཆ་%d ནང་འཁོད་ལུ་ རང་བཞིན་གྱིས་ཕྱིར་བསྐྱོད་འབད་འོང་།" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"ཁྱོད་ད་ལྟོ་\"%s\".\n" +"བཟུམ་སྦེ་ཕྱིར་བསྐྱོད་འབད་ཡོདཔརིམ་ལུགས་འདི་སྐར་ཆ་%d་ཚུནང་ལུ་རང་བཞིན་གྱིས་སྒོ་བསྡམ་འོང་།" +msgstr[1] "" +"ཁྱོད་ད་ལྟོ་\"%s\".\n" +"བཟུམ་སྦེ་ཕྱིར་བསྐྱོད་འབད་ཡོདཔརིམ་ལུགས་འདི་སྐར་ཆ་%dནང་ལུ་རང་བཞིན་གྱིས་སྒོ་བསྡམ་འོང་།" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "རིམ་ལུགས་འདི་ནང་ལས་ ད་ལྟོ་རང་ཕྱིར་བསྐྱོད་འབད་ནི་ཨིན་ན?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "ལག་ལེན་སོར་བསྒྱུར་འབད།(_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "ཕྱིར་བསྐྱོད།(_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "རིམ་ལུགས་འདི་ ད་ལྟོ་རང་སྒོ་བསྡམ་ནི་ཨིན་ན?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "འཕྲལ་བཀག(_u)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "གཉིད་ནང་བཙུགས།(_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "ལོག་འགོ་བཙུགས།(_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "སྒོ་བསྡམས།(_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/lv.po +++ gnome-panel-2.27.92/debian/po-up/lv.po @@ -0,0 +1,77 @@ +# translation of lv.po to Latvian +# Pēteris Krišjānis , 2000. +# Artis Trops , 2000. +# Raivis Dejus , 2006, 2007. +# gnome-panel for Latvian. +# Copyright (C) 2000, 2006, 2007 Free Software Foundation, Inc. +msgid "" +msgstr "" +"Project-Id-Version: lv\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2007-04-05 11:09+0300\n" +"Last-Translator: Raivis Dejus \n" +"Language-Team: Latvian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " +"2);\n" + +#: ../patches/02_panel_logout.patch:663 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "Jūs tiksiet automātiski atslēgti no sistēmas pēc %d sekundes." +msgstr[1] "Jūs tiksiet automātiski atslēgti no sistēmas pēc %d sekundes." +msgstr[2] "Jūs tiksiet automātiski atslēgti no sistēmas pēc %d sekundes." + +#: ../patches/02_panel_logout.patch:674 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "Sistēma tiks automātiski izslēgta pēc %d sekundes." +msgstr[1] "Sistēma tiks automātiski izslēgta pēc %d sekundes." +msgstr[2] "Sistēma tiks automātiski izslēgta pēc %d sekundes." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Vai tiešām vēlaties atslēgties no sistēmas?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Nomainīt lietotāju" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Beigt darbu" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Vai tiešām vēlaties izslēgt datoru?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "Ie_snaudināt" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Iemidzināt" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "Pā_rstartēt" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "Iz_slēgt" + --- gnome-panel-2.27.92.orig/debian/po-up/ml.po +++ gnome-panel-2.27.92/debian/po-up/ml.po @@ -0,0 +1,84 @@ +# translation of gnome-panel.HEAD.ml.po to +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# +# FSF-India , 2003. +# Ani Peter , 2006, 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD.ml\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-10 16:04+0530\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"\n" +"\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"നിങ്ങള്‍ \"%s\" ആയി ലോഗിന്‍ ചെയ്തിരിക്കുന്നു.\n" +"%d സെക്കന്‍ഡിനുളളില്‍ സ്വയം ലോഗൌട്ട് ആകുന്നതാണ്." +msgstr[1] "" +"നിങ്ങള്‍ \"%s\" ആയി ലോഗിന്‍ ചെയ്തിരിക്കുന്നു.\n" +"%d സെക്കന്‍ഡുകള്‍ക്കുള്ളില്‍ സ്വയം ലോഗൌട്ട് ആകുന്നതാണ്." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"നിങ്ങള്‍ \"%s\" ആയി ലോഗിന്‍ ചെയ്തിരിക്കുന്നു.\n" +"%d സെക്കന്‍ഡിനുളളില്‍ സിസ്റ്റം സ്വയം അടച്ചുപൂട്ടുന്നതാണ്." +msgstr[1] "" +"നിങ്ങള്‍ \"%s\" ആയി ലോഗിന്‍ ചെയ്തിരിക്കുന്നു.\n" +"%d സെക്കന്‍ഡുകള്‍ക്കുള്ളില്‍ സിസ്റ്റം സ്വയം അടച്ചുപൂട്ടുന്നതാണ്." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "ഈ സിസ്റ്റത്തില്‍ നിന്നും ഇപ്പോള്‍ പുറത്ത് പോകണമോ?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "മറ്റൊരു യൂസറ്‍ ആകുക (_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "പുറത്ത് പോകുക (_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "ഈ സിസ്റ്റം ഇപ്പോള്‍ അടയ്ക്കണമോ?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "താല്‍ക്കാലികമായി നിര്‍ത്തുക (_u)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "വീണ്ടും ആരംഭിക്കുക (_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "അടച്ചു പൂട്ടുക (_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/ja.po +++ gnome-panel-2.27.92/debian/po-up/ja.po @@ -0,0 +1,88 @@ +# gnome-panel ja.po. +# Copyright (C) 1998-2008 Free Software Foundation, Inc. +# Yukihiro Nakai , 1998 +# Yasuyuki Furukawa , 1999 +# Eiichiro ITANI , 1999 +# Takayuki KUSANO , 1999-2003. +# Yuusuke Tahara , 2000 +# Shingo Akagaki , 2000 +# Akira TAGOH , 2001 +# Takeshi AIHANA , 2003-2008. +# KAMAGASAKO Masatoshi , 2003. +# Satoru SATOH , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel trunk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-23 13:46+0900\n" +"Last-Translator: Takeshi AIHANA \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"現在 \"%s\" でログインしています。\n" +"%d秒後に自動的にログアウトします。" +msgstr[1] "" +"現在 \"%s\" でログインしています。\n" +"%d秒後に自動的にログアウトします。" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"現在 \"%s\" でログインしています。\n" +"システムは %d秒後に自動的にシャットダウンします。" +msgstr[1] "" +"現在 \"%s\" でログインしています。\n" +"システムは %d秒後に自動的にシャットダウンします。" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "このシステムからログアウトしますか？" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "ユーザの切り替え(_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "ログアウト(_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "このシステムをシャットダウンしますか？" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "サスペンド(_U)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "ハイバーネート(_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "再起動(_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "シャットダウン(_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/patches.pot +++ gnome-panel-2.27.92/debian/po-up/patches.pot @@ -0,0 +1,72 @@ +# 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: 2008-12-28 03:30+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=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +msgstr[1] "" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +msgstr[1] "" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "" --- gnome-panel-2.27.92.orig/debian/po-up/en_GB.po +++ gnome-panel-2.27.92/debian/po-up/en_GB.po @@ -0,0 +1,82 @@ +# English (British) translation of gnome-core +# Copyright (C) 1999-2000 Free Software Foundation, Inc. +# Robert Brady , 1999-2000. +# Gareth Owen , David Lodge , 2004. +# David Lodge , 2008. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-core 1.1.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-02 18:12+0000\n" +"Last-Translator: Philip Withnall \n" +"Language-Team: English/GB \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgstr[1] "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgstr[1] "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Log out of this system now?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Switch User" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Log Out" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Shut down this system now?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "S_uspend" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernate" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Restart" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Shut Down" + --- gnome-panel-2.27.92.orig/debian/po-up/mn.po +++ gnome-panel-2.27.92/debian/po-up/mn.po @@ -0,0 +1,79 @@ +# translation of mn.po to Mongolian +# translation of gnome-panel.HEAD.po to Mongolian +# translation of gnome-panel.gnome-2-4.po to Mongolian +# translation of gnome-panel.po to mongolian +# This file is distributed under the same license as the PACKAGE package. +# Sukhochir +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Sanlig Badral , 2003. +# Sanlig Badral , 2003, 2004, 2006. +# Sanlig Badral , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: mn\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2006-08-15 22:00+0200\n" +"Last-Translator: Badral \n" +"Language-Team: Mongolian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.10.2\n" + +#: ../patches/02_panel_logout.patch:663 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "Та %d секундны дараа автоматаар гарах болно." +msgstr[1] "Та %d секундны дараа автоматаар гарах болно." + +#: ../patches/02_panel_logout.patch:674 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "Энэ систем %d секундны дараа автоматаар унтарна." +msgstr[1] "Энэ систем %d секундны дараа автоматаар унтарна." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Одоо энэ системнээс гарах уу?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Хэрэглэгч сэлгэгч" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Гарах" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Одоо энэ системийг унтраах уу?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Зогсоох" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernate" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Дахин эхлэх" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Унтраах" + --- gnome-panel-2.27.92.orig/debian/po-up/ka.po +++ gnome-panel-2.27.92/debian/po-up/ka.po @@ -0,0 +1,73 @@ +# translation of ka.po to Georgian +# Vladimer Sichinava ვლადიმერ სიჭინავა , 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: ka\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-12 22:00+0100\n" +"Last-Translator: Vladimer Sichinava ვლადიმერ სიჭინავა \n" +"Language-Team: Georgian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"მომხმარებელ \"%s\" სესია.\n" +"სესიიდან ავტომატური გასვლა %d წამში." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"მომხმარებელ \"%s\" სესია.\n" +"კომპიუტერი ავტომატურად გამოირთვება %d წამში." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "გნებავთ სესიის მიტოვება?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_მომხმარებლის გადართვა" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "სესიის _დასრულება" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "გნებავთ კომპიუტერის გამორთვა?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_დაყოვნება" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "მძ_ინარე რეჟიმი" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_გადატვირთვა" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "გამორთ_ვა" + --- gnome-panel-2.27.92.orig/debian/po-up/pt_BR.po +++ gnome-panel-2.27.92/debian/po-up/pt_BR.po @@ -0,0 +1,93 @@ +# Brazilian Portuguese translation of gnome-panel. +# Copyright (C) 1999-2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-panel package. +# Elvis Pfützenreuter +# Sandro Nunes Henrique +# Rodrigo Stulzer Lopes +# Ricardo Soares Guimarães +# Gustavo Maciel Dias Vieira , 2000-2001. +# Alexandre Folle de Menezes , 2002. +# Evandro Fernandes Giovanini , 2002, 2003, 2006. +# Gustavo Noronha Silva , 2003. +# Welther José O. Esteves , 2004. +# Raphael Higino , 2004-2005. +# Evandro Fernandes Giovanini , 2007. +# Og Maciel , 2007. +# Leonardo Ferreira Fontenelle , 2007. +# Vladimir Melo , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-22 10:57-0300\n" +"Last-Translator: Vladimir Melo \n" +"Language-Team: Brazilian Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Você está atualmente registrado como \"%s\".\n" +"Você vai sair da sessão automaticamente em %d segundo." +msgstr[1] "" +"Você está atualmente registrado como \"%s\".\n" +"Você vai sair da sessão automaticamente em %d segundos." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgstr[1] "" +"Você está atualmente registrado como \"%s\".\n" +"Este sistema vai desligar automaticamente em %d segundos." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Sair do sistema agora?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Trocar Usuário" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Sair" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Desligar o sistema agora?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "S_uspender" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernar" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Reiniciar" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Desligar" + --- gnome-panel-2.27.92.orig/debian/po-up/bg.po +++ gnome-panel-2.27.92/debian/po-up/bg.po @@ -0,0 +1,82 @@ +# Bulgarian translation of gnome-panel. +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# Peter Slavov , 2004. +# Rostislav Raykov , 2004. +# Vladimir Petkov , 2004, 2005, 2006, 2007. +# Alexander Shopov , 2006, 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel trunk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2007-07-25 22:39+0300\n" +"Last-Translator: Vladimir Petkov \n" +"Language-Team: Bulgarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"В момента сте се включили като потребителя „%s“.\n" +"Сесията ви ще приключи автоматично след %d секунда." +msgstr[1] "" +"В момента сте се включили като потребителя „%s“.\n" +"Сесията ви ще приключи автоматично след %d секунди." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"В момента сте се включили като потребителя „%s“.\n" +"Компютърът ще спре автоматично след %d секунда." +msgstr[1] "" +"В момента сте се включили като потребителя „%s“.\n" +"Компютърът ще спре автоматично след %d секунди." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Излизане от системата?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Превключване на потребител" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Изход" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Спиране на компютъра?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Приспиване" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Дълбоко приспиване" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Рестартиране" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Спиране на компютъра" + --- gnome-panel-2.27.92.orig/debian/po-up/en_CA.po +++ gnome-panel-2.27.92/debian/po-up/en_CA.po @@ -0,0 +1,74 @@ +# English/Canada translation of gnome-panel. +# Copyright (C) 2004-2006 Adam Weinberger and the GNOME Foundation +# This file is distributed under the same licence as the gnome-panel package. +# Adam Weinberger , 2004, 2005, 2006. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2005-07-18 01:10-0500\n" +"Last-Translator: Adam Weinberger \n" +"Language-Team: Canadian English \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "You will be logged out automatically in %d second." +msgstr[1] "You will be logged out automatically in %d seconds." + +#: ../patches/02_panel_logout.patch:674 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "This system will shut down automatically in %d second." +msgstr[1] "This system will shut down automatically in %d seconds." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Log out of this system now?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Switch User" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Log Out" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Shut down this system now?" + +#: ../patches/02_panel_logout.patch:782 +#, fuzzy +msgid "S_uspend" +msgstr "_Suspend" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Shut Down" + --- gnome-panel-2.27.92.orig/debian/po-up/ru.po +++ gnome-panel-2.27.92/debian/po-up/ru.po @@ -0,0 +1,91 @@ +# translation of gnome-panel to Russian +# Copyright (C) 1998-2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# +# Max Valianskiy , 1998-1999. +# Sergey Panov , 1999. +# Valek Filippov , 2000-2002. +# Dmitry G. Mastrukov , 2002-2004. +# Andrew W. Nosenko , 2003. +# Leonid Kanter , 2003, 2004, 2005, 2006, 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel trunk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-09 00:06+0300\n" +"Last-Translator: Vasiliy Faronov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Сейчас идёт сеанс пользователя «%s».\n" +"Он будет автоматически завершён через %d секунду." +msgstr[1] "" +"Сейчас идёт сеанс пользователя «%s».\n" +"Он будет автоматически завершён через %d секунды." +msgstr[2] "" +"Сейчас идёт сеанс пользователя «%s».\n" +"Он будет автоматически завершён через %d секунд." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Сейчас идёт сеанс пользователя «%s».\n" +"Компьютер будет автоматически выключен через %d секунду." +msgstr[1] "" +"Сейчас идёт сеанс пользователя «%s».\n" +"Компьютер будет автоматически выключен через %d секунды." +msgstr[2] "" +"Сейчас идёт сеанс пользователя «%s».\n" +"Компьютер будет автоматически выключен через %d секунд." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Завершить сеанс?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Сменить пользователя" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Завершить сеанс" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Выключить этот компьютер?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Ждущий режим" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Спящий режим" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Перезагрузить" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Выключить" + --- gnome-panel-2.27.92.orig/debian/po-up/ko.po +++ gnome-panel-2.27.92/debian/po-up/ko.po @@ -0,0 +1,75 @@ +# gnome-panel +# Sung-Hyun Nam , 2000. +# Young-Ho Cha , 2000, 2001, 2006, 2007. +# Eunju Kim , 2007. +# Changwoo Ryu , 1998, 2002-2006, 2007, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-26 18:51+0900\n" +"Last-Translator: Changwoo Ryu \n" +"Language-Team: GNOME Korea \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"\"%s\" 사용자로 로그인한 상태입니다.\n" +"%d초 후에 자동으로 로그아웃합니다." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"\"%s\" 사용자로 로그인한 상태입니다.\n" +"%d초 후에 자동으로 시스템이 꺼집니다." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "시스템에서 지금 로그아웃 하겠습니까?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "사용자 바꾸기(_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "로그아웃(_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "시스템을 지금 끄겠습니까?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "일시 중지(_U)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "최대 절전(_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "다시 시작(_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "시스템 종료(_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/sr@latin.po +++ gnome-panel-2.27.92/debian/po-up/sr@latin.po @@ -0,0 +1,92 @@ +# Serbian translation of gnome-panel +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006. +# +# This file is distributed under the same license as the gnome-panel package. +# +# Maintainer: Danilo Šegan +# Reviewed on 2004-02-25 by: Danilo Šegan and Bojan Suzic +# Reviewed on 2005-03-02 by: Danilo Šegan +# Reviewed on 2005-07-29 by: Slobodan D. Sredojević +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2007-09-10 22:23+0200\n" +"Last-Translator: Danilo Šegan \n" +"Language-Team: Serbian (sr) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Trenutno ste prijavljeni kao „%s“.\n" +"Bićete odjavljeni u roku od %d sekunde." +msgstr[1] "" +"Trenutno ste prijavljeni kao „%s“.\n" +"Bićete odjavljeni u roku od %d sekunde." +msgstr[2] "" +"Trenutno ste prijavljeni kao „%s“.\n" +"Bićete odjavljeni u roku od %d sekundi." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Trenutno ste prijavljeni kao „%s“.\n" +"Ovaj računar će biti ugašen u roku od %d sekunde." +msgstr[1] "" +"Trenutno ste prijavljeni kao „%s“.\n" +"Ovaj računar će biti ugašen u roku od %d sekunde." +msgstr[2] "" +"Trenutno ste prijavljeni kao „%s“.\n" +"Ovaj računar će biti ugašen u roku od %d sekundi." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Odjavljujete se sada sa sistema?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "Pro_meni korisnika" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "O_djavi se" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Da li ste sigurni da sada želite da ugasite računar?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "Privremeno _zaustavi" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "Z_amrzni" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "Ponovo pok_reni" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Ugasi" + --- gnome-panel-2.27.92.orig/debian/po-up/cs.po +++ gnome-panel-2.27.92/debian/po-up/cs.po @@ -0,0 +1,94 @@ +# Czech translation of gnome-panel. +# Copyright (C) 1999, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006 Miloslav Trmac . +# This file is distributed under the same license as the gnome-panel package. +# GIS , 1999. +# David Šauer , 1999. +# George Lebl , 2000, 2001. +# Stanislav Brabec , 2000, 2001. +# Miloslav Trmac , 2002, 2003, 2004, 2005, 2006. +# Petr Tomeš , 2006. +# Jakub Friedl , 2006, 2007. +# Petr Kovar , 2007, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-03 22:21+0100\n" +"Last-Translator: Petr Kovar \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Aktuálně jste přihlášeni jako \"%s\".\n" +"Budete automaticky odhlášeni za %d sekundu." +msgstr[1] "" +"Aktuálně jste přihlášeni jako \"%s\".\n" +"Budete automaticky odhlášeni za %d sekundy." +msgstr[2] "" +"Aktuálně jste přihlášeni jako \"%s\".\n" +"Budete automaticky odhlášeni za %d sekund." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Aktuálně jste přihlášeni jako \"%s\".\n" +"Tento systém se automaticky vypne za %d sekundu." +msgstr[1] "" +"Aktuálně jste přihlášeni jako \"%s\".\n" +"Tento systém se automaticky vypne za %d sekundy." +msgstr[2] "" +"Aktuálně jste přihlášeni jako \"%s\".\n" +"Tento systém se automaticky vypne za %d sekund." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Odhlásit se z tohoto systému?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Přepnout uživatele" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Odhlásit se" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Vypnout tento systém?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Uspat do RAM" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "Uspat na _disk" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Restartovat" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Vypnout" + --- gnome-panel-2.27.92.orig/debian/po-up/sk.po +++ gnome-panel-2.27.92/debian/po-up/sk.po @@ -0,0 +1,92 @@ +# translation of sk.po to Slovak +# Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc. +# +# $Id: sk.po,v 1.159 2005/12/05 23:29:40 marcel Exp $ +# +# Stanislav Višňovský , 2002. +# Stanislav Visnovsky , 2003, 2004. +# Stanislav Visnovsky , 2003. +# Peter Tuharsky , 2007. +# Marcel Telka , 2005, 2007. +# Pavol Šimo , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-03 16:36+0100\n" +"Last-Translator: Pavol Šimo \n" +"Language-Team: Slovak \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Momentálne ste prihlásený ako \"%s\".\n" +"Budete automaticky odhlásený o %d sekúnd." +msgstr[1] "" +"Momentálne ste prihlásený ako \"%s\".\n" +"Budete automaticky odhlásený o %d sekundu." +msgstr[2] "" +"Momentálne ste prihlásený ako \"%s\".\n" +"Budete automaticky odhlásený o %d sekundy." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Momentálne ste prihlásený ako \"%s\".\n" +"Tento systém sa automaticky vypne o %d sekúnd." +msgstr[1] "" +"Momentálne ste prihlásený ako \"%s\".\n" +"Tento systém sa automaticky vypne o %d sekundu." +msgstr[2] "" +"Momentálne ste prihlásený ako \"%s\".\n" +"Tento systém sa automaticky vypne o %d sekundy." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Odhlásiť sa teraz zo systému?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Prepnúť používateľa" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Odhlásiť" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Vypnúť systém teraz?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Uspať" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernovať" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Reštartovať" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Vypnúť" + --- gnome-panel-2.27.92.orig/debian/po-up/sr.po +++ gnome-panel-2.27.92/debian/po-up/sr.po @@ -0,0 +1,92 @@ +# Serbian translation of gnome-panel +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006. +# +# This file is distributed under the same license as the gnome-panel package. +# +# Maintainer: Данило Шеган +# Reviewed on 2004-02-25 by: Данило Шеган and Bojan Suzic +# Reviewed on 2005-03-02 by: Данило Шеган +# Reviewed on 2005-07-29 by: Слободан Д. Средојевић +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2007-09-10 22:23+0200\n" +"Last-Translator: Данило Шеган \n" +"Language-Team: Serbian (sr) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Тренутно сте пријављени као „%s“.\n" +"Бићете одјављени у року од %d секунде." +msgstr[1] "" +"Тренутно сте пријављени као „%s“.\n" +"Бићете одјављени у року од %d секунде." +msgstr[2] "" +"Тренутно сте пријављени као „%s“.\n" +"Бићете одјављени у року од %d секунди." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Тренутно сте пријављени као „%s“.\n" +"Овај рачунар ће бити угашен у року од %d секунде." +msgstr[1] "" +"Тренутно сте пријављени као „%s“.\n" +"Овај рачунар ће бити угашен у року од %d секунде." +msgstr[2] "" +"Тренутно сте пријављени као „%s“.\n" +"Овај рачунар ће бити угашен у року од %d секунди." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Одјављујете се сада са система?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "Про_мени корисника" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "О_дјави се" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Да ли сте сигурни да сада желите да угасите рачунар?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "Привремено _заустави" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "З_амрзни" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "Поново пок_рени" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Угаси" + --- gnome-panel-2.27.92.orig/debian/po-up/or.po +++ gnome-panel-2.27.92/debian/po-up/or.po @@ -0,0 +1,80 @@ +# translation of gnome-panel.HEAD.or.po to Oriya +# translation of or.po to Oriya +# Oriya translation of gnome-panel.HEAD.pot.. +# Copyright (C) 2004, 2006, Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-panel package +# $Id: or.po,v 1.13 2006/09/05 10:10:06 sbehera Exp $ +# Sakti/Gita , 2004. +# Gora Mohanty , 2004, 2006. +# Subhransu Behera , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD.or\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2006-09-05 15:33+0530\n" +"Last-Translator: Subhransu Behera \n" +"Language-Team: Oriya \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n" +"\n" +"\n" +"X-Generator: KBabel 1.9.1\n" + +#: ../patches/02_panel_logout.patch:663 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "ଆପଣଙ୍କୁ %d ସେକଣ୍ଡରେ ଆପେଆପେ ଲଗ ଆଉଟ କରାଦିଆଯିବ." +msgstr[1] "ଆପଣଙ୍କୁ %d ସେକଣ୍ଡରେ ଆପେଆପେ ଲଗ ଆଉଟ କରାଦିଆଯିବ।" + +#: ../patches/02_panel_logout.patch:674 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "ଏହି ତନ୍ତ୍ର %d ସେକଣ୍ଡରେ ଆପେଆପେ ବନ୍ଦ କରାଯିବ." +msgstr[1] "ଏହି ତନ୍ତ୍ର %d ସେକଣ୍ଡରେ ଆପେଆପେ ବନ୍ଦ କରାଯିବ।" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "ଏହି ତନ୍ତ୍ରରୁ ବର୍ତ୍ତମାନ ଲଗ ଆଉଟ କରବେ କି?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "ବ୍ଯବହାରକାରୀ ବଦଳାନ୍ତୁ (_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "ଲଗ ଆଉଟ (_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "ଏହି ତନ୍ତ୍ରରୁ ବର୍ତ୍ତମାନ ବନ୍ଦ କରାଦିଆଯିବ କି?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "ସ୍ଥଗିତ କରନ୍ତୁ (_u)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "ନିଭ୍ରୁତ ଅବସ୍ଥାରେ ରଖନ୍ତୁ (_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "ପୁନଃପ୍ରାରମ୍ଭ (_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "ବନ୍ଦ କରନ୍ତୁ (_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/mk.po +++ gnome-panel-2.27.92/debian/po-up/mk.po @@ -0,0 +1,96 @@ +# translation of mk.po to Macedonian +# translation of gnome-panel.HEAD.mk.po to +# translation of gnome-panel.HEAD.mk.po to +# translation of gnome-panel.HEAD.mk.po to +# Copyright (C) 2002,2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# Дамјан Георгиевски, 2002. +# Ivan Stojmirov , 2002,2003. +# Arangel Angov , 2003, 2004, 2006, 2008. +# Jovan Kostovski , 2003. +# Dushan Vasilevski-DUVIX , 2003. +# Арангел Ангов , 2005. +# Jovan Naumovski , 2006, 2007, 2008. +# Arangel Angov , 2007. +msgid "" +msgstr "" +"Project-Id-Version: mk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-23 19:15+0100\n" +"Last-Translator: Arangel Angov \n" +"Language-Team: Macedonian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Моментално сте најавени како „%s“.\n" +"Ќе бидете автоматски одјавени за %d секунда." +msgstr[1] "" +"Моментално сте најавени како „%s“.\n" +"Ќе бидете автоматски одјавени за %d секунди." +msgstr[2] "" +"Моментално сте најавени како „%s“.\n" +"Ќе бидете автоматски одјавени за %d секунди." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Моментално сте најавени како „%s“.\n" +"Системот ќе се исклучи автоматски за %d секунда." +msgstr[1] "" +"Моментално сте најавени како „%s“.\n" +"Системот ќе се исклучи автоматски за %d секунди." +msgstr[2] "" +"Моментално сте најавени како „%s“.\n" +"Системот ќе се исклучи автоматски за %d секунди." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Да се одјавам од системот веднаш?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Смени корисник" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Одјави се" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Да го исклучам системот веднаш?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "С_успендирај" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Хибернирај" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Рестартирај" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Исклучи" + --- gnome-panel-2.27.92.orig/debian/po-up/tr.po +++ gnome-panel-2.27.92/debian/po-up/tr.po @@ -0,0 +1,81 @@ +# translation of gnome-panel.HEAD.tr.po to Turkish +# translation of gnome-panel to Turkish +# +# Copyright (C) 2001-2005, 2008 Free Software Foundation, Inc. +# +# Fatih Demir , 2000. +# Görkem Çetin , 2003. +# Baris Cicek , 2004, 2005, 2008. +# Seha İslam , 2005. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD.tr\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-10 13:11+0200\n" +"Last-Translator: Baris Cicek \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"X-Poedit-Language: Turkish\n" +"X-Poedit-Country: TURKEY\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Şu an \"%s\" olarak giriş yapmış bulunuyorsunuz.\n" +"Kendiliğinden %d saniye içereisinde çıkış yapacaksınız." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Şu an \"%s\" olarak giriş yapmış bulunuyorsunuz.\n" +"Bu sistem kendisini %d saniye sonra kendiliğinden kapatacak." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Bu sistemden şimdi çıkış yapmak istiyor musunuz?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Kullanıcı Değiştir" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "Çı_kış" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Bu sistem şimdi kapatılsın mı?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Bekleme Kipi" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Uyku Kipi" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Yeniden Başlat" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Kapat" + --- gnome-panel-2.27.92.orig/debian/po-up/gu.po +++ gnome-panel-2.27.92/debian/po-up/gu.po @@ -0,0 +1,94 @@ +# translation of gnome-panel.HEAD.gu.po to Gujarati +# Ankit Patel , 2005, 2006. +# Ankit Patel , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD.gu\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2007-08-06 17:45+0530\n" +"Last-Translator: Ankit Patel \n" +"Language-Team: Gujarati \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"તમે વર્તમાનમાં \"%s\" તરીકે પ્રવેશેલ છો.\n" +"તમે %d સેકન્ડમાં આપોઆપ બહાર નીકળી જશો." +msgstr[1] "" +"તમે વર્તમાનમાં \"%s\" તરીકે પ્રવેશેલ છો.\n" +"તમે %d સેકન્ડોમાં આપોઆપ બહાર નીકળી જશો." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"તમે વર્તમાનમાં \"%s\" તરીકે પ્રવેશેલ છો.\n" +"સિસ્ટમ %d સેકન્ડમાં આપોઆપ બંધ થઈ જશે." +msgstr[1] "" +"તમે વર્તમાનમાં \"%s\" તરીકે પ્રવેશેલ છો.\n" +"સિસ્ટમ %d સેકન્ડોમાં આપોઆપ બંધ થઈ જશે." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "શું આ સિસ્ટમમાંથી હમણાં બહાર નીકળવું છે?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "વપરાશકર્તા બદલો (_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "બહાર નીકળો (_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "શું આ સિસ્ટમ હમણાં બંધ કરવી છે?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "અટકાવો (_u)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "હાયબરનેટ (_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "પુનઃશરૂ કરો (_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "બંધ કરો (_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/ca.po +++ gnome-panel-2.27.92/debian/po-up/ca.po @@ -0,0 +1,82 @@ +# gnome-panel translation to Catalan. +# Copyright © 2000-2007 Free Software Foundation, Inc. +# Ivan Vilata i Balaguer , 2000. +# Softcatalà , 2000. +# Jordi Mallach , 2002, 2003, 2004, 2005, 2006. +# Josep Puigdemont i Casamajó , 2006, 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel 2.11.92\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-23 02:24+0100\n" +"Last-Translator: Jordi Mallach \n" +"Language-Team: Catalan \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Heu entrat com a «%s».\n" +"Sortireu automàticament d'aquí a %d segon." +msgstr[1] "" +"Heu entrat com a «%s».\n" +"Sortireu automàticament d'aquí a %d segons." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Heu entrat com a «%s».\n" +"Aquest ordinador s'aturarà automàticament d'aquí a %d segon." +msgstr[1] "" +"Heu entrat com a «%s».\n" +"Aquest ordinador s'aturarà automàticament d'aquí a %d segons." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Voleu sortir d'aquest ordindor?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Commuta d'usuari" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "S_urt" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Voleu aturar aquest ordinador?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "Atura _temporalment" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hiberna" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Reinicia" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "A_tura" + --- gnome-panel-2.27.92.orig/debian/po-up/gl.po +++ gnome-panel-2.27.92/debian/po-up/gl.po @@ -0,0 +1,88 @@ +# translation of gl.po to Galego +# Galician translation of gnome-panel. +# Copyright (C) 1999-2004 Jesús Bravo Álvarez +# +# Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas +# colaborar connosco, podes atopar máis información en http://www.trasno.net +# +# First Version: 2002-06-02 18:57+0200 +# +# Jesús Bravo Álvarez , 1999-2004. +# Ignacio Casal Quinteiro , 2005, 2006. +# Ignacio Casal Quinteiro , 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: gl\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-20 14:24+0100\n" +"Last-Translator: Ignacio Casal Quinteiro \n" +"Language-Team: Galego \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1)\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Está actualmente conectado como \"%s\".\n" +"A súa sesión terminará automaticamente en %d segundo." +msgstr[1] "" +"Está actualmente conectado como \"%s\".\n" +"A súa sesión terminará automaticamente en %d segundos." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Está actualmente conectado como \"%s\".\n" +"O sistema apagarase automaticamente en %d segundo." +msgstr[1] "" +"Está actualmente conectado como \"%s\".\n" +"O sistema apagarase automaticamente en %d segundos." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Quere terminar a sesión neste sistema agora?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Cambiar de usuario" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Terminar a sesión" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Quere apagar este sistema agora?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "S_uspender" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernar" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Reiniciar" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "A_pagar" + --- gnome-panel-2.27.92.orig/debian/po-up/si.po +++ gnome-panel-2.27.92/debian/po-up/si.po @@ -0,0 +1,81 @@ +# translation of si.po to Sinhala +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Danishka Navin , 2007. +msgid "" +msgstr "" +"Project-Id-Version: si\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2007-08-16 17:05+0530\n" +"Last-Translator: Danishka Navin \n" +"Language-Team: Sinhala \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"ඔබ දැනට පිවිසී ඇත්තේ \"%s\" ලෙසයි.\n" +"තවත් තත්පර %d ක් තුළ ඔබ ස්වයංක්‍රීයව ඉවත් වනු ලැබේ." +msgstr[1] "" +"ඔබ දැනට පිවිසී ඇත්තේ \"%s\" ලෙසයි.\n" +"තවත් තත්පර %d ක් තුළ ඔබ ස්වයංක්‍රීයව ඉවත් වනු ලැබේ." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"ඔබ දැනට පිවිසී ඇත්තේ \"%s\" ලෙසයි.\n" +"තවත් තත්පර %d ක් තුළ මෙම පද්ධතිය ස්වයංක්‍රීයව වසා දමනු ලැබේ." +msgstr[1] "" +"ඔබ දැනට පිවිසී ඇත්තේ \"%s\" ලෙසයි.\n" +"තවත් තත්පර %d ක් තුළ මෙම පද්ධතිය ස්වයංක්‍රීයව වසා දමනු ලැබේ." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "මෙම පද්ධතියෙන් දැන් ඉවත්වනවාද?දැන් පද්ධතියෙන් ඉවත් වීමට අවශ්‍යද?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "පරිශිලක හුවමාරුව (_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "ඉවත් වීම (_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "දැන් පද්ධතිය වසා දැමීමට අවශ්‍යද?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "අත්හිටු වන්න (_u)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "ශිශිර තරණය (_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "යළි ආරම්ඹ කරන්න (_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "වසා දමන්න (_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/th.po +++ gnome-panel-2.27.92/debian/po-up/th.po @@ -0,0 +1,80 @@ +# Thai translation of gnome-panel. +# Copyright (C) 2004-2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-panel package. +# +# Supphachoke Suntiwichaya , 2003. +# Chatchawarn Hansakunbuntheung , 2003, 2004. +# Supranee Thirawatthanasuk , 2004. +# Chanchai Junlouchai , 2004. +# Paisa Seeluangsawat , 2004. +# Theppitak Karoonboonyanan , 2004-2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-28 08:16+0700\n" +"Last-Translator: Theppitak Karoonboonyanan \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"คุณกำลังเข้าระบบในชื่อ \"%s\"\n" +"คุณจะออกจากระบบโดยอัตโนมัติภายใน %d วินาที" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"คุณกำลังเข้าระบบในชื่อ \"%s\"\n" +"ระบบจะปิดโดยอัตโนมัติภายใน %d วินาที" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "จะออกจากระบบหรือไม่?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_สลับผู้ใช้" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_ออกจากระบบ" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "จะปิดเครื่องหรือไม่?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_พักเครื่อง" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_จำศีลเครื่อง" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "เ_ริ่มเปิดเครื่องใหม่" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_ปิดเครื่อง" + --- gnome-panel-2.27.92.orig/debian/po-up/es.po +++ gnome-panel-2.27.92/debian/po-up/es.po @@ -0,0 +1,93 @@ +# translation of gnome-panel.HEAD.po to Español +# translation of gnome-panel to Spanish +# Copyright © 1998-2003, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# Miguel de Icaza,computo,622-4680 1998. +# Germán Poo Caamaño , 2002 (Revisor). +# Pablo Gonzalo del Campo, 2003. +# Juan Manuel García Molina , 2003. +# Yelitza Louze , 2003. +# Francisco Javier F. Serrador , 2003, 2004, 2005, 2006. +# Jorge González , 2007, 2008. +# Pablo Saratxaga 1999-2000. +# Javier Gómez 2000. +# Juanjo Alvarez 2000. +# Ismael Olea 2000. +# Manuel de Vega Barreiro 2000. +# Juan Manuel García Molina 2001-2002. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-03 23:05+0100\n" +"Last-Translator: Jorge González \n" +"Language-Team: Español \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Actualmente está registrado en la sesión como «%s».\n" +"Su sesión se cerrará automáticamente en %d segundo." +msgstr[1] "" +"Actualmente está registrado en la sesión como «%s».\n" +"Su sesión se cerrará automáticamente en %d segundos." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Actualmente está registrado en la sesión como «%s».\n" +"Este sistema se apagará automáticamente en %d segundo." +msgstr[1] "" +"Actualmente está registrado en la sesión como «%s».\n" +"Este sistema se apagará automáticamente en %d segundos." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "¿Desea salir de este sistema ahora?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Cambiar usuario" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Salir" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "¿Desea apagar este sistema ahora?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Suspender" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernar" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Reiniciar" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Apagar" + --- gnome-panel-2.27.92.orig/debian/po-up/ga.po +++ gnome-panel-2.27.92/debian/po-up/ga.po @@ -0,0 +1,102 @@ +# Irish translations for gnome-panel package. +# Copyright (C) 2000, 2004, 2007 Free Software Foundation, Inc. +# Seán Ó Ceallaigh , 2000. +# Paul Duffy , 2003. +# David O'Callaghan , 2003. +# Alastair McKinstry , 2004. +# Seán de Búrca , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2007-12-24 20:11-0700\n" +"Last-Translator: Seán de Búrca \n" +"Language-Team: Irish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n%" +"10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Tá tú logáilte isteach mar \"%s\" faoi láthair.\n" +"Logálfar tú amach go huathoibríoch i gceann soicind." +msgstr[1] "" +"Tá tú logáilte isteach mar \"%s\" faoi láthair.\n" +"Logálfar tú amach go huathoibríoch i gceann %d shoicind." +msgstr[2] "" +"Tá tú logáilte isteach mar \"%s\" faoi láthair.\n" +"Logálfar tú amach go huathoibríoch i gceann %d shoicind." +msgstr[3] "" +"Tá tú logáilte isteach mar \"%s\" faoi láthair.\n" +"Logálfar tú amach go huathoibríoch i gceann %d soicind." +msgstr[4] "" +"Tá tú logáilte isteach mar \"%s\" faoi láthair.\n" +"Logálfar tú amach go huathoibríoch i gceann %d soicind." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Tá tú logáilte isteach mar \"%s\" faoi láthair.\n" +"Múchfar an córas seo go huathoibríoch i gceann soicind." +msgstr[1] "" +"Tá tú logáilte isteach mar \"%s\" faoi láthair.\n" +"Múchfar an córas seo go huathoibríoch i gceann %d shoicind." +msgstr[2] "" +"Tá tú logáilte isteach mar \"%s\" faoi láthair.\n" +"Múchfar an córas seo go huathoibríoch i gceann %d shoicind." +msgstr[3] "" +"Tá tú logáilte isteach mar \"%s\" faoi láthair.\n" +"Múchfar an córas seo go huathoibríoch i gceann %d soicind." +msgstr[4] "" +"Tá tú logáilte isteach mar \"%s\" faoi láthair.\n" +"Múchfar an córas seo go huathoibríoch i gceann %d soicind." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Logáil amach as an gcóras seo anois?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "Ai_strigh Úsáideoir" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Logáil Amach" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Múch an córas seo anois?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "C_uir ar Fionraí" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "Geim_hrigh" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Atosaigh" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Múch" + --- gnome-panel-2.27.92.orig/debian/po-up/ar.po +++ gnome-panel-2.27.92/debian/po-up/ar.po @@ -0,0 +1,98 @@ +# translation of gnome-panel.HEAD.ar.po to Arabic +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER +# +# Sayed Jaffer Al-Mosawi , 2002. +# Abdulaziz Al-Arfaj , 2004. +# Djihed Afifi , 2006. +# Khaled Hosny , 2006, 2007. +# Anas Husseini , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.gnome-2-16\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-26 10:12+0100\n" +"Last-Translator: Djihed Afifi \n" +"Language-Team: Arabic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && " +"n<=10 ? 2 : 3\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"أنت سجلت دخولك تحت اسم \"%s\".\n" +"سيتم تسجيل الخروج آلياً في ثانية." +msgstr[1] "" +"أنت سجلت دخولك تحت اسم \"%s\".\n" +"سيتم تسجيل الخروج آلياً في ثانيتين." +msgstr[2] "" +"أنت سجلت دخولك تحت اسم \"%s\".\n" +"سيتم تسجيل الخروج آلياً في %d ثوان." +msgstr[3] "" +"أنت سجلت دخولك تحت اسم \"%s\".\n" +"سيتم تسجيل الخروج آلياً في %d ثانية." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"أنت سجلت دخولك تحت اسم \"%s\".\n" +"سيتم إطفاء النظام آلياً في ثانية." +msgstr[1] "" +"أنت سجلت دخولك تحت اسم \"%s\".\n" +"سيتم إطفاء النظام آلياً في ثانيتين." +msgstr[2] "" +"أنت سجلت دخولك تحت اسم \"%s\".\n" +"سيتم إطفاء النظام آلياً في %d ثوان." +msgstr[3] "" +"أنت سجلت دخولك تحت اسم \"%s\".\n" +"سيتم إطفاء النظام آلياً في %d ثانية." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "هل تريد تسجيل الخروج من النظام الآن؟" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_بدّل المستخدم" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_سجّل خروج" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "غلق النظام الآن؟" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_علّق" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "أ_سبِت" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "أ_عد التشغيل" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "أ_طفيء" + --- gnome-panel-2.27.92.orig/debian/po-up/sq.po +++ gnome-panel-2.27.92/debian/po-up/sq.po @@ -0,0 +1,82 @@ +# Përkthimi i mesazheve të gnome-panel në shqip +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-panel package. +# +# +# Elian Myftiu , 2003-2007. +# Laurent Dhima , 2008. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-01-15 11:42+0100\n" +"Last-Translator: Laurent Dhima \n" +"Language-Team: albanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Aktualisht jeni futur si \"%s\".\n" +"Do të dilni jashtë automatikisht në %d sekondë." +msgstr[1] "" +"Aktualisht jeni futur si \"%s\".\n" +"Do të dilni jashtë automatikisht në %d sekonda." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Aktualisht jeni futur si \"%s\".\n" +"Ky sistem do shuhet automatikisht në %d sekondë." +msgstr[1] "" +"Aktualisht jeni futur si \"%s\".\n" +"Ky sistem do shuhet automatikisht në %d sekonda." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Del jashtë sistemit tani?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Shkëmbe përdorues" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Dil jashtë" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Shuan sistemin tani?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "P_ezullo" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Ngri" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Rinis" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Shuaj" + --- gnome-panel-2.27.92.orig/debian/po-up/eu.po +++ gnome-panel-2.27.92/debian/po-up/eu.po @@ -0,0 +1,83 @@ +# translation of eu.po to Basque +# Copyright (C) 1999, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# Joseba Bidaurrazaga van Dierdonck , 2000. +# Hizkuntza Politikarako Sailburuordetza , 2004. +# Iñaki Larrañaga Murgoitio , 2004, 2005, 2006, 2007, 2008. +# Iñaki Larrañaga Murgoitio , 2007. +msgid "" +msgstr "" +"Project-Id-Version: eu\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-28 20:41+0100\n" +"Last-Translator: Iñaki Larrañaga Murgoitio \n" +"Language-Team: Basque \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Unean \"%s\" gisa hasi duzu saioa.\n" +"Saioa automatikoki amaituko zaizu segundo %d barru." +msgstr[1] "" +"Unean \"%s\" gisa hasi duzu saioa.\n" +"Saioa automatikoki amaituko zaizu %d segundo barru." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Unean \"%s\" gisa hasi duzu saioa.\n" +"Sistema automatikoki itzali egingo da segundo %d barru." +msgstr[1] "" +"Unean \"%s\" gisa hasi duzu saioa.\n" +"Sistema automatikoki itzali egingo da %d segundo barru." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Amaitu sistemako saioa orain?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Aldatu erabiltzailea" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Amaitu saioa" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Itzali sistema orain?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Eseki" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernatu" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Berrabiarazi" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Itzali" + --- gnome-panel-2.27.92.orig/debian/po-up/vi.po +++ gnome-panel-2.27.92/debian/po-up/vi.po @@ -0,0 +1,75 @@ +# Vietnamese Translation for Gnome Panel. +# Copyright © 2007 Free Software Foundation, Inc. +# Nguyễn Thái Ngọc Duy 2002-2004,2007-2008. +# Clytie Siddall , 2005-2007. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel 2.19.4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-23 17:42+0700\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.7b1\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Bạn hiện thời được đăng nhập là « %s ».\n" +"Bạn sẽ được đăng xuất tự động trong vòng %d giây." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Bạn hiện thời được đăng nhập là « %s ».\n" +"Hệ thống này sẽ được tắt tự động trong vòng %d giây." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Đăng xuất hệ thống này ngay bây giờ không?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Đổi người dùng" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "Đăng _xuất" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Tắt hệ thống này ngay bây giờ không?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Ngưng" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "N_gủ đông" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Khởi chạy lại" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Tắt máy" + --- gnome-panel-2.27.92.orig/debian/po-up/ps.po +++ gnome-panel-2.27.92/debian/po-up/ps.po @@ -0,0 +1,73 @@ +# 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. +# +msgid "" +msgstr "" +"Project-Id-Version: GNOME\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-05 11:25-0800\n" +"Last-Translator: Zabeeh khan \n" +"Language-Team: Pashto \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Pashto, Pushto\n" +"X-Poedit-Country: AFGHANISTAN\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +msgstr[1] "" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +msgstr[1] "" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "دې غونډال نه دستي وتل غواړﺉ؟" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "کارن ونجول_" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "وتون_" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "دا غونډال دستي ګلول غواړﺉ؟" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "د_رول" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "پرکالول_" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "بياپېلول_" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "ګلول_" + --- gnome-panel-2.27.92.orig/debian/po-up/id.po +++ gnome-panel-2.27.92/debian/po-up/id.po @@ -0,0 +1,71 @@ +# Ahmad Riza H Nst , 2006 +# Mohammad DAMT +# Erwin Sanjaya +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2006-08-19 10:15+0700\n" +"Last-Translator: Mohammad DAMT \n" +"Language-Team: Indonesian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../patches/02_panel_logout.patch:663 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "Anda akan secara otomatis keluar dalam %d detik." +msgstr[1] "Anda akan secara otomatis keluar dalam %d detik." + +#: ../patches/02_panel_logout.patch:674 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "System akan secara otomatis mati dalam %d detik." +msgstr[1] "System akan secara otomatis mati dalam %d detik." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Keluar dari system ini sekarang?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Pindah Pengguna" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "Kel_uar" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Matikan system ini sekarang?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "T_unda" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernasi" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Restart" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Matikan" + --- gnome-panel-2.27.92.orig/debian/po-up/da.po +++ gnome-panel-2.27.92/debian/po-up/da.po @@ -0,0 +1,100 @@ +# Danish translation of gnome-panel. +# Copyright (C) 1998-99, 2000-08 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-panel package. +# Kenneth Christiansen , 1998-2000. +# Birger Langkjer , 1999. +# Keld Simonsen , 2000-2001. +# Ole Laursen , 2001, 02, 03, 04, 05, 06. +# Martin Willemoes Hansen , 2004, 05. +# Peter Bach , 2007. +# Ask Hjorth Larsen , 2007, 08. +# +# Konventioner: +# +# dialog -> vindue +# hints -> tip +# launcher -> genvej +# notification area -> statusfelt +# properties -> indstillinger +# workspace -> arbejdsområde +# workspace switcher -> arbejdsområdeskifter +# URL -> adresse +# +# Se i øvrigt po-filen til gnome-applets. +# Husk at tilføje dig i credit-listen (besked id "translator-credits") +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-09 18:23+0100\n" +"Last-Translator: Ask Hjorth Larsen \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Du er i øjeblikket logget ind som \"%s\"\n" +"Du bliver automatisk logget ud om %d sekund." +msgstr[1] "" +"Du er i øjeblikket logget ind som \"%s\".\n" +"Du bliver automatisk logget ud om %d sekunder." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Du er i øjeblikket logget ind som \"%s\".\n" +"Dette system slukker automatisk om %d sekund." +msgstr[1] "" +"Du er i øjeblikket logget ind som \"%s\".\n" +"Dette system slukker automatisk om %d sekunder." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Log ud af systemet nu?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Skift bruger" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Log ud" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Sluk maskinen nu?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Suspendér" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Dvale" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Genstart" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Sluk" + --- gnome-panel-2.27.92.orig/debian/po-up/fr.po +++ gnome-panel-2.27.92/debian/po-up/fr.po @@ -0,0 +1,91 @@ +# French translation of gnome-panel. +# Copyright (C) 1998-2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-panel package. +# +# Vincent Renardias , 1998-2000. +# Joaquim Fellmann , 2000. +# Christophe Merlet , 2000-2006. +# Christophe Fergeau , 2002. +# Baptiste Mille-Mathias , 2004-2005. +# Benoît Dejean , 2006. +# Robert-André Mauchin , 2006-2008. +# Damien Durand , 2006. +# Myriam Malga , 2007. +# Claude Paroz , 2007-2008. +# Stéphane Raimbault , 2007-2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD.fr\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-06 08:18+0100\n" +"Last-Translator: Stéphane Raimbault \n" +"Language-Team: GNOME French Team \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n>1;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Vous êtes actuellement connecté en tant que « %s ».\n" +"Vous serez automatiquement déconnecté dans %d seconde." +msgstr[1] "" +"Vous êtes actuellement connecté en tant que « %s ».\n" +"Vous serez automatiquement déconnecté dans %d secondes." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Vous êtes actuellement connecté en tant que « %s ».\n" +"Ce système va s'éteindre automatiquement dans %d seconde." +msgstr[1] "" +"Vous êtes actuellement connecté en tant que « %s ».\n" +"Ce système va s'éteindre automatiquement dans %d secondes." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Se déconnecter du système maintenant ?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "Changer d'_utilisateur" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Fermer la session" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Voulez-vous éteindre le système maintenant ?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Suspendre" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hiberner" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Redémarrer" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "Ét_eindre" + --- gnome-panel-2.27.92.orig/debian/po-up/ro.po +++ gnome-panel-2.27.92/debian/po-up/ro.po @@ -0,0 +1,83 @@ +# Romanian translation for gnome-panel +# Copyright (C) 2000 - 2004 Free Software Foundation, Inc. +# Marius Andreiana , 2000, 2002, 2003. +# Mişu Moldovan , 2003, 2004. +# Dan Damian , 2000-2001, 2005-2006. +# Alexandru Szasz , 2007. +# TODO: "item" e tradus ca "item" şi "element" +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2007-09-13 11:07+0300\n" +"Last-Translator: Alexandru Szasz \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n>1;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Sunteţi autentificat ca „%s”.\n" +"Veţi fi dezautentificat automat în %d secundă." +msgstr[1] "" +"Sunteţi autentificat ca „%s”.\n" +"Veţi fi dezautentificat automat în %d secunde." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Sunteţi autentificat ca „%s”.\n" +"Sistemul va fi oprit automat în %d secundă." +msgstr[1] "" +"Sunteţi autentificat ca „%s”.\n" +"Sistemul va fi oprit automat în %d secunde." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Ieşiţi din sistem acum?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Schimbă utilizatorul" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Ieşi din sesiune" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Opriţi sistemul acum?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "S_uspendă" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernează" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Reporneşte calculatorul" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Opreşte calculatorul" + --- gnome-panel-2.27.92.orig/debian/po-up/mg.po +++ gnome-panel-2.27.92/debian/po-up/mg.po @@ -0,0 +1,74 @@ +# MALAGASY TRANSLATION OF GNOME-PANEL. +# Copyright (C) 2007 THE GNOME-PANEL'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Fano Rajaonarisoa , 2006. +# Thierry Randrianiriana , 2007. +msgid "" +msgstr "" +"Project-Id-Version: Gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-21 08:32+0300\n" +"Last-Translator: Thierry Randrianiriana ,2006\n" +"Language-Team: Malagasy \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n>1;\n" + +#: ../patches/02_panel_logout.patch:663 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "Hivoaka hoazy ianao afaka %d segaondra." +msgstr[1] "Hivoaka hoazy ianao afaka %d segaondra." + +#: ../patches/02_panel_logout.patch:674 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "Hijanona hoazy ity rafitra ity afaka %d segaondra." +msgstr[1] "Hijanona hoazy ity rafitra ity afaka %d segaondra." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Hivoaka ity rafitra ity izao dieny izao?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Hiova mpampiasa" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Hivoaka" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Hajanona ity rafitra ity izao dieny izao?" + +#: ../patches/02_panel_logout.patch:782 +#, fuzzy +msgid "S_uspend" +msgstr "_Ampiatoy" + +#: ../patches/02_panel_logout.patch:787 +#, fuzzy +msgid "_Hibernate" +msgstr "_Hibernate" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Avereno alefa" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Ajanony" + --- gnome-panel-2.27.92.orig/debian/po-up/fi.po +++ gnome-panel-2.27.92/debian/po-up/fi.po @@ -0,0 +1,85 @@ +# Finnish messages for gnome-panel +# Copyright (C) 2002-2008 Free Software Foundation, Inc. +# Suomennos: http://gnome.fi/ +# Ville Hautamäki , 1998, 2000 +# Mikko Rauhala , 1999 +# Pauli Virtanen , 2000-2004 +# Ilkka Tuohela , 2005-2008 +# Timo Jyrinki +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-29 11:52+0200\n" +"Last-Translator: Timo Jyrinki \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Olet kirjautunut sisään käyttäjänä \"%s\".\n" +"Kirjaudut automaattisesti ulos %d sekunnin kuluttua." +msgstr[1] "" +"Olet kirjautunut sisään käyttäjänä \"%s\".\n" +"Kirjaudut automaattisesti ulos %d sekunnin kuluttua." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Olet kirjautunut sisään käyttäjänä \"%s\".\n" +"Tietokone sammutetaan automaattisesti %d sekunnin kuluttua." +msgstr[1] "" +"Olet kirjautunut sisään käyttäjänä \"%s\".\n" +"Tietokone sammutetaan automaattisesti %d sekunnin kuluttua." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Haluatko kirjautua heti ulos?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Vaihda käyttäjää" + +# gnome-panel/foobar-widget.c:212 gnome-panel/menu.c:3460 +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Kirjaudu ulos" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Haluatko sammuttaa tietokoneen heti?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Keskeytystila" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Lepotila" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Käynnistä uudelleen" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Sammuta" + --- gnome-panel-2.27.92.orig/debian/po-up/hu.po +++ gnome-panel-2.27.92/debian/po-up/hu.po @@ -0,0 +1,90 @@ +# Hungarian translation of gnome-panel. +# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-panel package. +# +# +# Szabolcs Ban , 1998, 1999, 2000, 2001. +# Emese Kovacs , 2000, 2001, 2002. +# Tamas Vamosi , 2002. +# Andras Timar , 2001, 2002, 2003. +# Gabor Sari , 2003. +# Laszlo Dvornik , 2004. +# Gabor Kelemen , 2004, 2005, 2006, 2007, 2008. +# Mate ORY , 2006. +# Nyitrai István , 2008. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-23 22:49+0100\n" +"Last-Translator: Gabor Kelemen \n" +"Language-Team: Hungarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Jelenleg „%s” néven van bejelentkezve.\n" +"%d másodperc múlva automatikusan ki lesz jelentkeztetve." +msgstr[1] "" +"Jelenleg „%s” néven van bejelentkezve.\n" +"%d másodperc múlva automatikusan ki lesz jelentkeztetve." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Jelenleg „%s” néven van bejelentkezve.\n" +"%d másodperc múlva automatikusan leáll a számítógép." +msgstr[1] "" +"Jelenleg „%s” néven van bejelentkezve.\n" +"%d másodperc múlva automatikusan leáll a számítógép." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Biztosan ki akar jelentkezni?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Felhasználóváltás" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Kijelentkezés" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Biztosan le szeretné állítani a rendszert?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Felfüggesztés" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernálás" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "Újrai_ndítás" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Leállítás" + --- gnome-panel-2.27.92.orig/debian/po-up/et.po +++ gnome-panel-2.27.92/debian/po-up/et.po @@ -0,0 +1,88 @@ +# GNOME paneeli eesti keele tõlge. +# Estonian translation of GNOME panel. +# +# Copyright (C) 1999, 2001-2006 Free Software Foundation, Inc. +# Copyright (C) 2007, 2008, The GNOME Project. +# This file is distributed under the same license as the gnome-panel package. +# +# Lauris Kaplinski , 1999. +# Ilmar Kerm , 2001, 2002. +# Tõivo Leedjärv , 2002, 2003. +# Priit Laes , 2004-2006, 2008 +# Ivar Smolin , 2005-2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-12 19:31+0200\n" +"Last-Translator: Priit Laes \n" +"Language-Team: Estonian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Sa oled praegu sisse logitud kasutajana \"%s\".\n" +"Sind logitakse %d sekundi möödumisel automaatselt välja." +msgstr[1] "" +"Sa oled praegu sisse logitud kasutajana \"%s\".\n" +"Sind logitakse %d sekundi möödumisel automaatselt välja." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Sa oled praegu sisse logitud kasutajana \"%s\".\n" +"Süsteem seisatakse %d sekundi möödumisel automaatselt." +msgstr[1] "" +"Sa oled praegu sisse logitud kasutajana \"%s\".\n" +"Süsteem seisatakse %d sekundi möödumisel automaatselt." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Kas logida süsteemist välja?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "Lülitu teisele _kasutajale" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "Logi _välja" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Kas lülitada arvuti välja?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Ooterežiimile" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Talveunne" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Taaskäivita" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Seiska arvuti" + --- gnome-panel-2.27.92.orig/debian/po-up/zh_CN.po +++ gnome-panel-2.27.92/debian/po-up/zh_CN.po @@ -0,0 +1,80 @@ +# translation of gnome-panel.po to zh_CN +# Dillion Chen +# Updated and QA by Wang Jian +# Updated and QA by Jiang Xiong , 2001 +# Updated and QA by Zipeco , 2002 +# Updated and QA by WangLi , 2002 +# Updated by He Qiangqiang , 2002 +# Funda Wang , 2003-2006 +# Xiong Jiang , 2003 +# YangZhang , 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-27 20:04+0800\n" +"Last-Translator: Yang Zhang \n" +"Language-Team: Chinese i18n \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"您目前正以“%s”的身份登录。\n" +"您将在 %d 秒后被自动注销。" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"您目前正以“%s”的身份登录。\n" +"此系统将在 %d 秒后自动关机。" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "立即注销此系统吗？" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "切换用户(_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "注销(_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "立即关闭此系统吗？" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "挂起(_U)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "休眠(_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "重新启动(_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "关机(_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/pl.po +++ gnome-panel-2.27.92/debian/po-up/pl.po @@ -0,0 +1,85 @@ +# Copyright (C) 2001-2005 Free Software Foundation, Inc. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-16 22:59+0100\n" +"Last-Translator: Tomasz Dominikowski \n" +"Language-Team: Tomasz Dominikowski (Aviary.pl \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" +"X-Poedit-Language: Polish\n" +"X-Poedit-Country: Poland\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Nazwa zalogowanego użytkownika: \"%s\".\n" +"Nastąpi automatyczne wylogowanie za %d sekundę." +msgstr[1] "" +"Nazwa zalogowanego użytkownika: \"%s\".\n" +"Nastąpi automatyczne wylogowanie za %d sekundy." +msgstr[2] "" +"Nazwa zalogowanego użytkownika: \"%s\".\n" +"Nastąpi automatyczne wylogowanie za %d sekund." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Nazwa zalogowanego użytkownika: \"%s\".\n" +"Komputer zostanie automatycznie wyłączony za %d sekundę." +msgstr[1] "" +"Nazwa zalogowanego użytkownika: \"%s\".\n" +"Komputer zostanie automatycznie wyłączony za %d sekundy." +msgstr[2] "" +"Nazwa zalogowanego użytkownika: \"%s\".\n" +"Komputer zostanie automatycznie wyłączony za %d sekund." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Czy wylogować teraz?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Przełącz użytkownika" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Wyloguj" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Wyłączyć teraz komputer?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Uśpij" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernuj" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "U_ruchom ponownie" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Wyłącz" + --- gnome-panel-2.27.92.orig/debian/po-up/nl.po +++ gnome-panel-2.27.92/debian/po-up/nl.po @@ -0,0 +1,93 @@ +# Dutch translation for gnome-panel +# +# This file is distributed under the same license as the gnome-panel package. +# +# Dirk-Jan C. Binnema , 1998, 1999. +# Dennis Smit , 2000. +# Almer S. Tigelaar , 2000. +# Vincent van Adrighem , 2001. +# Huib Kleinhout , 2002. +# Ronald Hummelink , 2002. +# Tino Meinen , 2002. 2006, 2007. +# Reinout van Schouwen , 2002-2006 +# Daniel van Eeden , 2008 +# Wouter Bolsterlee , 2006–2008 +# +# desktop - bureaublad +# workspace - werkblad +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-24 16:36+0100\n" +"Last-Translator: Wouter Bolsterlee \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"U ben momenteel ingelogd als ‘%s’.\n" +"U wordt automatisch afgemeld in %d seconde." +msgstr[1] "" +"U ben momenteel ingelogd als ‘%s’.\n" +"U wordt automatisch afgemeld in %d seconden." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"U ben momenteel ingelogd als ‘%s’.\n" +"Dit systeem wordt automatisch afgesloten in %d seconde." +msgstr[1] "" +"U ben momenteel ingelogd als ‘%s’.\n" +"Dit systeem wordt automatisch afgesloten in %d seconden." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Nu van dit systeem afmelden?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "Gebruiker _wisselen" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "A_fmelden" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Dit systeem nu afsluiten?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "Pa_uzestand" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Slaapstand" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "He_rstarten" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "A_fsluiten" + --- gnome-panel-2.27.92.orig/debian/po-up/ne.po +++ gnome-panel-2.27.92/debian/po-up/ne.po @@ -0,0 +1,85 @@ +# translation of gnome-panel.HEAD.ne.po to Nepali +# Nepali Translation Project. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Nabin Gautam , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD.ne\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2007-11-01 17:29+0545\n" +"Last-Translator: Nabin Gautam \n" +"Language-Team: Nepali \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Nepali\n" +"X-Poedit-Country: NEPAL\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n !=1\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"तपाईँ हाल \"%s\" का रूपमा लगइन हुनुभएको छ ।\n" +"तपाईँ %d सेकेन्डमा स्वचालित रूपमा लगआउट हुनुनेछ ।" +msgstr[1] "" +"तपाईँ हाल \"%s\" का रूपमा लगइन हुनुभएको छ ।\n" +"तपाईँ %d सेकेन्डमा स्वचालित रूपमा लगआउट हुनुहुनेछ ।" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"तपाईँ हाल \"%s\" का रूपमा लगइन हुनुभएको छ ।\n" +"प्रणाली स्वचालित रूपमा %d सेकेन्डमा बन्द हुनेछ ।" +msgstr[1] "" +"तपाईँ हाल \"%s\" का रूपमा लगइन हुनुभएको छ ।\n" +"प्रणाली स्वचालित रूपमा %d सेकेन्डमा बन्द हुनेछ ।" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "यस प्रणालीलाई अहिले लगआउट गर्नुहुन्छ ?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "स्विच प्रयोगकर्ता" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "लगआउट गर्नुहोस्" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "यस प्रणालीलाई अहिले लगआउट गर्नुहुन्छ ?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "खारेज गर्नुहोस्" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "हाइवरनेट" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "फेरि सुरु गर्नुहोस्" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "बन्द गर्नुहोस्" + --- gnome-panel-2.27.92.orig/debian/po-up/sv.po +++ gnome-panel-2.27.92/debian/po-up/sv.po @@ -0,0 +1,85 @@ +# Swedish messages for gnome-panel. +# Copyright (C) 1998-2008 Free Software Foundation, Inc. +# Daniel Nylander , 2006, 2007, 2008. +# Martin Wahlen , 1998. +# Anders Carlsson , 1999. +# Andreas Hyden , 2000. +# Martin Norbäck , 2000, 2001. +# Christian Rose , 2000, 2001, 2002, 2003, 2004, 2005. +# Johan Dahlin , 2002. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-22 12:57+0100\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Du är för närvarande inloggad som \"%s\".\n" +"Du kommer att automatiskt loggas ut om %d sekund." +msgstr[1] "" +"Du är för närvarande inloggad som \"%s\".\n" +"Du kommer att automatiskt loggas ut om %d sekunder." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Du är för närvarande inloggad som \"%s\".\n" +"Det här systemet kommer att automatiskt stängas av om %d sekund." +msgstr[1] "" +"Du är för närvarande inloggad som \"%s\".\n" +"Det här systemet kommer att automatiskt stängas av om %d sekunder." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Logga ut från det här systemet nu?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Byt användare" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "Logga _ut" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Stänga av det här systemet nu?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Vänteläge" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "Vilolä_ge" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Starta om" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "Stäng _av" + --- gnome-panel-2.27.92.orig/debian/po-up/ta.po +++ gnome-panel-2.27.92/debian/po-up/ta.po @@ -0,0 +1,86 @@ +# translation of gnome-panel.HEAD.po to TAMIL +# translation of ta.po to +# Tamil translation of Gnome-Panel messages. +# Copyright (C) 2001, 2004, 2006, 2007 Free Software Foundation, Inc. +# +# Dinesh Nadarajah , 2004. +# Jayaradha N , 2004. +# Felix , 2006. +# Dr.T.Vasudevan , 2007. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2007-08-12 08:30+0530\n" +"Last-Translator: Dr.T.Vasudevan \n" +"Language-Team: TAMIL \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"நீங்கள் இப்போது \"%s\" ஆக உள்நுழைந்துள்ளீர்கள்\n" +"நீங்கள் தானாக %d வினாடியில் வெளியேற்றப்படுவீர்கள்" +msgstr[1] "" +"நீங்கள் இப்போது \"%s\" ஆக உள்நுழைந்துள்ளீர்கள்\n" +"நீங்கள் தானாக %d வினாடிகளில் வெளியேற்றப்படுவீர்கள்" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"நீங்கள் இப்போது \"%s\" ஆக உள்நுழைந்துள்ளீர்கள்\n" +"இந்த கணினி தானாக %d வினாடியில் முழு நிறுத்தம் செய்யும்" +msgstr[1] "" +"நீங்கள் இப்போது \"%s\" ஆக உள்நுழைந்துள்ளீர்கள்\n" +"இந்த கணினி தானாக %d வினாடிகளில் முழு நிறுத்தம் செய்யும்" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "கணினியிலிருந்து இப்போது வெளிச்செல்லவா?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "பயனரை மாற்றுக" + +# panel/foobar-widget.c:395 +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "வெளியேறு _L" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "இப்போது இந்த கணினியை நிறுத்தவும்? " + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "இடை நிறுத்தம் _S" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "செயலற்றிருத்தல்_H " + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "மீண்டும் தொடங்கு (_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "நிறுத்தவும் _S " + --- gnome-panel-2.27.92.orig/debian/po-up/cy.po +++ gnome-panel-2.27.92/debian/po-up/cy.po @@ -0,0 +1,74 @@ +# gnome-panel yn Gymraeg. +# This file is distributed under the same license as the gnome-panel package. +# www.gyfieithu.co.uk , 2003. +# Dafydd Harries , 2003 2004. +# Dafydd Tomos , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2006-02-22 21:10-0000\n" +"Last-Translator: Rhys Jones \n" +"Language-Team: Welsh \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: ../patches/02_panel_logout.patch:663 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "Fe gewch eich allgofnodi'n awtomatig ymhen %d eiliad." +msgstr[1] "Fe gewch eich allgofnodi'n awtomatig ymhen %d eiliad." + +#: ../patches/02_panel_logout.patch:674 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "Bydd y system hon yn cau i lawr yn awtomatig ymhen %d eiliad." +msgstr[1] "Bydd y system hon yn cau i lawr yn awtomatig ymhen %d eiliad." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Allgofnodi o'r system hon nawr?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Newid Defnyddiwr" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Allgofnodi" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Cau'r system hon i lawr yn awr?" + +#: ../patches/02_panel_logout.patch:782 +#, fuzzy +msgid "S_uspend" +msgstr "_Seibio" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Ail-gychwyn" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Cau i Lawr" + --- gnome-panel-2.27.92.orig/debian/po-up/pt.po +++ gnome-panel-2.27.92/debian/po-up/pt.po @@ -0,0 +1,81 @@ +# gnome-panel's Portuguese translation +# Copyright © 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 gnome-panel +# Distributed under the same licence as the gnome-panel package +# Nuno Ferreira , 1999. +# Duarte Loreto , 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: 2.22\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-22 22:22+0000\n" +"Last-Translator: Duarte Loreto \n" +"Language-Team: Português \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Está actualmente em sessão como \"%s\".\n" +"A sua sessão terminará automaticamente dentro de %d segundo." +msgstr[1] "" +"Está actualmente em sessão como \"%s\".\n" +"A sua sessão terminará automaticamente dentro de %d segundos." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Está actualmente em sessão como \"%s\".\n" +"O computador irá desligar-se automaticamente dentro de %d segundo." +msgstr[1] "" +"Está actualmente em sessão como \"%s\".\n" +"O computador irá desligar-se automaticamente dentro de %d segundos." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Terminar esta sessão agora?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Alternar Utilizador" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Terminar Sessão" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Desligar agora este computador?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "S_uspender" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernar" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Reiniciar" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Desligar" + --- gnome-panel-2.27.92.orig/debian/po-up/nb.po +++ gnome-panel-2.27.92/debian/po-up/nb.po @@ -0,0 +1,80 @@ +# Norwegian translation of gnome-panel (bokmål dialect). +# Copyright (C) 1998-2003 Free Software Foundation, Inc. +# Kjartan Maraas , 1998-2008. +# Øivind Hoel , 2006 +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel 2.21.x\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-26 18:08+0100\n" +"Last-Translator: Kjartan Maraas \n" +"Language-Team: Norwegian Bokmål \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Du er logget inn som «%s».\n" +"Du vil bli logget ut automatisk om %d sekund." +msgstr[1] "" +"Du er logget inn som «%s».\n" +"Du vil bli logget ut automatisk om %d sekunder." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Du er logget inn som «%s».\n" +"Datamaskinen vil bli skrudd av automatisk om %d sekund." +msgstr[1] "" +"Du er logget inn som «%s».\n" +"Datamaskinen vil bli skrudd av automatisk om %d sekunder." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Vil du logge ut fra systemet nå?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Bytt bruker" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Logg ut" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Slå av systemet nå?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "Hvilemod_us" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "D_valemodus" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "Sta_rt på nytt" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Slå av" + --- gnome-panel-2.27.92.orig/debian/po-up/te.po +++ gnome-panel-2.27.92/debian/po-up/te.po @@ -0,0 +1,81 @@ +# Telugu translation of gnome-panel +# Copyright (C) 2005 Free Software Foundation, Andhra Pradesh. +# This file is distributed under the same license as the gnome-panel package. +# +# Prajasakti Localisation Team , 2005. +# Krishna Babu K , 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-07 12:52+0530\n" +"Last-Translator: Krishna Babu K \n" +"Language-Team: Swecha Telugu Localisation Team \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"మీరు ప్రస్తుతం ఇలా లాగ్ అయివున్నారు \"%s\".\n" +"మీరు స్వయంచాలకంగా %d సెకన్ లో లాగ్ అవుట్ అవుతారు." +msgstr[1] "" +"మీరు ప్రస్తుతం ఇలా లాగ్ అయివున్నారు \"%s\".\n" +"మీరు స్వయంచాలకంగా %d సెకన్ లో లాగ్ అవుట్ అవుతారు." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"మీరు ప్రస్తుతం ఇలా లాగ్‌డ్ అయిఉన్నారు \"%s\".\n" +"ఈ సిస్టమ్ స్వయంచాలకంగా %d సెంకండ్ లో మూసివేయబడుతుంది." +msgstr[1] "" +"మీరు ప్రస్తుతం ఇలా లాగ్‌డ్ అయిఉన్నారు \"%s\".\n" +"ఈ సిస్టమ్ స్వయంచాలకంగా %d సెంకండ్ లో మూసివేయబడుతుంది." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "ఈ సిస్టమ్ నుండి ఇప్పుడే లాగ్అవుట్ అవ్వాలా?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "వినియోగదారిని మార్చు(_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "నిష్క్రమణ(_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "ఈ సిస్టమ్ ను ఇప్పుడు మూసివేయాలా?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "నిలకడచేయు(_u)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "షుప్తావస్థ(_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "పునఃప్రారంభం(_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "మూసివేయి(_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/as.po +++ gnome-panel-2.27.92/debian/po-up/as.po @@ -0,0 +1,82 @@ +# translation of as.po to Assamese +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Amitakhya Phukan , 2008. +# Amitakhya Phukan , 2008. +msgid "" +msgstr "" +"Project-Id-Version: as\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-01 16:40+0530\n" +"Last-Translator: Amitakhya Phukan \n" +"Language-Team: Assamese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1)\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"আপনি বৰ্তমানে \"%s\" পৰিচয়ে লগ-ইন কৰেছেন।\n" +"%d সেকেন্ড অতিক্ৰান্ত হলে স্বয়ংক্ৰিয়ৰূপে আপনাকে লগ-আউট কৰা হবে।" +msgstr[1] "" +"আপনি বৰ্তমানে \"%s\" পৰিচয়ে লগ-ইন কৰেছেন।\n" +"%d সেকেন্ড অতিক্ৰান্ত হলে স্বয়ংক্ৰিয়ৰূপে আপনাকে লগ-আউট কৰা হবে।" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"আপনি বৰ্তমানে \"%s\" পৰিচয়ে লগ-ইন কৰেছেন।\n" +"%d সেকেন্ড অতিক্ৰান্ত হলে স্বয়ংক্ৰিয়ৰূপে এই সিস্টেম বন্ধ কৰা হবে।" +msgstr[1] "" +"আপনি বৰ্তমানে \"%s\" পৰিচয়ে লগ-ইন কৰেছেন।\n" +"%d সেকেন্ড অতিক্ৰান্ত হলে স্বয়ংক্ৰিয়ৰূপে এই সিস্টেম বন্ধ কৰা হবে।" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Log out of this system now?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "ব্যবহাৰকাৰী পৰিবৰ্তন (_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "লগ-আউট (_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "সিস্টেম এই মুহূৰ্তে বন্ধ কৰা হবে কি?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "স্থগিত কৰুন (_u)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "নিদ্ৰিত অবস্থা (_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "পুনৰায় আৰম্ভ (_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "বন্ধ কৰুন (_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/af.po +++ gnome-panel-2.27.92/debian/po-up/af.po @@ -0,0 +1,82 @@ +# Afrikaans translation of gnome-panel. +# Copyright (C) 2004 Zuza Software Foundation +# This file is distributed under the same license as the gnome-panel package. +# Zuza Software Foundation , 2004 +# F Wolff , 2008 +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel 2.6-branch\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-02 14:33+0200\n" +"Last-Translator: F Wolff \n" +"Language-Team: Afrikaans localisation list \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: VirTaal 0.1\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"U is tans aangemeld as \"%s\".\n" +"U sal outomaties afgemeld word oor %d sekonde." +msgstr[1] "" +"U is tans aangemeld as \"%s\".\n" +"U sal outomaties afgemeld word oor %d sekondes." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"U is tans aangemeld as \"%s\".\n" +"Die stelsel sal outomaties afgeskakel word oor %d sekonde." +msgstr[1] "" +"U is tans aangemeld as \"%s\".\n" +"Die stelsel sal outomaties afgeskakel word oor %d sekondes." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Meld nou af van hierdie stelsel?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Ruil gebruiker" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "Me_ld af" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Skakel die stelsel nou af?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hiberneer" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "He_rbegin" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Skakel af" + --- gnome-panel-2.27.92.orig/debian/po-up/lt.po +++ gnome-panel-2.27.92/debian/po-up/lt.po @@ -0,0 +1,92 @@ +# translation of lt.po to Lithuanian +# Lithuanian translation of gnome-panel +# Copyright (C) 2000-2008 Free Software Foundation, Inc. +# +# +# Gediminas Paulauskas , 2000-2002. +# Vaidotas Zemlys , 2003. +# Žygimantas Beručka , 2004-2008. +# Justina Klingaitė , 2005. +# Gintautas Miliauskas , 2007. +msgid "" +msgstr "" +"Project-Id-Version: lt\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-02 19:33+0200\n" +"Last-Translator: Žygimantas Beručka \n" +"Language-Team: Lithuanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" +"100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Dabar esate prisijungę kaip „%s“.\n" +"Jūs būsite automatiškai atjungti po %d sekundės." +msgstr[1] "" +"Dabar esate prisijungę kaip „%s“.\n" +"Jūs būsite automatiškai atjungti po %d sekundžių." +msgstr[2] "" +"Dabar esate prisijungę kaip „%s“.\n" +"Jūs būsite automatiškai atjungti po %d sekundžių." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Dabar esate prisijungę kaip „%s“.\n" +"Ši sistema bus automatiškai išjungta po %d sekundės." +msgstr[1] "" +"Dabar esate prisijungę kaip „%s“.\n" +"Ši sistema bus automatiškai išjungta po %d sekundžių." +msgstr[2] "" +"Dabar esate prisijungę kaip „%s“.\n" +"Ši sistema bus automatiškai išjungta po %d sekundžių." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Atsijungti iš šios sistemos dabar?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "P_erjungti naudotoją" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "At_sijungti" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Išjungti šią sistemą dabar?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Užmigdyti" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernuoti" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Paleisti iš naujo" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Išjungti" + --- gnome-panel-2.27.92.orig/debian/po-up/mr.po +++ gnome-panel-2.27.92/debian/po-up/mr.po @@ -0,0 +1,84 @@ +# translation of gnome-panel.HEAD.mr.po to marathi +# FIRST AUTHOR Pradeep Deshpande +# Rahul Bhalerao , 2006. +# Sandeep Shedmake , 2008. +# Marathi translation of gnome-panel-2.0.po +# Copyright (C) 2004, Jitendra Shah +# This file is released under GPL +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel.HEAD.mr\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-29 12:36+0530\n" +"Last-Translator: Sandeep Shedmake \n" +"Language-Team: marathi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"तुम्ही सध्या \"%1$s\" म्हणून दाखलन केले.\n" +"तुम्ही %2$d सेकंदात आपोआप लॉग आउट व्हाल." +msgstr[1] "" +"तुम्ही सध्या \"%1$s\" म्हणून दाखलन केले.\n" +"तुम्ही %2$d सेकंदांत आपोआप लॉग आउट व्हाल." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"तुम्ही सध्या \"%1$s\" म्हणून दाखलन केले.\n" +"प्रणाली %2$d सेकंदात आपोआप बंद होईल." +msgstr[1] "" +"तुम्ही सध्या \"%1$s\" म्हणून दाखलन केले.\n" +"प्रणाली %2$d सेकंदांत आपोआप बंद होईल." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "या प्रणालीतून आता लॉग आउट व्हावे?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "उपयोक्ता बदला(_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "लॉग आउट(_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "ही प्रणाली आता बंद करावी?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "निलंबन(_u)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "हाइबरनेट(_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "पुनःआरंभ(_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "बंद करा(_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/de.po +++ gnome-panel-2.27.92/debian/po-up/de.po @@ -0,0 +1,89 @@ +# German gnome-panel translation. +# Copyright (C) 1998-2004 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-panel package. +# Carsten Schaar , 1998. +# Matthias Warkus , 1999-2001. +# Karl Eichwalder , 2000, 2001. +# Christian Meyer , 2000, 2001. +# Benedikt Roth , 2000, 2001. +# Jörgen Scheibengruber , 2002. +# Christian Neumair , 2002-2004. +# Hendrik Richter , 2004, 2005, 2006, 2007. +# Christian Kintner , 2006. +# Philipp Kerling , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-24 14:06+0100\n" +"Last-Translator: Philipp Kerling \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Sie sind momentan als »%s« angemeldet.\n" +"Sie werden in %d Sekunde automatisch abgemeldet." +msgstr[1] "" +"Sie sind momentan als »%s« angemeldet.\n" +"Sie werden in %d Sekunden automatisch abgemeldet." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Sie sind momentan als »%s« angemeldet.\n" +"Der Rechner wird in %d Sekunde automatisch ausgeschaltet." +msgstr[1] "" +"Sie sind momentan als »%s« angemeldet.\n" +"Der Rechner wird in %d Sekunden automatisch ausgeschaltet." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Möchten Sie sich jetzt abmelden?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Benutzer wechseln" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "A_bmelden" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Möchten Sie den Rechner jetzt ausschalten?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Bereitschaft" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Ruhezustand" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Neu starten" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Ausschalten" + --- gnome-panel-2.27.92.orig/debian/po-up/sl.po +++ gnome-panel-2.27.92/debian/po-up/sl.po @@ -0,0 +1,99 @@ +# Slovenian translation of gnome-panel +# Copyright (C) 2002-2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-panel package. +# +# Andraz Tori , 2002. +# Matic Žgur , 2006. +# Matej Urbančič , 2007 - 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-02-25 19:05+0100\n" +"Last-Translator: Matej Urbančič \n" +"Language-Team: slovenian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIJA\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Trenutno je prijavljen uporabnik \"%s\".\n" +"Samodejno boste odjavljeni čez %d sekund." +msgstr[1] "" +"Trenutno je prijavljen uporabnik \"%s\".\n" +"Samodejno boste odjavljeni čez %d sekundo." +msgstr[2] "" +"Trenutno je prijavljen uporabnik \"%s\".\n" +"Samodejno boste odjavljeni čez %d sekundi." +msgstr[3] "" +"Trenutno je prijavljen uporabnik \"%s\".\n" +"Samodejno boste odjavljeni čez %d sekunde." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Trenutno je prijavljen uporabnik \"%s\".\n" +"Sistem se bo samodejno izklopil čez %d sekund." +msgstr[1] "" +"Trenutno je prijavljen uporabnik \"%s\".\n" +"Sistem se bo samodejno izklopil čez %d sekundo." +msgstr[2] "" +"Trenutno je prijavljen uporabnik \"%s\".\n" +"Sistem se bo samodejno izklopil čez %d sekundi." +msgstr[3] "" +"Trenutno je prijavljen uporabnik \"%s\".\n" +"Sistem se bo samodejno izklopil čez %d sekunde." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Ali se želite odjaviti iz sistema?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Zamenjaj uporabnika" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Odjava" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Ali želite izklopiti računalnik?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Zaustavi" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Hibernacija" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "_Ponoven zagon" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Izklop" + --- gnome-panel-2.27.92.orig/debian/po-up/nn.po +++ gnome-panel-2.27.92/debian/po-up/nn.po @@ -0,0 +1,87 @@ +# translation of nn.po to Norwegian Nynorsk +# Christian Fredrik Kalager Schaller , 2000-2001. +# Kjartan Maraas , 2001. +# Roy-Magne Mo , 2001-2002. +# Monica Gausen , 2001. +# Åsmund Skjæveland , 2003, 2004, 2006. +# Eskild Hustvedt , 2008 +# Norwegian (nynorsk) translation of gnome-core. +# Copyright (C) 1998-2000, 2003, 2004, 2006, 2008 Free Software Foundation, Inc. +# +msgid "" +msgstr "" +"Project-Id-Version: nn\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-04-02 08:03+0200\n" +"Last-Translator: Eskild Hustvedt \n" +"Language-Team: Norwegian Nynorsk \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: VIM\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"Du er logga inn som «%s».\n" +"Du vil verta logga ut automatisk om %d sekund." +msgstr[1] "" +"Du er logga inn som «%s».\n" +"Du vil verta logga ut automatisk om %d sekund." + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"Du er logga inn som «%s».\n" +"Datamaskinen vil verta skrudd av automatisk om %d sekund." +msgstr[1] "" +"Du er logga inn som «%s».\n" +"Datamaskinen vil verta skrudd av automatisk om %d sekund." + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "Logg ut frå dette systemet?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "_Byt brukar" + +# panel/foobar-widget.c:372 +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "_Logg ut" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "Slå av dette systemet?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "_Kvilemodus" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "_Dvalemodus" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "Sta_rt på nytt" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "_Slå av" + --- gnome-panel-2.27.92.orig/debian/po-up/bn_IN.po +++ gnome-panel-2.27.92/debian/po-up/bn_IN.po @@ -0,0 +1,80 @@ +# translation of bn_IN.po to Bengali INDIA +# Bangla Translation of Gnome-Panel file. +# Copyright (C) 2005 Free Software Foundation. +# This file is distributed under the same license as the gnome-panel package. +# +# Runa Bhattacharjee, 2005. +# Runa Bhattacharjee , 2008. +msgid "" +msgstr "" +"Project-Id-Version: bn_IN\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-08 12:38+0530\n" +"Last-Translator: Runa Bhattacharjee \n" +"Language-Team: Bengali INDIA \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"\n" +"\n" +"\n" + +#: ../patches/02_panel_logout.patch:663 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"আপনি বর্তমানে \"%s\" পরিচয়ে লগ-ইন করেছেন।\n" +"%d সেকেন্ড অতিক্রান্ত হলে স্বয়ংক্রিয়রূপে আপনাকে লগ-আউট করা হবে।" + +#: ../patches/02_panel_logout.patch:674 +#, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"আপনি বর্তমানে \"%s\" পরিচয়ে লগ-ইন করেছেন।\n" +"%d সেকেন্ড অতিক্রান্ত হলে স্বয়ংক্রিয়রূপে এই সিস্টেম বন্ধ করা হবে।" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "সিস্টেম থেকে এই মুহূর্তে লগ-আউট করা হবে কি?" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "ব্যবহারকারী পরিবর্তন (_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "প্রস্থান (_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "সিস্টেম এই মুহূর্তে বন্ধ করা হবে কি?" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "স্থগিত করুন (_u)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "নিদ্রিত অবস্থা (_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "পুনরাম্ভ (_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "বন্ধ করুন (_S)" + --- gnome-panel-2.27.92.orig/debian/po-up/zh_HK.po +++ gnome-panel-2.27.92/debian/po-up/zh_HK.po @@ -0,0 +1,92 @@ +# Chinese (Hong Kong) translation of gnome-panel. +# Copyright (C) 1999-2007 Free Software Foundation, Inc. +# gnome-core: +# Yuan-Chung Cheng , 1999. +# Jing-Jong SHYUE , 2000. +# Chih-Wei Huang , 2000. +# Abel Cheung , 2001-2002. +# gnome-panel: +# Kevin Kee , 2004 +# Abel Cheung , 2002-2004. +# Woodman Tuen , 2005-07 +# +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-panel 2.21.90\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-28 03:30+0100\n" +"PO-Revision-Date: 2008-03-09 16:20+0800\n" +"Last-Translator: Woodman Tuen \n" +"Language-Team: Chinese (Hong Kong) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../patches/02_panel_logout.patch:663 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"You will be automatically logged out in %d seconds." +msgstr[0] "" +"你目前以「%s」登入。\n" +"你會在 %d 秒後自動登出。你目前以「%s」登入。\n" +"你會在 %d 秒後自動登出。" +msgstr[1] "" +"你目前以「%s」登入。\n" +"你會在 %d 秒後自動登出。你目前以「%s」登入。\n" +"你會在 %d 秒後自動登出。" + +#: ../patches/02_panel_logout.patch:674 +#, fuzzy, c-format +msgid "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d second." +msgid_plural "" +"You are currently logged in as \"%s\".\n" +"This system will be automatically shut down in %d seconds." +msgstr[0] "" +"你目前以「%s」登入。\n" +"本系統會在 %d 秒後自動關閉。你目前以「%s」登入。\n" +"本系統會在 %d 秒後自動關閉。" +msgstr[1] "" +"你目前以「%s」登入。\n" +"本系統會在 %d 秒後自動關閉。你目前以「%s」登入。\n" +"本系統會在 %d 秒後自動關閉。" + +#: ../patches/02_panel_logout.patch:760 +msgid "Log out of this system now?" +msgstr "現在從本系統中登出？" + +#: ../patches/02_panel_logout.patch:766 +msgid "_Switch User" +msgstr "切換使用者(_S)" + +#: ../patches/02_panel_logout.patch:772 +msgid "_Log Out" +msgstr "登出(_L)" + +#: ../patches/02_panel_logout.patch:777 +msgid "Shut down this system now?" +msgstr "現在關閉本系統？" + +#: ../patches/02_panel_logout.patch:782 +msgid "S_uspend" +msgstr "暫停(_S)" + +#: ../patches/02_panel_logout.patch:787 +msgid "_Hibernate" +msgstr "休眠(_H)" + +#: ../patches/02_panel_logout.patch:792 +msgid "_Restart" +msgstr "重新啟動(_R)" + +#: ../patches/02_panel_logout.patch:801 +msgid "_Shut Down" +msgstr "關機(_S)" + --- gnome-panel-2.27.92.orig/debian/maintfiles/changelog_unreleased +++ gnome-panel-2.27.92/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.27.92.orig/debian/maintfiles/09_open_drawers_on_right_screen.patch.NOTWORKING +++ gnome-panel-2.27.92/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.27.92.orig/debian/maintfiles/improved_open_recent_doc_in_term.patch.NEEDTESTING +++ gnome-panel-2.27.92/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.27.92.orig/debian/maintfiles/clock_applet_evo_open.patch +++ gnome-panel-2.27.92/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